diff options
| author | Yuqian Yang <crupest@outlook.com> | 2018-10-01 17:11:11 +0000 |
|---|---|---|
| committer | Yuqian Yang <crupest@outlook.com> | 2018-10-01 17:11:11 +0000 |
| commit | 30ecda8bb354d5982978af97aa90b5f49d9ea195 (patch) | |
| tree | a271bddb244fa2041f14f8d46d249457cee09e5f /src/ui/controls/text_control.h | |
| parent | 398b8f3ba535bb43c4b8593e3027c14894a7a211 (diff) | |
| parent | 040a6c18f18100b825a56443a73aa1de64e4518c (diff) | |
| download | cru-30ecda8bb354d5982978af97aa90b5f49d9ea195.tar.gz cru-30ecda8bb354d5982978af97aa90b5f49d9ea195.tar.bz2 cru-30ecda8bb354d5982978af97aa90b5f49d9ea195.zip | |
Merge branch '9-border' into 'master'
Resolve "Abstract out border control of button and border."
Closes #9
See merge request crupest/CruUI!11
Diffstat (limited to 'src/ui/controls/text_control.h')
| -rw-r--r-- | src/ui/controls/text_control.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ui/controls/text_control.h b/src/ui/controls/text_control.h index a24766dc..2ead7c54 100644 --- a/src/ui/controls/text_control.h +++ b/src/ui/controls/text_control.h @@ -76,7 +76,9 @@ namespace cru::ui::controls void OnLoseFocusCore(events::FocusChangeEventArgs& args) override; - Size OnMeasure(const Size& available_size) override final; + Size OnMeasure(const Size& available_size) override; + + Size TextMeasureWithPadding(const Size& available_size, const Thickness& padding); virtual void RequestChangeCaretPosition(unsigned position); |