From cefb75a4c09e72a1f67e11765f2a8b6fd9581ed6 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Mon, 5 Nov 2018 21:26:04 +0800
Subject: Fix a bug in text control.

---
 src/ui/control.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/ui/control.cpp')

diff --git a/src/ui/control.cpp b/src/ui/control.cpp
index 37e6d2b8..d080ebb0 100644
--- a/src/ui/control.cpp
+++ b/src/ui/control.cpp
@@ -201,11 +201,11 @@ namespace cru {
             const auto rect = GetRect(RectRange::Content);
             graph::WithTransform(device_context, D2D1::Matrix3x2F::Translation(rect.left, rect.top),
                 [this](ID2D1DeviceContext* device_context)
-            {
-                OnDrawContent(device_context);
-                DrawEventArgs args(this, this, device_context);
-                draw_event.Raise(args);
-            });
+                {
+                    OnDrawContent(device_context);
+                    DrawEventArgs args(this, this, device_context);
+                    draw_event.Raise(args);
+                });
 
             for (auto child : GetChildren())
                 child->Draw(device_context);
@@ -412,6 +412,7 @@ namespace cru {
 
         namespace
         {
+#ifdef CRU_DEBUG_LAYOUT
             Microsoft::WRL::ComPtr<ID2D1Geometry> CalculateSquareRingGeometry(const Rect& out, const Rect& in)
             {
                 const auto d2d1_factory = graph::GraphManager::GetInstance()->GetD2D1Factory();
@@ -427,6 +428,7 @@ namespace cru {
                 ThrowIfFailed(sink->Close());
                 return result_geometry;
             }
+#endif
         }
 
         void Control::OnSizeChangedCore(SizeChangedEventArgs & args)
-- 
cgit v1.2.3