From ac4b0f8d438e7a7c2ecd836af8332b5da1e035c9 Mon Sep 17 00:00:00 2001 From: crupest Date: Fri, 9 Nov 2018 22:59:38 +0800 Subject: Add predefine resource. --- src/ui/control.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/ui/control.cpp') diff --git a/src/ui/control.cpp b/src/ui/control.cpp index 31910328..1ec2f704 100644 --- a/src/ui/control.cpp +++ b/src/ui/control.cpp @@ -8,6 +8,10 @@ #include "exception.hpp" #include "cru_debug.hpp" +#ifdef CRU_DEBUG_LAYOUT +#include "predefine.hpp" +#endif + namespace cru::ui { using namespace events; @@ -391,12 +395,11 @@ namespace cru::ui #ifdef CRU_DEBUG_LAYOUT if (GetWindow()->IsDebugLayout()) { - const auto resource = Application::GetInstance()->GetDebugLayoutResource(); if (padding_geometry_ != nullptr) - device_context->FillGeometry(padding_geometry_.Get(), resource->padding_brush.Get()); + device_context->FillGeometry(padding_geometry_.Get(), predefine::GetPredefineResourceComPtr(predefine::key_debug_layout_padding_brush).Get()); if (margin_geometry_ != nullptr) - device_context->FillGeometry(margin_geometry_.Get(), resource->margin_brush.Get()); - device_context->DrawRectangle(Convert(GetRect(RectRange::Margin)), resource->out_border_brush.Get()); + 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()); } #endif -- cgit v1.2.3