Finish refactor!!!

1 files changed, 8 insertions, 6 deletions

diff --git a/src/ui/controls/text_block.cpp b/src/ui/controls/text_block.cpp
index c2f8cd8e..55d83acc 100644
--- a/src/ui/controls/text_block.cpp
+++ b/src/ui/controls/text_block.cpp
@@ -1,7 +1,7 @@
-#include "text_block.hpp"
+#include "cru/ui/controls/text_block.hpp"
 
-#include "ui/render/text_render_object.hpp"
-#include "ui/ui_manager.hpp"
+#include "cru/ui/render/text_render_object.hpp"
+#include "cru/ui/ui_manager.hpp"
 
 namespace cru::ui::controls {
 using render::TextRenderObject;
@@ -11,7 +11,7 @@ TextBlock::TextBlock() {
       UiManager::GetInstance()->GetPredefineResources();
   render_object_.reset(
       new TextRenderObject(predefined_resources->text_block_text_brush,
-                           predefined_resources->text_block_text_format,
+                           predefined_resources->text_block_font,
                            predefined_resources->text_block_selection_brush));
 }
 
@@ -19,7 +19,9 @@ render::RenderObject* TextBlock::GetRenderObject() const {
   return render_object_.get();
 }
 
-String TextBlock::GetText() const { return render_object_->GetText(); }
+std::wstring TextBlock::GetText() const { return render_object_->GetText(); }
 
-void TextBlock::SetText(const String& text) { render_object_->SetText(text); }
+void TextBlock::SetText(std::wstring text) {
+  render_object_->SetText(std::move(text));
+}
 }  // namespace cru::ui::controls