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_control.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_control.h')
| -rw-r--r-- | src/ui/controls/text_control.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/ui/controls/text_control.h b/src/ui/controls/text_control.h index 2ead7c54..01bb5565 100644 --- a/src/ui/controls/text_control.h +++ b/src/ui/controls/text_control.h @@ -68,7 +68,7 @@ namespace cru::ui::controls protected: void OnSizeChangedCore(events::SizeChangedEventArgs& args) override final; - void OnDraw(ID2D1DeviceContext* device_context) override; + void OnDrawContent(ID2D1DeviceContext* device_context) override; void OnMouseDownCore(events::MouseButtonEventArgs& args) override final; void OnMouseMoveCore(events::MouseEventArgs& args) override final; @@ -76,9 +76,8 @@ namespace cru::ui::controls void OnLoseFocusCore(events::FocusChangeEventArgs& args) override; - Size OnMeasure(const Size& available_size) override; + Size OnMeasureContent(const Size& available_size) override; - Size TextMeasureWithPadding(const Size& available_size, const Thickness& padding); virtual void RequestChangeCaretPosition(unsigned position); |