Merge pull request #6 from crupest/predefine

Refactor predefine resources. Add check for dead recursion in singleton.

1 files changed, 3 insertions, 3 deletions

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<BorderProperty>(predefine::key_button_normal_border)},
-        pressed_border_{predefine::GetPredefineResource<BorderProperty>(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_;