...

4 files changed, 7 insertions, 14 deletions

diff --git a/src/ui/render/FlexLayoutRenderObject.cpp b/src/ui/render/FlexLayoutRenderObject.cpp
index e4b3774f..6d1f9c26 100644
--- a/src/ui/render/FlexLayoutRenderObject.cpp
+++ b/src/ui/render/FlexLayoutRenderObject.cpp
@@ -91,8 +91,7 @@ template <typename direction_tag_t,
 Size FlexLayoutMeasureContentImpl(
     const MeasureRequirement& requirement, const MeasureSize& preferred_size,
     const std::vector<RenderObject*>& children,
-    const std::vector<FlexChildLayoutData>& layout_data,
-    std::u16string_view log_tag) {
+    const std::vector<FlexChildLayoutData>& layout_data, StringView log_tag) {
   Expects(children.size() == layout_data.size());
 
   direction_tag_t direction_tag;
diff --git a/src/ui/render/RenderObject.cpp b/src/ui/render/RenderObject.cpp
index e49ed3c2..75bf1380 100644
--- a/src/ui/render/RenderObject.cpp
+++ b/src/ui/render/RenderObject.cpp
@@ -1,7 +1,7 @@
 #include "cru/ui/render/RenderObject.hpp"
 
 #include "cru/common/Logger.hpp"
-#include "cru/platform/GraphBase.hpp"
+#include "cru/platform/GraphicsBase.hpp"
 #include "cru/platform/graphics/util/Painter.hpp"
 #include "cru/ui/Base.hpp"
 #include "cru/ui/DebugFlags.hpp"
@@ -102,7 +102,7 @@ void RenderObject::Measure(const MeasureRequirement& requirement,
 
   if constexpr (cru::ui::debug_flags::layout) {
     log::Debug(u"{} Measure ends :\nresult size: {}",
-               this->GetDebugPathInTree(), size_.ToDebugString());
+               this->GetDebugPathInTree(), size_);
   }
 
   Ensures(size_.width >= 0);
@@ -112,7 +112,7 @@ void RenderObject::Measure(const MeasureRequirement& requirement,
 void RenderObject::Layout(const Point& offset) {
   if constexpr (cru::ui::debug_flags::layout) {
     log::Debug(u"{} Layout :\noffset: {} size: {}", this->GetDebugPathInTree(),
-               offset.ToDebugString(), GetSize().ToDebugString());
+               offset, GetSize());
   }
   offset_ = offset;
   OnLayoutCore();
diff --git a/src/ui/render/ScrollBar.cpp b/src/ui/render/ScrollBar.cpp
index ec583b2a..1dfe67bf 100644
--- a/src/ui/render/ScrollBar.cpp
+++ b/src/ui/render/ScrollBar.cpp
@@ -2,7 +2,7 @@
 
 #include "../Helper.hpp"
 #include "cru/common/Base.hpp"
-#include "cru/platform/GraphBase.hpp"
+#include "cru/platform/GraphicsBase.hpp"
 #include "cru/platform/graphics/Factory.hpp"
 #include "cru/platform/graphics/Geometry.hpp"
 #include "cru/platform/graphics/Painter.hpp"
diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp
index a5dcf053..dc6b2d43 100644
--- a/src/ui/render/TextRenderObject.cpp
+++ b/src/ui/render/TextRenderObject.cpp
@@ -33,15 +33,9 @@ TextRenderObject::TextRenderObject(
 
 TextRenderObject::~TextRenderObject() = default;
 
-std::u16string TextRenderObject::GetText() const {
-  return text_layout_->GetText();
-}
-
-std::u16string_view TextRenderObject::GetTextView() const {
-  return text_layout_->GetTextView();
-}
+String TextRenderObject::GetText() const { return text_layout_->GetText(); }
 
-void TextRenderObject::SetText(std::u16string new_text) {
+void TextRenderObject::SetText(String new_text) {
   text_layout_->SetText(std::move(new_text));
   InvalidateLayout();
 }