From 5c805e494425a88da1813902b1ad8a1ab351e30d Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sun, 5 Jul 2020 23:06:02 +0800
Subject: ...

---
 include/cru/ui/render/BorderRenderObject.hpp      | 2 +-
 include/cru/ui/render/FlexLayoutRenderObject.hpp  | 2 +-
 include/cru/ui/render/LayoutHelper.hpp            | 4 ++--
 include/cru/ui/render/RenderObject.hpp            | 2 +-
 include/cru/ui/render/StackLayoutRenderObject.hpp | 2 +-
 include/cru/ui/render/TextRenderObject.hpp        | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'include/cru/ui/render')

diff --git a/include/cru/ui/render/BorderRenderObject.hpp b/include/cru/ui/render/BorderRenderObject.hpp
index 94e888d4..587f051a 100644
--- a/include/cru/ui/render/BorderRenderObject.hpp
+++ b/include/cru/ui/render/BorderRenderObject.hpp
@@ -3,7 +3,7 @@
 
 namespace cru::ui::render {
 class BorderRenderObject : public RenderObject {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::BorderRenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render::BorderRenderObject")
 
  public:
   BorderRenderObject();
diff --git a/include/cru/ui/render/FlexLayoutRenderObject.hpp b/include/cru/ui/render/FlexLayoutRenderObject.hpp
index 87a41c7e..ee29d1e4 100644
--- a/include/cru/ui/render/FlexLayoutRenderObject.hpp
+++ b/include/cru/ui/render/FlexLayoutRenderObject.hpp
@@ -74,7 +74,7 @@ namespace cru::ui::render {
 // and just fill the rest space with blank.
 //
 class FlexLayoutRenderObject : public LayoutRenderObject<FlexChildLayoutData> {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::FlexLayoutRenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render::FlexLayoutRenderObject")
 
  public:
   FlexLayoutRenderObject() = default;
diff --git a/include/cru/ui/render/LayoutHelper.hpp b/include/cru/ui/render/LayoutHelper.hpp
index 3469ccf0..518dc5a3 100644
--- a/include/cru/ui/render/LayoutHelper.hpp
+++ b/include/cru/ui/render/LayoutHelper.hpp
@@ -9,6 +9,6 @@ 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);
 }  // namespace cru::ui::render
diff --git a/include/cru/ui/render/RenderObject.hpp b/include/cru/ui/render/RenderObject.hpp
index 2e784afc..f820f029 100644
--- a/include/cru/ui/render/RenderObject.hpp
+++ b/include/cru/ui/render/RenderObject.hpp
@@ -37,7 +37,7 @@ namespace cru::ui::render {
 class RenderObject : public Object {
   friend WindowRenderObject;
 
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::RenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render::RenderObject")
 
  protected:
   enum class ChildMode {
diff --git a/include/cru/ui/render/StackLayoutRenderObject.hpp b/include/cru/ui/render/StackLayoutRenderObject.hpp
index 534d7f22..303241c5 100644
--- a/include/cru/ui/render/StackLayoutRenderObject.hpp
+++ b/include/cru/ui/render/StackLayoutRenderObject.hpp
@@ -23,7 +23,7 @@ namespace cru::ui::render {
 // to min size.
 class StackLayoutRenderObject
     : public LayoutRenderObject<StackChildLayoutData> {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render:StackLayoutRenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render:StackLayoutRenderObject")
 
  public:
   StackLayoutRenderObject() = default;
diff --git a/include/cru/ui/render/TextRenderObject.hpp b/include/cru/ui/render/TextRenderObject.hpp
index 77a92b4f..32d96797 100644
--- a/include/cru/ui/render/TextRenderObject.hpp
+++ b/include/cru/ui/render/TextRenderObject.hpp
@@ -18,7 +18,7 @@ namespace cru::ui::render {
 // If the result layout box is bigger than actual text box, then text is center
 // aligned.
 class TextRenderObject : public RenderObject {
-  CRU_DEFINE_CLASS_LOG_TAG("cru::ui::render::TextRenderObject")
+  CRU_DEFINE_CLASS_LOG_TAG(u"cru::ui::render::TextRenderObject")
 
  public:
   constexpr static float default_caret_width = 2;
@@ -34,8 +34,8 @@ class TextRenderObject : public RenderObject {
   TextRenderObject& operator=(TextRenderObject&& other) = delete;
   ~TextRenderObject() override;
 
-  std::string GetText() const;
-  void SetText(std::string new_text);
+  std::u16string GetText() const;
+  void SetText(std::u16string new_text);
 
   std::shared_ptr<platform::graph::IBrush> GetBrush() const { return brush_; }
   void SetBrush(std::shared_ptr<platform::graph::IBrush> new_brush);
-- 
cgit v1.2.3