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/controls/button.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ui/controls/button.cpp') diff --git a/src/ui/controls/button.cpp b/src/ui/controls/button.cpp index a90c218d..0bd6a70d 100644 --- a/src/ui/controls/button.cpp +++ b/src/ui/controls/button.cpp @@ -1,13 +1,13 @@ #include "button.hpp" #include "graph/graph.hpp" -#include "ui/predefine.hpp" +#include "ui/ui_manager.hpp" namespace cru::ui::controls { Button::Button() : Control(true), - normal_border_{predefine::GetPredefineResource(predefine::key_button_normal_border)}, - pressed_border_{predefine::GetPredefineResource(predefine::key_button_press_border)} + normal_border_{UiManager::GetInstance()->GetPredefineResources()->button_normal_border}, + pressed_border_{UiManager::GetInstance()->GetPredefineResources()->button_press_border} { SetBordered(true); GetBorderProperty() = normal_border_; -- cgit v1.2.3