diff options
author | crupest <crupest@outlook.com> | 2018-11-05 21:26:04 +0800 |
---|---|---|
committer | crupest <crupest@outlook.com> | 2018-11-05 21:26:04 +0800 |
commit | cefb75a4c09e72a1f67e11765f2a8b6fd9581ed6 (patch) | |
tree | bccc82a17ca0ceb04831e7babd6e8902c3e882d8 /src/ui/control.cpp | |
parent | 1dab244aaad8694ba37ef43caedd8c8ba0310c00 (diff) | |
download | cru-cefb75a4c09e72a1f67e11765f2a8b6fd9581ed6.tar.gz cru-cefb75a4c09e72a1f67e11765f2a8b6fd9581ed6.tar.bz2 cru-cefb75a4c09e72a1f67e11765f2a8b6fd9581ed6.zip |
Fix a bug in text control.
Diffstat (limited to 'src/ui/control.cpp')
-rw-r--r-- | src/ui/control.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
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) |