diff options
| author | 杨宇千 <crupest@outlook.com> | 2018-11-10 16:03:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-10 16:03:17 +0800 |
| commit | fbcc63667fcfe1e107ee8666b319420af89f0686 (patch) | |
| tree | fdd8ac836b266044de380fea26e8f5fc80a5d9d9 /src/ui/control.cpp | |
| parent | ac4b0f8d438e7a7c2ecd836af8332b5da1e035c9 (diff) | |
| parent | 8d5a08e8d054e9504ca31e0bfbfff7a1018c23c0 (diff) | |
| download | cru-fbcc63667fcfe1e107ee8666b319420af89f0686.tar.gz cru-fbcc63667fcfe1e107ee8666b319420af89f0686.tar.bz2 cru-fbcc63667fcfe1e107ee8666b319420af89f0686.zip | |
Merge pull request #6 from crupest/predefine
Refactor predefine resources. Add check for dead recursion in singleton.
Diffstat (limited to 'src/ui/control.cpp')
| -rw-r--r-- | src/ui/control.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/control.cpp b/src/ui/control.cpp index 1ec2f704..63d322b3 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -9,7 +9,7 @@ #include "cru_debug.hpp" #ifdef CRU_DEBUG_LAYOUT -#include "predefine.hpp" +#include "ui_manager.hpp" #endif namespace cru::ui @@ -396,10 +396,10 @@ namespace cru::ui if (GetWindow()->IsDebugLayout()) { if (padding_geometry_ != nullptr) - device_context->FillGeometry(padding_geometry_.Get(), predefine::GetPredefineResourceComPtr<ID2D1Brush>(predefine::key_debug_layout_padding_brush).Get()); + device_context->FillGeometry(padding_geometry_.Get(), UiManager::GetInstance()->GetPredefineResources()->debug_layout_padding_brush.Get()); if (margin_geometry_ != nullptr) - device_context->FillGeometry(margin_geometry_.Get(), predefine::GetPredefineResourceComPtr<ID2D1Brush>(predefine::key_debug_layout_margin_brush).Get()); - device_context->DrawRectangle(Convert(GetRect(RectRange::Margin)), predefine::GetPredefineResourceComPtr<ID2D1Brush>(predefine::key_debug_layout_out_border_brush).Get()); + device_context->FillGeometry(margin_geometry_.Get(), UiManager::GetInstance()->GetPredefineResources()->debug_layout_margin_brush.Get()); + device_context->DrawRectangle(Convert(GetRect(RectRange::Margin)), UiManager::GetInstance()->GetPredefineResources()->debug_layout_out_border_brush.Get()); } #endif |