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_box.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/ui/controls/text_box.h') diff --git a/src/ui/controls/text_box.h b/src/ui/controls/text_box.h index 07c4abe4..a6e4566d 100644 --- a/src/ui/controls/text_box.h +++ b/src/ui/controls/text_box.h @@ -2,6 +2,7 @@ #include "text_control.h" #include "timer.h" +#include "border_delegate.h" namespace cru::ui::controls { @@ -36,6 +37,8 @@ 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: @@ -44,5 +47,7 @@ namespace cru::ui::controls ActionPtr caret_action_; Microsoft::WRL::ComPtr caret_brush_; bool is_caret_show_ = false; + + std::unique_ptr border_delegate_; }; } -- cgit v1.2.3