7 files changed, 16 insertions, 12 deletions
diff --git a/include/cru/common/Base.hpp b/include/cru/common/Base.hpp
index 2f76385e..174ac037 100644
--- a/include/cru/common/Base.hpp
+++ b/include/cru/common/Base.hpp
@@ -96,5 +96,5 @@ inline void hash_combine(std::size_t& s, const T& v) {
 
 #define CRU_DEFINE_CLASS_LOG_TAG(tag) \
  private:                             \
-  constexpr static std::u16string_view log_tag = tag;
+  constexpr static StringView log_tag = tag;
 }  // namespace cru
diff --git a/include/cru/common/Logger.hpp b/include/cru/common/Logger.hpp
index 5aea5126..3dabeb91 100644
--- a/include/cru/common/Logger.hpp
+++ b/include/cru/common/Logger.hpp
@@ -13,7 +13,7 @@ enum class LogLevel { Debug, Info, Warn, Error };
 struct CRU_BASE_API ILogSource : virtual Interface {
   // Write the string s. LogLevel is just a helper. It has no effect on the
   // content to write.
-  virtual void Write(LogLevel level, const String& s) = 0;
+  virtual void Write(LogLevel level, StringView s) = 0;
 };
 
 class CRU_BASE_API Logger : public Object {
@@ -33,8 +33,8 @@ class CRU_BASE_API Logger : public Object {
   void RemoveSource(ILogSource* source);
 
  public:
-  void Log(LogLevel level, const String& message);
-  void Log(LogLevel level, const String& tag, const String& message);
+  void Log(LogLevel level, StringView message);
+  void Log(LogLevel level, StringView tag, StringView message);
 
  private:
   std::list<std::unique_ptr<ILogSource>> sources_;
@@ -69,7 +69,7 @@ void Error(TArgs&&... args) {
 
 // TODO: Remove argument evaluation in Debug.
 template <typename... TArgs>
-void TagDebug([[maybe_unused]] std::u16string_view tag,
+void TagDebug([[maybe_unused]] StringView tag,
               [[maybe_unused]] TArgs&&... args) {
 #ifdef CRU_DEBUG
   Logger::GetInstance()->Log(LogLevel::Debug, tag,
@@ -78,19 +78,19 @@ void TagDebug([[maybe_unused]] std::u16string_view tag,
 }
 
 template <typename... TArgs>
-void TagInfo(std::u16string_view tag, TArgs&&... args) {
+void TagInfo(StringView tag, TArgs&&... args) {
   Logger::GetInstance()->Log(LogLevel::Info, tag,
                              Format(std::forward<TArgs>(args)...));
 }
 
 template <typename... TArgs>
-void TagWarn(std::u16string_view tag, TArgs&&... args) {
+void TagWarn(StringView tag, TArgs&&... args) {
   Logger::GetInstance()->Log(LogLevel::Warn, tag,
                              Format(std::forward<TArgs>(args)...));
 }
 
 template <typename... TArgs>
-void TagError(std::u16string_view tag, TArgs&&... args) {
+void TagError(StringView tag, TArgs&&... args) {
   Logger::GetInstance()->Log(LogLevel::Error, tag,
                              Format(std::forward<TArgs>(args)...));
 }
diff --git a/include/cru/common/String.hpp b/include/cru/common/String.hpp
index f407cb60..58abc517 100644
--- a/include/cru/common/String.hpp
+++ b/include/cru/common/String.hpp
@@ -372,6 +372,8 @@ inline void String::append(StringView str) {
 }
 
 inline String String::From(StringView str) { return str.ToString(); }
+
+inline String ToString(StringView value) { return value.ToString(); }
 }  // namespace cru
 
 template <>
diff --git a/include/cru/osx/graphics/quartz/Font.hpp b/include/cru/osx/graphics/quartz/Font.hpp
index 75eeff60..1ea2b891 100644
--- a/include/cru/osx/graphics/quartz/Font.hpp
+++ b/include/cru/osx/graphics/quartz/Font.hpp
@@ -17,6 +17,8 @@ class OsxCTFont : public OsxQuartzResource, public virtual IFont {
 
   CTFontRef GetCTFont() const { return ct_font_; }
 
+  float GetFontSize() override;
+
  private:
   CTFontRef ct_font_;
 };
diff --git a/include/cru/osx/graphics/quartz/Resource.hpp b/include/cru/osx/graphics/quartz/Resource.hpp
index d7038274..8b8f8bbc 100644
--- a/include/cru/osx/graphics/quartz/Resource.hpp
+++ b/include/cru/osx/graphics/quartz/Resource.hpp
@@ -17,7 +17,7 @@ class OsxQuartzResource : public platform::osx::OsxResource,
  public:
   String GetPlatformId() const override { return u"OSX Quartz"; }
 
-  IGraphicsFactory* GetGraphicsFactory() override;
+  IGraphicsFactory* GetGraphicsFactory() override { return graphics_factory_; }
 
  private:
   IGraphicsFactory* graphics_factory_;
diff --git a/include/cru/ui/helper/ShortcutHub.hpp b/include/cru/ui/helper/ShortcutHub.hpp
index fe3414fe..7f098a6d 100644
--- a/include/cru/ui/helper/ShortcutHub.hpp
+++ b/include/cru/ui/helper/ShortcutHub.hpp
@@ -45,8 +45,8 @@ class ShortcutKeyBind {
     return !this->operator==(other);
   }
 
-  std::u16string ToString() {
-    std::u16string result = u"(";
+  String ToString() {
+    String result = u"(";
     result += platform::gui::ToString(modifier_);
     result += u")";
     result += platform::gui::ToString(key_);
diff --git a/include/cru/ui/render/BorderRenderObject.hpp b/include/cru/ui/render/BorderRenderObject.hpp
index 34ad71d6..5bed3cb0 100644
--- a/include/cru/ui/render/BorderRenderObject.hpp
+++ b/include/cru/ui/render/BorderRenderObject.hpp
@@ -2,7 +2,7 @@
 #include <string_view>
 #include "../style/ApplyBorderStyleInfo.hpp"
 #include "RenderObject.hpp"
-#include "cru/platform/GraphBase.hpp"
+#include "cru/platform/GraphicsBase.hpp"
 #include "cru/ui/Base.hpp"
 
 namespace cru::ui::render {