diff options
author | Yuqian Yang <crupest@outlook.com> | 2018-09-23 16:48:18 +0000 |
---|---|---|
committer | Yuqian Yang <crupest@outlook.com> | 2018-09-23 16:48:18 +0000 |
commit | 001e1d955132a02a2f7effc841ab9e5ee425eda1 (patch) | |
tree | 1bfbdcc2a25316d6e85cc9b4527a1ec15841b502 /CruUI/ui/controls/text_block.h | |
parent | 796ba6e1e816ec87a106f2f7b501e38c99f059e1 (diff) | |
parent | 9049f7674e0808cc3676543e0a95330a1657d10e (diff) | |
download | cru-001e1d955132a02a2f7effc841ab9e5ee425eda1.tar.gz cru-001e1d955132a02a2f7effc841ab9e5ee425eda1.tar.bz2 cru-001e1d955132a02a2f7effc841ab9e5ee425eda1.zip |
Merge branch 'textboxdev' into 'master'
TextBox develop.
See merge request crupest/CruUI!2
Diffstat (limited to 'CruUI/ui/controls/text_block.h')
-rw-r--r-- | CruUI/ui/controls/text_block.h | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/CruUI/ui/controls/text_block.h b/CruUI/ui/controls/text_block.h index b05e7ff2..c87ffc51 100644 --- a/CruUI/ui/controls/text_block.h +++ b/CruUI/ui/controls/text_block.h @@ -11,29 +11,6 @@ namespace cru { namespace controls { - struct TextRange - { - TextRange() = default; - TextRange(const int position, const int count) - : position(position), count(count) - { - - } - TextRange(const TextRange& other) = default; - TextRange(TextRange&& other) = default; - TextRange& operator=(const TextRange& other) = default; - TextRange& operator=(TextRange&& other) = default; - ~TextRange() = default; - - unsigned position; - unsigned count; - - explicit operator DWRITE_TEXT_RANGE() const - { - return DWRITE_TEXT_RANGE { position, count }; - } - }; - class TextBlock : public Control { public: @@ -116,7 +93,6 @@ namespace cru private: void OnTextChangedCore(const String& old_text, const String& new_text); - void CreateDefaultTextFormat(); void RecreateTextLayout(); private: |