From 8d5a08e8d054e9504ca31e0bfbfff7a1018c23c0 Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 10 Nov 2018 15:53:32 +0800 Subject: Refactor predefine resources. Add check for dead recursion in singletons in debug mode. --- src/ui/control.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ui/control.cpp') 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(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(predefine::key_debug_layout_margin_brush).Get()); - device_context->DrawRectangle(Convert(GetRect(RectRange::Margin)), predefine::GetPredefineResourceComPtr(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 -- cgit v1.2.3