Merge pull request #6 from crupest/predefine

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

1 files changed, 9 insertions, 2 deletions

diff --git a/src/ui/border_property.cpp b/src/ui/border_property.cpp
index bd06a96a..b79bb482 100644
--- a/src/ui/border_property.cpp
+++ b/src/ui/border_property.cpp
@@ -1,10 +1,10 @@
 #include "border_property.hpp"
 
-#include "predefine.hpp"
+#include "ui_manager.hpp"
 
 namespace cru::ui
 {
-    BorderProperty::BorderProperty(): BorderProperty(predefine::GetPredefineResourceComPtr<ID2D1Brush>(predefine::key_border_property_brush))
+    BorderProperty::BorderProperty(): BorderProperty(UiManager::GetInstance()->GetPredefineResources()->border_property_brush)
     {
 
     }
@@ -13,4 +13,11 @@ namespace cru::ui
     {
 
     }
+
+    BorderProperty::BorderProperty(Microsoft::WRL::ComPtr<ID2D1Brush> brush, const float width, const float radius_x,
+        const float radius_y, Microsoft::WRL::ComPtr<ID2D1StrokeStyle> stroke_style) :
+        brush_(std::move(brush)), stroke_width_(width), radius_x_(radius_x), radius_y_(radius_y), stroke_style_(std::move(stroke_style))
+    {
+
+    }
 }