diff options
| author | 杨宇千 <crupest@outlook.com> | 2018-11-10 16:03:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-10 16:03:17 +0800 |
| commit | fbcc63667fcfe1e107ee8666b319420af89f0686 (patch) | |
| tree | fdd8ac836b266044de380fea26e8f5fc80a5d9d9 /src/ui/controls/toggle_button.cpp | |
| parent | ac4b0f8d438e7a7c2ecd836af8332b5da1e035c9 (diff) | |
| parent | 8d5a08e8d054e9504ca31e0bfbfff7a1018c23c0 (diff) | |
| download | cru-fbcc63667fcfe1e107ee8666b319420af89f0686.tar.gz cru-fbcc63667fcfe1e107ee8666b319420af89f0686.tar.bz2 cru-fbcc63667fcfe1e107ee8666b319420af89f0686.zip | |
Merge pull request #6 from crupest/predefine
Refactor predefine resources. Add check for dead recursion in singleton.
Diffstat (limited to 'src/ui/controls/toggle_button.cpp')
| -rw-r--r-- | src/ui/controls/toggle_button.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ui/controls/toggle_button.cpp b/src/ui/controls/toggle_button.cpp index a901f650..b16eca23 100644 --- a/src/ui/controls/toggle_button.cpp +++ b/src/ui/controls/toggle_button.cpp @@ -2,7 +2,7 @@ #include "graph/graph.hpp" #include "ui/animations/animation.hpp" -#include "ui/predefine.hpp" +#include "ui/ui_manager.hpp" namespace cru::ui::controls { @@ -19,8 +19,8 @@ namespace cru::ui::controls { graph::GraphManager::GetInstance()->GetD2D1Factory()->CreateRoundedRectangleGeometry(D2D1::RoundedRect(D2D1::RectF(-half_width, -half_height, half_width, half_height), half_height, half_height), &frame_path_); - on_brush_ = predefine::GetPredefineResourceComPtr<ID2D1Brush>(predefine::key_toggle_button_on_brush); - off_brush_ = predefine::GetPredefineResourceComPtr<ID2D1Brush>(predefine::key_toggle_button_off_brush); + on_brush_ = UiManager::GetInstance()->GetPredefineResources()->toggle_button_on_brush; + off_brush_ = UiManager::GetInstance()->GetPredefineResources()->toggle_button_off_brush; } inline D2D1_POINT_2F ConvertPoint(const Point& point) |