...

7 files changed, 25 insertions, 24 deletions

diff --git a/src/ui/render/BorderRenderObject.cpp b/src/ui/render/BorderRenderObject.cpp
index f2e3eb9b..b7e1e709 100644
--- a/src/ui/render/BorderRenderObject.cpp
+++ b/src/ui/render/BorderRenderObject.cpp
@@ -57,7 +57,7 @@ void BorderRenderObject::OnDrawCore(platform::graph::IPainter* painter) {
                           background_brush_.get());
   if (is_border_enabled_) {
     if (border_brush_ == nullptr) {
-      log::TagWarn(log_tag, "Border is enabled but border brush is null.");
+      log::TagWarn(log_tag, u"Border is enabled but border brush is null.");
     } else {
       painter->FillGeometry(geometry_.get(), border_brush_.get());
     }
@@ -94,8 +94,8 @@ Size BorderRenderObject::OnMeasureCore(const MeasureRequirement& requirement,
     const auto max_width = requirement.max.width.GetLengthOrMax();
     if (coerced_space_size.width > max_width) {
       log::TagWarn(log_tag,
-                   "(Measure) Horizontal length of padding, border and margin "
-                   "is bigger than required max length.");
+                   u"(Measure) Horizontal length of padding, border and margin "
+                   u"is bigger than required max length.");
       coerced_space_size.width = max_width;
     }
     content_requirement.max.width = max_width - coerced_space_size.width;
@@ -110,8 +110,8 @@ Size BorderRenderObject::OnMeasureCore(const MeasureRequirement& requirement,
     const auto max_height = requirement.max.height.GetLengthOrMax();
     if (coerced_space_size.height > max_height) {
       log::TagWarn(log_tag,
-                   "(Measure) Vertical length of padding, border and margin is "
-                   "bigger than required max length.");
+                   u"(Measure) Vertical length of padding, border and margin is "
+                   u"bigger than required max length.");
       coerced_space_size.height = max_height;
     }
     content_requirement.max.height = max_height - coerced_space_size.height;
diff --git a/src/ui/render/FlexLayoutRenderObject.cpp b/src/ui/render/FlexLayoutRenderObject.cpp
index 8e6b41fe..ade230b5 100644
--- a/src/ui/render/FlexLayoutRenderObject.cpp
+++ b/src/ui/render/FlexLayoutRenderObject.cpp
@@ -88,7 +88,7 @@ Size FlexLayoutMeasureContentImpl(
     const MeasureRequirement& requirement, const MeasureSize& preferred_size,
     const std::vector<RenderObject*>& children,
     const std::vector<FlexChildLayoutData>& layout_data,
-    std::string_view log_tag) {
+    std::u16string_view log_tag) {
   Expects(children.size() == layout_data.size());
 
   direction_tag_t direction_tag;
@@ -111,8 +111,8 @@ Size FlexLayoutMeasureContentImpl(
         StackLayoutCalculateChildMaxLength(
             preferred_cross_length, max_cross_length,
             GetCross(child->GetMinSize(), direction_tag), log_tag,
-            "(Measure) Child's min cross size is bigger than parent's max "
-            "cross size."));
+            u"(Measure) Child's min cross size is bigger than parent's max "
+            u"cross size."));
   }
 
   // step 1.
@@ -315,7 +315,7 @@ Size FlexLayoutMeasureContentImpl(
       total_length > max_main_length.GetLengthOrUndefined()) {
     log::TagWarn(
         log_tag,
-        "(Measure) Children's main axis length exceeds required max length.");
+        u"(Measure) Children's main axis length exceeds required max length.");
     total_length = max_main_length.GetLengthOrUndefined();
   } else if (min_main_length.IsSpecified() &&
              total_length < min_main_length.GetLengthOrUndefined()) {
diff --git a/src/ui/render/LayoutHelper.cpp b/src/ui/render/LayoutHelper.cpp
index 9f94b84d..9ad2d862 100644
--- a/src/ui/render/LayoutHelper.cpp
+++ b/src/ui/render/LayoutHelper.cpp
@@ -19,8 +19,8 @@ float CalculateAnchorByAlignment(Alignment alignment, float start_point,
 
 MeasureLength StackLayoutCalculateChildMaxLength(
     MeasureLength parent_preferred_size, MeasureLength parent_max_size,
-    MeasureLength child_min_size, std::string_view log_tag,
-    std::string_view exceeds_message) {
+    MeasureLength child_min_size, std::u16string_view log_tag,
+    std::u16string_view exceeds_message) {
   if (parent_max_size.GetLengthOrMax() < child_min_size.GetLengthOr0()) {
     log::TagWarn(log_tag, exceeds_message);
     return parent_max_size;
diff --git a/src/ui/render/RenderObject.cpp b/src/ui/render/RenderObject.cpp
index 66b62e6e..30433868 100644
--- a/src/ui/render/RenderObject.cpp
+++ b/src/ui/render/RenderObject.cpp
@@ -152,8 +152,8 @@ Size RenderObject::OnMeasureCore(const MeasureRequirement& requirement,
     const auto max_width = requirement.max.width.GetLengthOrMax();
     if (coerced_space_size.width > max_width) {
       log::TagWarn(log_tag,
-                   "(Measure) Horizontal length of padding and margin is "
-                   "bigger than required max length.");
+                   u"(Measure) Horizontal length of padding and margin is "
+                   u"bigger than required max length.");
       coerced_space_size.width = max_width;
     }
     content_requirement.max.width = max_width - coerced_space_size.width;
@@ -168,8 +168,8 @@ Size RenderObject::OnMeasureCore(const MeasureRequirement& requirement,
     const auto max_height = requirement.max.height.GetLengthOrMax();
     if (coerced_space_size.height > max_height) {
       log::TagWarn(log_tag,
-                   "(Measure) Vertical length of padding and margin is bigger "
-                   "than required max length.");
+                   u"(Measure) Vertical length of padding and margin is bigger "
+                   u"than required max length.");
       coerced_space_size.height = max_height;
     }
     content_requirement.max.height = max_height - coerced_space_size.height;
diff --git a/src/ui/render/ScrollRenderObject.cpp b/src/ui/render/ScrollRenderObject.cpp
index 77367970..d3996b98 100644
--- a/src/ui/render/ScrollRenderObject.cpp
+++ b/src/ui/render/ScrollRenderObject.cpp
@@ -69,6 +69,7 @@ void ScrollRenderObject::SetScrollOffset(const Point& offset) {
 
 void ScrollToContain(const Rect& rect) {
   // TODO: Implement this.
+  CRU_UNUSED(rect);
   throw std::runtime_error("Not implemented.");
 }
 
diff --git a/src/ui/render/StackLayoutRenderObject.cpp b/src/ui/render/StackLayoutRenderObject.cpp
index 168ff379..75ab0ee3 100644
--- a/src/ui/render/StackLayoutRenderObject.cpp
+++ b/src/ui/render/StackLayoutRenderObject.cpp
@@ -15,13 +15,13 @@ Size StackLayoutRenderObject::OnMeasureContent(
             MeasureSize{StackLayoutCalculateChildMaxLength(
                             preferred_size.width, requirement.max.width,
                             child->GetMinSize().width, log_tag,
-                            "(Measure) Child's min width is bigger than "
-                            "parent's max width."),
+                            u"(Measure) Child's min width is bigger than "
+                            u"parent's max width."),
                         StackLayoutCalculateChildMaxLength(
                             preferred_size.height, requirement.max.height,
                             child->GetMinSize().height, log_tag,
-                            "(Measure) Child's min height is bigger than "
-                            "parent's max height.")},
+                            u"(Measure) Child's min height is bigger than "
+                            u"parent's max height.")},
             MeasureSize::NotSpecified()},
         MeasureSize::NotSpecified());
     const auto size = child->GetSize();
diff --git a/src/ui/render/TextRenderObject.cpp b/src/ui/render/TextRenderObject.cpp
index 87a3c352..8a4a4ba1 100644
--- a/src/ui/render/TextRenderObject.cpp
+++ b/src/ui/render/TextRenderObject.cpp
@@ -28,16 +28,16 @@ TextRenderObject::TextRenderObject(
   caret_brush.swap(caret_brush_);
 
   const auto graph_factory = GetGraphFactory();
-  text_layout_ = graph_factory->CreateTextLayout(font_, "");
+  text_layout_ = graph_factory->CreateTextLayout(font_, u"");
 }
 
 TextRenderObject::~TextRenderObject() = default;
 
-std::string TextRenderObject::GetText() const {
+std::u16string TextRenderObject::GetText() const {
   return text_layout_->GetText();
 }
 
-void TextRenderObject::SetText(std::string new_text) {
+void TextRenderObject::SetText(std::u16string new_text) {
   text_layout_->SetText(std::move(new_text));
 }
 
@@ -171,7 +171,7 @@ Size TextRenderObject::OnMeasureContent(const MeasureRequirement& requirement,
   if (requirement.max.width.IsSpecified() &&
       text_size.width > requirement.max.width.GetLengthOrUndefined()) {
     log::TagWarn(log_tag,
-                 "(Measure) Text actual width exceeds the required max width.");
+                 u"(Measure) Text actual width exceeds the required max width.");
     result.width = requirement.max.width.GetLengthOrUndefined();
   } else {
     result.width = std::max(result.width, preferred_size.width.GetLengthOr0());
@@ -182,7 +182,7 @@ Size TextRenderObject::OnMeasureContent(const MeasureRequirement& requirement,
       text_size.height > requirement.max.height.GetLengthOrUndefined()) {
     log::TagWarn(
         log_tag,
-        "(Measure) Text actual height exceeds the required max height.");
+        u"(Measure) Text actual height exceeds the required max height.");
     result.height = requirement.max.height.GetLengthOrUndefined();
   } else {
     result.height =