diff options
| author | crupest <crupest@outlook.com> | 2018-09-14 00:02:56 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2018-09-14 00:02:56 +0800 |
| commit | 85e51b0b2e67ac2395c6ba91b96f8bde0d308205 (patch) | |
| tree | bfd56907cd3e5e7fe10c2b8a59042f46d17ef149 | |
| parent | 8421f07abdb3ee970b81f541a9d3430750ab1371 (diff) | |
| download | cru-85e51b0b2e67ac2395c6ba91b96f8bde0d308205.tar.gz cru-85e51b0b2e67ac2395c6ba91b96f8bde0d308205.tar.bz2 cru-85e51b0b2e67ac2395c6ba91b96f8bde0d308205.zip | |
...
| -rw-r--r-- | CruUI/ui/controls/text_block.cpp | 9 | ||||
| -rw-r--r-- | CruUI/ui/controls/text_block.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/CruUI/ui/controls/text_block.cpp b/CruUI/ui/controls/text_block.cpp index 2a3017fe..f385bd6c 100644 --- a/CruUI/ui/controls/text_block.cpp +++ b/CruUI/ui/controls/text_block.cpp @@ -29,9 +29,9 @@ namespace cru { text_format_ = init_text_format; if (init_brush == nullptr) - CreateDefaultBrush(); + brush_ = CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::Black)); - selection_brush_ = CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::Blue)); //TODO! + selection_brush_ = CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::Blue)); } TextBlock::~TextBlock() = default; @@ -233,11 +233,6 @@ namespace cru Repaint(); } - void TextBlock::CreateDefaultBrush() - { - brush_ = CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::Black)); - } - void TextBlock::CreateDefaultTextFormat() { const auto dwrite_factory = GetDWriteFactory(); diff --git a/CruUI/ui/controls/text_block.h b/CruUI/ui/controls/text_block.h index beb662b9..c008f324 100644 --- a/CruUI/ui/controls/text_block.h +++ b/CruUI/ui/controls/text_block.h @@ -111,7 +111,6 @@ namespace cru private: void OnTextChangedCore(const String& old_text, const String& new_text); - void CreateDefaultBrush(); void CreateDefaultTextFormat(); void RecreateTextLayout(); |