From 056277ce4fd3cc556fd34e67e02250cf6edadeee Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Thu, 28 Mar 2013 14:45:10 +0200
Subject: [PATCH] Gfx: Tweaks

---
 Common/Gfx/CanvasD2D.cpp | 43 +++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/Common/Gfx/CanvasD2D.cpp b/Common/Gfx/CanvasD2D.cpp
index 2b631a7c..80a3fbc9 100644
--- a/Common/Gfx/CanvasD2D.cpp
+++ b/Common/Gfx/CanvasD2D.cpp
@@ -275,25 +275,27 @@ void CanvasD2D::DrawTextW(const WCHAR* str, UINT strLen, const TextFormat& forma
 	brush.GetColor(&color);
 
 	ID2D1SolidColorBrush* solidBrush;
-	m_Target->CreateSolidColorBrush(ToColorF(color), &solidBrush);
+	HRESULT hr = m_Target->CreateSolidColorBrush(ToColorF(color), &solidBrush);
+	if (SUCCEEDED(hr))
+	{
+		const bool right = ((TextFormatD2D&)format).GetHorizontalAlignment() == Gfx::HorizontalAlignment::Right;
 
-	bool right = ((TextFormatD2D&)format).GetHorizontalAlignment() == Gfx::HorizontalAlignment::Right;
+		// TODO: Draw cached layout?
+		//m_Target->DrawTextLayout(
+		//	D2D1::Point2F(right ? rect.X - 2 : rect.X + 2.0f, rect.Y - 1.0f),
+		//	textLayout,
+		//	solidBrush);
 
-	// TODO: Draw cached layout?
-	//m_Target->DrawTextLayout(
-	//	D2D1::Point2F(right ? rect.X - 2 : rect.X + 2.0f, rect.Y - 1.0f),
-	//	textLayout,
-	//	solidBrush);
+		auto dst = D2D1::RectF(
+			right ? rect.X - 2 : rect.X + 2.0f,
+			rect.Y - 1.0f,
+			(right ? rect.X - 2 : rect.X + 2.0f) + rect.Width,
+			rect.Y + rect.Height  - 1.0f);
 
-	m_Target->DrawTextW(
-		str,
-		strLen,
-		((TextFormatD2D&)format).m_TextFormat,
-		D2D1::RectF(right ? rect.X - 2 : rect.X + 2.0f, rect.Y - 1.0f, (right ? rect.X - 2 : rect.X + 2.0f) + rect.Width, rect.Y + rect.Height  - 1.0f),
-		solidBrush,
-		D2D1_DRAW_TEXT_OPTIONS_NONE);
+		m_Target->DrawTextW(str, strLen, ((TextFormatD2D&)format).m_TextFormat, dst, solidBrush);
 
-	solidBrush->Release();
+		solidBrush->Release();
+	}
 }
 
 bool CanvasD2D::MeasureTextW(const WCHAR* str, UINT strLen, const TextFormat& format, Gdiplus::RectF& rect)
@@ -396,11 +398,12 @@ void CanvasD2D::FillRectangle(Gdiplus::Rect& rect, const Gdiplus::SolidBrush& br
 	brush.GetColor(&color);
 
 	ID2D1SolidColorBrush* solidBrush;
-	m_Target->CreateSolidColorBrush(ToColorF(color), &solidBrush);
-
-	m_Target->FillRectangle(ToRectF(rect), solidBrush);
-
-	solidBrush->Release();
+	HRESULT hr = m_Target->CreateSolidColorBrush(ToColorF(color), &solidBrush);
+	if (SUCCEEDED(hr))
+	{
+		m_Target->FillRectangle(ToRectF(rect), solidBrush);
+		solidBrush->Release();
+	}
 }
 
 }  // namespace Gfx
\ No newline at end of file