Merge branch 'master' of https://github.com/crupest/CruUI

1 files changed, 5 insertions, 31 deletions

diff --git a/src/ui/controls/TextBox.cpp b/src/ui/controls/TextBox.cpp
index 4a8d6658..bfc98c06 100644
--- a/src/ui/controls/TextBox.cpp
+++ b/src/ui/controls/TextBox.cpp
@@ -1,6 +1,5 @@
 #include "cru/ui/controls/TextBox.hpp"
 
-#include "TextControlService.hpp"
 #include "cru/ui/UiManager.hpp"
 #include "cru/ui/render/BorderRenderObject.hpp"
 #include "cru/ui/render/CanvasRenderObject.hpp"
@@ -10,9 +9,7 @@
 
 namespace cru::ui::controls {
 using render::BorderRenderObject;
-using render::CanvasRenderObject;
 using render::ScrollRenderObject;
-using render::StackLayoutRenderObject;
 using render::TextRenderObject;
 
 TextBox::TextBox()
@@ -20,8 +17,6 @@ TextBox::TextBox()
       scroll_render_object_(new ScrollRenderObject()) {
   const auto theme_resources = UiManager::GetInstance()->GetThemeResources();
 
-  border_style_ = theme_resources->text_box_border_style;
-
   text_render_object_ = std::make_unique<TextRenderObject>(
       theme_resources->text_brush, theme_resources->default_font,
       theme_resources->text_selection_brush, theme_resources->caret_brush);
@@ -33,24 +28,15 @@ TextBox::TextBox()
   scroll_render_object_->SetAttachedControl(this);
   text_render_object_->SetAttachedControl(this);
   text_render_object_->SetMinSize(Size{100, 24});
+  text_render_object_->SetMeasureIncludingTrailingSpace(true);
 
-  service_ = std::make_unique<TextControlService<TextBox>>(this);
+  service_ = std::make_unique<TextHostControlService>(this);
   service_->SetEnabled(true);
-  service_->SetCaretVisible(true);
   service_->SetEditable(true);
 
   border_render_object_->SetBorderEnabled(true);
-  border_render_object_->SetBorderStyle(border_style_.normal);
-
-  GainFocusEvent()->Direct()->AddHandler([this](event::FocusChangeEventArgs&) {
-    this->service_->SetCaretVisible(true);
-    this->UpdateBorderStyle();
-  });
 
-  LoseFocusEvent()->Direct()->AddHandler([this](event::FocusChangeEventArgs&) {
-    this->service_->SetCaretVisible(false);
-    this->UpdateBorderStyle();
-  });
+  GetStyleRuleSet()->SetParent(&theme_resources->text_box_style);
 }
 
 TextBox::~TextBox() {}
@@ -67,19 +53,7 @@ render::ScrollRenderObject* TextBox::GetScrollRenderObject() {
   return scroll_render_object_.get();
 }
 
-const TextBoxBorderStyle& TextBox::GetBorderStyle() { return border_style_; }
-
-void TextBox::SetBorderStyle(TextBoxBorderStyle border_style) {
-  border_style_ = std::move(border_style);
-}
-
-void TextBox::OnMouseHoverChange(bool) { UpdateBorderStyle(); }
-
-void TextBox::UpdateBorderStyle() {
-  const auto focus = HasFocus();
-  const auto hover = IsMouseOver();
-  border_render_object_->SetBorderStyle(
-      focus ? (hover ? border_style_.focus_hover : border_style_.focus)
-            : (hover ? border_style_.hover : border_style_.normal));
+void TextBox::ApplyBorderStyle(const style::ApplyBorderStyleInfo& style) {
+  border_render_object_->ApplyBorderStyle(style);
 }
 }  // namespace cru::ui::controls