...

2 files changed, 31 insertions, 5 deletions

diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/text_block.cpp
index 333b44c8..9d01dee9 100644
--- a/src/ui/controls/text_block.cpp
+++ b/src/ui/controls/text_block.cpp
@@ -7,12 +7,10 @@ namespace cru::ui::controls {
 using render::TextRenderObject;
 
 TextBlock::TextBlock() {
-  const auto predefined_resources =
-      UiManager::GetInstance()->GetPredefineResources();
+  const auto theme_resources = UiManager::GetInstance()->GetThemeResources();
   render_object_ = std::make_unique<TextRenderObject>(
-      predefined_resources->text_block_text_brush,
-      predefined_resources->text_block_font,
-      predefined_resources->text_block_selection_brush);
+      theme_resources->text_brush, theme_resources->default_font,
+      theme_resources->text_selection_brush);
   render_object_->SetAttachedControl(this);
 }
 
diff --git a/src/ui/controls/text_box.cpp b/src/ui/controls/text_box.cpp
index 7fde06d9..07b70b94 100644
--- a/src/ui/controls/text_box.cpp
+++ b/src/ui/controls/text_box.cpp
@@ -1 +1,29 @@
 #include "cru/ui/controls/text_box.hpp"
+
+#include "cru/ui/render/border_render_object.hpp"
+#include "cru/ui/render/canvas_render_object.hpp"
+#include "cru/ui/render/text_render_object.hpp"
+#include "cru/ui/ui_manager.hpp"
+
+namespace cru::ui::controls {
+using render::BorderRenderObject;
+using render::CanvasRenderObject;
+using render::TextRenderObject;
+
+TextBox::TextBox()
+    : border_render_object_(new BorderRenderObject()),
+      text_render_object_(),
+      caret_render_object_(new CanvasRenderObject()) {
+  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);
+
+  border_render_object_->SetAttachedControl(this);
+  text_render_object_->SetAttachedControl(this);
+  caret_render_object_->SetAttachedControl(this);
+}
+
+TextBox::~TextBox() {}
+}  // namespace cru::ui::controls