From 040a6c18f18100b825a56443a73aa1de64e4518c Mon Sep 17 00:00:00 2001 From: crupest Date: Tue, 2 Oct 2018 01:09:35 +0800 Subject: Make text box use border delegate. Fix layout bug in margin container. --- src/ui/controls/text_control.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/ui/controls/text_control.h') 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); -- cgit v1.2.3