diff options
| -rw-r--r-- | src/ui/controls/text_block.cpp | 2 | ||||
| -rw-r--r-- | src/ui/controls/text_box.cpp | 209 | ||||
| -rw-r--r-- | src/ui/controls/text_box.h | 53 | ||||
| -rw-r--r-- | src/ui/controls/text_control.cpp | 20 | ||||
| -rw-r--r-- | src/ui/controls/text_control.h | 15 |
5 files changed, 89 insertions, 210 deletions
diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/text_block.cpp index 30ffbef9..ecffb69e 100644 --- a/src/ui/controls/text_block.cpp +++ b/src/ui/controls/text_block.cpp @@ -1,8 +1,6 @@ #include "text_block.h" #include "ui/window.h" -#include "graph/graph.h" -#include "exception.h" namespace cru { diff --git a/src/ui/controls/text_box.cpp b/src/ui/controls/text_box.cpp index a8d78398..4a4114ab 100644 --- a/src/ui/controls/text_box.cpp +++ b/src/ui/controls/text_box.cpp @@ -15,13 +15,9 @@ namespace cru::ui::controls } TextBox::TextBox(const Microsoft::WRL::ComPtr<IDWriteTextFormat>& init_text_format, - const Microsoft::WRL::ComPtr<ID2D1Brush>& init_brush) : Control(false) + const Microsoft::WRL::ComPtr<ID2D1Brush>& init_brush) : TextControl(init_text_format, init_brush) { - text_format_ = init_text_format == nullptr ? graph::CreateDefaultTextFormat() : init_text_format; - - RecreateTextLayout(); - - brush_ = init_brush == nullptr ? CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::Black)) : init_brush; + SetSelectable(true); caret_brush_ = CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::Black)); @@ -30,88 +26,26 @@ namespace cru::ui::controls is_caret_show_ = !is_caret_show_; Repaint(); }); - - //selection_brush_ = CreateSolidBrush(D2D1::ColorF(D2D1::ColorF::LightSkyBlue)); } TextBox::~TextBox() = default; - void TextBox::SetText(const String& text) - { - if (text_ != text) - { - const auto old_text = text_; - text_ = text; - OnTextChangedCore(old_text, text); - } - } - - void TextBox::SetBrush(const Microsoft::WRL::ComPtr<ID2D1Brush>& brush) - { - brush_ = brush; - Repaint(); - } - - void TextBox::SetTextFormat(const Microsoft::WRL::ComPtr<IDWriteTextFormat>& text_format) - { - text_format_ = text_format; - RecreateTextLayout(); - Repaint(); - } - - void TextBox::OnSizeChangedCore(events::SizeChangedEventArgs& args) - { - Control::OnSizeChangedCore(args); - text_layout_->SetMaxWidth(args.GetNewSize().width); - text_layout_->SetMaxHeight(args.GetNewSize().height); - Repaint(); - } - void TextBox::OnDraw(ID2D1DeviceContext* device_context) { - Control::OnDraw(device_context); - if (text_layout_ != nullptr) + TextControl::OnDraw(device_context); + if (is_caret_show_) { - device_context->DrawTextLayout(D2D1::Point2F(), text_layout_.Get(), brush_.Get()); - if (is_caret_show_) - { - const auto caret_half_width = Application::GetInstance()->GetCaretInfo().half_caret_width; - FLOAT x, y; - DWRITE_HIT_TEST_METRICS metrics{}; - ThrowIfFailed(text_layout_->HitTestTextPosition(position_, FALSE, &x, &y, &metrics)); - device_context->FillRectangle(D2D1::RectF(metrics.left - caret_half_width, metrics.top, metrics.left + caret_half_width, metrics.top + metrics.height), caret_brush_.Get()); - } - } - } - - namespace - { - std::optional<unsigned> TextLayoutHitTest(IDWriteTextLayout* text_layout, const Point& point, bool test_inside = true) - { - BOOL is_trailing, is_inside; + const auto caret_half_width = Application::GetInstance()->GetCaretInfo().half_caret_width; + FLOAT x, y; DWRITE_HIT_TEST_METRICS metrics{}; - text_layout->HitTestPoint(point.x, point.y, &is_trailing, &is_inside, &metrics); - if (!test_inside || is_inside) - return is_trailing == 0 ? metrics.textPosition : metrics.textPosition + 1; - else - return std::nullopt; - } - } - - void TextBox::OnMouseDownCore(events::MouseButtonEventArgs& args) - { - Control::OnMouseDownCore(args); - if (args.GetMouseButton() == MouseButton::Left) - { - position_ = TextLayoutHitTest(text_layout_.Get(), args.GetPoint(this), false).value(); - - Repaint(); + ThrowIfFailed(text_layout_->HitTestTextPosition(caret_position_, FALSE, &x, &y, &metrics)); + device_context->FillRectangle(D2D1::RectF(metrics.left - caret_half_width, metrics.top, metrics.left + caret_half_width, metrics.top + metrics.height), caret_brush_.Get()); } } void TextBox::OnGetFocusCore(events::FocusChangeEventArgs& args) { - Control::OnGetFocusCore(args); + TextControl::OnGetFocusCore(args); assert(caret_timer_ == nullptr); is_caret_show_ = true; caret_timer_ = SetInterval(Application::GetInstance()->GetCaretInfo().caret_blink_duration, caret_action_); @@ -122,21 +56,24 @@ namespace cru::ui::controls Control::OnLoseFocusCore(args); assert(caret_timer_ != nullptr); caret_timer_->Cancel(); + caret_timer_ = nullptr; is_caret_show_ = false; } void TextBox::OnKeyDownCore(events::KeyEventArgs& args) { Control::OnKeyDownCore(args); - if (args.GetVirtualCode() == VK_LEFT && position_ > 0) + if (args.GetVirtualCode() == VK_LEFT && caret_position_ > 0) { - position_--; + ClearSelection(); + caret_position_--; Repaint(); } - if (args.GetVirtualCode() == VK_RIGHT && position_ < GetText().size()) + if (args.GetVirtualCode() == VK_RIGHT && caret_position_ < GetText().size()) { - position_++; + ClearSelection(); + caret_position_++; Repaint(); } } @@ -146,99 +83,57 @@ namespace cru::ui::controls Control::OnCharCore(args); if (args.GetChar() == L'\b') { - auto text = GetText(); - if (!text.empty() && position_ > 0) + if (GetSelectedRange().has_value()) { - const auto position = --position_; - text.erase(position); + const auto selection_range = GetSelectedRange().value(); + auto text = GetText(); + text.erase(text.cbegin() + selection_range.position, text.cbegin() + selection_range.position + selection_range.count); SetText(text); + caret_position_ = selection_range.position; + ClearSelection(); + } + else + { + if (caret_position_ > 0) + { + auto text = GetText(); + if (!text.empty()) + { + const auto position = --caret_position_; + text.erase(text.cbegin() + position); + SetText(text); + } + } } return; } if (std::iswprint(args.GetChar())) { - const auto position = position_++; - auto text = GetText(); - text.insert(text.cbegin() + position, { args.GetChar() }); - SetText(text); - } - } - - Size TextBox::OnMeasure(const Size& available_size) - { - const auto layout_params = GetLayoutParams(); - - if (layout_params->width.mode == MeasureMode::Stretch && layout_params->height.mode == MeasureMode::Stretch) - return available_size; - - auto&& get_measure_length = [](const LayoutSideParams& layout_length, const float available_length) -> float - { - switch (layout_length.mode) + if (GetSelectedRange().has_value()) { - case MeasureMode::Exactly: - { - return std::min(layout_length.length, available_length); + const auto selection_range = GetSelectedRange().value(); + auto text = GetText(); + text.erase(selection_range.position, selection_range.count); + text.insert(text.cbegin() + selection_range.position, args.GetChar()); + SetText(text); + caret_position_ = selection_range.position + 1; + ClearSelection(); } - case MeasureMode::Stretch: - case MeasureMode::Content: + else { - return available_length; - } - default: - UnreachableCode(); + ClearSelection(); + const auto position = caret_position_++; + auto text = GetText(); + text.insert(text.cbegin() + position, { args.GetChar() }); + SetText(text); } - }; - - const Size measure_size(get_measure_length(layout_params->width, available_size.width), - get_measure_length(layout_params->height, available_size.height)); - - ThrowIfFailed(text_layout_->SetMaxWidth(measure_size.width)); - ThrowIfFailed(text_layout_->SetMaxHeight(measure_size.height)); - - DWRITE_TEXT_METRICS metrics{}; - - ThrowIfFailed(text_layout_->GetMetrics(&metrics)); - - const Size measure_result(metrics.width, metrics.height); - - auto&& calculate_final_length = [](const LayoutSideParams& layout_length, const float measure_length, const float measure_result_length) -> float - { - if ((layout_length.mode == MeasureMode::Stretch || - layout_length.mode == MeasureMode::Exactly) - && measure_result_length < measure_length) - return measure_length; - else - return measure_result_length; - }; - - const Size result_size( - calculate_final_length(layout_params->width, measure_size.width, measure_result.width), - calculate_final_length(layout_params->height, measure_size.height, measure_result.height) - ); - - return result_size; + } } - void TextBox::OnTextChangedCore(const String& old_text, const String& new_text) + void TextBox::RequestChangeCaretPosition(const unsigned position) { - RecreateTextLayout(); + caret_position_ = position; Repaint(); } - - void TextBox::RecreateTextLayout() - { - assert(text_format_ != nullptr); - - const auto dwrite_factory = GetDWriteFactory(); - - const auto&& size = GetSize(); - - ThrowIfFailed(dwrite_factory->CreateTextLayout( - text_.c_str(), static_cast<UINT32>(text_.size()), - text_format_.Get(), - size.width, size.height, - &text_layout_ - )); - } } diff --git a/src/ui/controls/text_box.h b/src/ui/controls/text_box.h index b815ed1f..07c4abe4 100644 --- a/src/ui/controls/text_box.h +++ b/src/ui/controls/text_box.h @@ -1,11 +1,11 @@ #pragma once -#include "ui/control.h" +#include "text_control.h" #include "timer.h" namespace cru::ui::controls { - class TextBox : public Control + class TextBox : public TextControl { public: static TextBox* Create( @@ -17,8 +17,8 @@ namespace cru::ui::controls protected: explicit TextBox( - const Microsoft::WRL::ComPtr<IDWriteTextFormat>& init_text_format = nullptr, - const Microsoft::WRL::ComPtr<ID2D1Brush>& init_brush = nullptr + const Microsoft::WRL::ComPtr<IDWriteTextFormat>& init_text_format, + const Microsoft::WRL::ComPtr<ID2D1Brush>& init_brush ); public: TextBox(const TextBox& other) = delete; @@ -27,59 +27,22 @@ namespace cru::ui::controls TextBox& operator=(TextBox&& other) = delete; ~TextBox() override; - String GetText() const - { - return text_; - } - - void SetText(const String& text); - - Microsoft::WRL::ComPtr<ID2D1Brush> GetBrush() const - { - return brush_; - } - - void SetBrush(const Microsoft::WRL::ComPtr<ID2D1Brush>& brush); - - Microsoft::WRL::ComPtr<IDWriteTextFormat> GetTextFormat() const - { - return text_format_; - } - - void SetTextFormat(const Microsoft::WRL::ComPtr<IDWriteTextFormat>& text_format); - protected: - void OnSizeChangedCore(events::SizeChangedEventArgs& args) override final; void OnDraw(ID2D1DeviceContext* device_context) override; - void OnMouseDownCore(events::MouseButtonEventArgs& args) override final; - void OnGetFocusCore(events::FocusChangeEventArgs& args) override final; void OnLoseFocusCore(events::FocusChangeEventArgs& args) override final; void OnKeyDownCore(events::KeyEventArgs& args) override final; void OnCharCore(events::CharEventArgs& args) override final; - Size OnMeasure(const Size& available_size) override final; - - private: - void OnTextChangedCore(const String& old_text, const String& new_text); - - void RecreateTextLayout(); + void RequestChangeCaretPosition(unsigned position) override; private: - String text_; - - Microsoft::WRL::ComPtr<ID2D1Brush> brush_; - Microsoft::WRL::ComPtr<ID2D1Brush> caret_brush_; - //Microsoft::WRL::ComPtr<ID2D1Brush> selection_brush_; - Microsoft::WRL::ComPtr<IDWriteTextFormat> text_format_; - Microsoft::WRL::ComPtr<IDWriteTextLayout> text_layout_; - - unsigned position_ = 0; - + unsigned caret_position_ = 0; TimerTask caret_timer_; ActionPtr caret_action_; - bool is_caret_show_; + Microsoft::WRL::ComPtr<ID2D1Brush> caret_brush_; + bool is_caret_show_ = false; }; } diff --git a/src/ui/controls/text_control.cpp b/src/ui/controls/text_control.cpp index 3a466592..845b090a 100644 --- a/src/ui/controls/text_control.cpp +++ b/src/ui/controls/text_control.cpp @@ -66,7 +66,11 @@ namespace cru::ui::controls { if (!is_selectable) { - is_selecting_ = false; + if (is_selecting_) + { + is_selecting_ = false; + GetWindow()->ReleaseCurrentMouseCapture(); + } selected_range_ = std::nullopt; Repaint(); } @@ -133,8 +137,6 @@ namespace cru::ui::controls device_context->DrawTextLayout(D2D1::Point2F(), text_layout_.Get(), brush_.Get()); } - - void TextControl::OnMouseDownCore(events::MouseButtonEventArgs& args) { Control::OnMouseDownCore(args); @@ -144,6 +146,7 @@ namespace cru::ui::controls const auto hit_test_result = TextLayoutHitTest(text_layout_.Get(), args.GetPoint(this), true); if (hit_test_result.has_value()) { + RequestChangeCaretPosition(hit_test_result.value()); mouse_down_position_ = hit_test_result.value(); is_selecting_ = true; GetWindow()->CaptureMouseFor(this); @@ -158,12 +161,19 @@ namespace cru::ui::controls if (is_selecting_) { const auto hit_test_result = TextLayoutHitTest(text_layout_.Get(), args.GetPoint(this), false).value(); + RequestChangeCaretPosition(hit_test_result); if (hit_test_result > mouse_down_position_) + { selected_range_ = TextRange(mouse_down_position_, hit_test_result - mouse_down_position_); + } else if (hit_test_result < mouse_down_position_) + { selected_range_ = TextRange(hit_test_result, mouse_down_position_ - hit_test_result); + } else + { selected_range_ = std::nullopt; + } Repaint(); } } @@ -249,6 +259,10 @@ namespace cru::ui::controls return result_size; } + void TextControl::RequestChangeCaretPosition(unsigned position) + { + + } void TextControl::OnTextChangedCore(const String& old_text, const String& new_text) { diff --git a/src/ui/controls/text_control.h b/src/ui/controls/text_control.h index ca23ec95..a24766dc 100644 --- a/src/ui/controls/text_control.h +++ b/src/ui/controls/text_control.h @@ -51,8 +51,6 @@ namespace cru::ui::controls return is_selectable_; } - void SetSelectable(bool is_selectable); - std::optional<TextRange> GetSelectedRange() const { return selected_range_; @@ -60,6 +58,14 @@ namespace cru::ui::controls void SetSelectedRange(std::optional<TextRange> text_range); + void ClearSelection() + { + SetSelectedRange(std::nullopt); + } + + protected: + void SetSelectable(bool is_selectable); + protected: void OnSizeChangedCore(events::SizeChangedEventArgs& args) override final; void OnDraw(ID2D1DeviceContext* device_context) override; @@ -68,10 +74,11 @@ namespace cru::ui::controls void OnMouseMoveCore(events::MouseEventArgs& args) override final; void OnMouseUpCore(events::MouseButtonEventArgs& args) override final; - void OnLoseFocusCore(events::FocusChangeEventArgs& args) override final; + void OnLoseFocusCore(events::FocusChangeEventArgs& args) override; Size OnMeasure(const Size& available_size) override final; + virtual void RequestChangeCaretPosition(unsigned position); private: void OnTextChangedCore(const String& old_text, const String& new_text); @@ -84,8 +91,10 @@ namespace cru::ui::controls Microsoft::WRL::ComPtr<ID2D1Brush> brush_; Microsoft::WRL::ComPtr<ID2D1Brush> selection_brush_; Microsoft::WRL::ComPtr<IDWriteTextFormat> text_format_; + protected: Microsoft::WRL::ComPtr<IDWriteTextLayout> text_layout_; + private: Vector<TextLayoutHandlerPtr> text_layout_handlers_; bool is_selectable_ = false; |