...

1 files changed, 3 insertions, 21 deletions

diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/text_block.cpp
index 1c20540d..a3ec9f54 100644
--- a/src/ui/controls/text_block.cpp
+++ b/src/ui/controls/text_block.cpp
@@ -11,24 +11,14 @@ using render::CanvasRenderObject;
 using render::StackLayoutRenderObject;
 using render::TextRenderObject;
 
-TextBlock::TextBlock()
-    : root_render_object_(new StackLayoutRenderObject()),
-      text_render_object_(),
-      caret_render_object_(new CanvasRenderObject()) {
+TextBlock::TextBlock() {
   const auto theme_resources = UiManager::GetInstance()->GetThemeResources();
 
   text_render_object_ = std::make_unique<TextRenderObject>(
       theme_resources->text_brush, theme_resources->default_font,
-      theme_resources->text_selection_brush);
+      theme_resources->text_selection_brush, theme_resources->caret_brush);
 
-  root_render_object_->AddChild(text_render_object_.get(), 0);
-  root_render_object_->AddChild(caret_render_object_.get(), 1);
-
-  root_render_object_->SetAttachedControl(this);
   text_render_object_->SetAttachedControl(this);
-  caret_render_object_->SetAttachedControl(this);
-
-  caret_brush_ = theme_resources->caret_brush;
 
   service_ = std::make_unique<TextControlService<TextBlock>>(this);
   service_->SetEnabled(true);
@@ -37,7 +27,7 @@ TextBlock::TextBlock()
 TextBlock::~TextBlock() = default;
 
 render::RenderObject* TextBlock::GetRenderObject() const {
-  return root_render_object_.get();
+  return text_render_object_.get();
 }
 
 std::string TextBlock::GetText() const {
@@ -51,12 +41,4 @@ void TextBlock::SetText(std::string text) {
 render::TextRenderObject* TextBlock::GetTextRenderObject() {
   return text_render_object_.get();
 }
-
-render::CanvasRenderObject* TextBlock::GetCaretRenderObject() {
-  return caret_render_object_.get();
-}
-
-std::shared_ptr<platform::graph::IBrush> TextBlock::GetCaretBrush() {
-  return caret_brush_;
-}
 }  // namespace cru::ui::controls