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/text_block.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/text_block.cpp')
| -rw-r--r-- | src/ui/controls/text_block.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/text_block.cpp index 290ddd58..8276ce4e 100644 --- a/src/ui/controls/text_block.cpp +++ b/src/ui/controls/text_block.cpp @@ -1,13 +1,12 @@ #include "text_block.hpp" -#include "ui/window.hpp" -#include "ui/predefine.hpp" +#include "ui/ui_manager.hpp" namespace cru::ui::controls { TextBlock::TextBlock() : TextControl( - predefine::GetPredefineResourceComPtr<IDWriteTextFormat>(predefine::key_text_block_text_format), - predefine::GetPredefineResourceComPtr<ID2D1Brush>(predefine::key_text_block_text_brush) + UiManager::GetInstance()->GetPredefineResources()->text_block_text_format, + UiManager::GetInstance()->GetPredefineResources()->text_block_text_brush ) { |