diff options
| author | Yuqian Yang <crupest@outlook.com> | 2018-10-04 16:52:11 +0000 |
|---|---|---|
| committer | Yuqian Yang <crupest@outlook.com> | 2018-10-04 16:52:11 +0000 |
| commit | 7e870dd16e2f5b41fa6c6f687723aaa50c16274d (patch) | |
| tree | be2b26a42dc9fde97379f98f035113e08e0bc331 /src/ui/controls/text_box.h | |
| parent | 30ecda8bb354d5982978af97aa90b5f49d9ea195 (diff) | |
| parent | c5384d496e9ed429ca2baa3ca5e586ff255235eb (diff) | |
| download | cru-7e870dd16e2f5b41fa6c6f687723aaa50c16274d.tar.gz cru-7e870dd16e2f5b41fa6c6f687723aaa50c16274d.tar.bz2 cru-7e870dd16e2f5b41fa6c6f687723aaa50c16274d.zip | |
Merge branch '12-layout' into 'master'
Resolve "Add padding, margin, border to Control."
Closes #12
See merge request crupest/CruUI!12
Diffstat (limited to 'src/ui/controls/text_box.h')
| -rw-r--r-- | src/ui/controls/text_box.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/ui/controls/text_box.h b/src/ui/controls/text_box.h index a6e4566d..540ac758 100644 --- a/src/ui/controls/text_box.h +++ b/src/ui/controls/text_box.h @@ -2,7 +2,6 @@ #include "text_control.h" #include "timer.h" -#include "border_delegate.h" namespace cru::ui::controls { @@ -29,7 +28,7 @@ namespace cru::ui::controls ~TextBox() override; protected: - void OnDraw(ID2D1DeviceContext* device_context) override; + void OnDrawContent(ID2D1DeviceContext* device_context) override; void OnGetFocusCore(events::FocusChangeEventArgs& args) override final; void OnLoseFocusCore(events::FocusChangeEventArgs& args) override final; @@ -37,8 +36,6 @@ namespace cru::ui::controls void OnKeyDownCore(events::KeyEventArgs& args) override final; void OnCharCore(events::CharEventArgs& args) override final; - Size OnMeasure(const Size& available_size) override; - void RequestChangeCaretPosition(unsigned position) override; private: @@ -47,7 +44,5 @@ namespace cru::ui::controls ActionPtr caret_action_; Microsoft::WRL::ComPtr<ID2D1Brush> caret_brush_; bool is_caret_show_ = false; - - std::unique_ptr<BorderDelegate> border_delegate_; }; } |