...

12 files changed, 39 insertions, 40 deletions

diff --git a/src/common/String.cpp b/src/common/String.cpp
index 1c2ff022..ca16cee7 100644
--- a/src/common/String.cpp
+++ b/src/common/String.cpp
@@ -45,7 +45,7 @@ String::String(std::initializer_list<char16_t> l)
 #ifdef CRU_PLATFORM_WINDOWS
 String::String(const wchar_t* str) : String(str, GetStrSize(str)) {}
 String::String(const wchar_t* str, Index size)
-    : String(reinterpret_cast<const std::uint16_t*>(str), size) {}
+    : String(reinterpret_cast<const char16_t*>(str), size) {}
 #endif
 
 String::String(const String& other) {
@@ -426,7 +426,7 @@ std::vector<FormatToken> ParseToFormatTokenList(const String& str) {
 void FormatAppendFromFormatTokenList(
     String& current, const std::vector<FormatToken>& format_token_list,
     Index index) {
-  for (Index i = index; i < format_token_list.size(); i++) {
+  for (Index i = index; i < static_cast<Index>(format_token_list.size()); i++) {
     const auto& token = format_token_list[i];
     if (token.type == FormatTokenType::PlaceHolder) {
       current += u"{}";
diff --git a/src/common/StringUtil.cpp b/src/common/StringUtil.cpp
index 440db8c4..6e478033 100644
--- a/src/common/StringUtil.cpp
+++ b/src/common/StringUtil.cpp
@@ -113,6 +113,8 @@ CodePoint Utf16NextCodePoint(const char16_t* ptr, Index size, Index current,
 
 CodePoint Utf16PreviousCodePoint(const char16_t* ptr, Index size, Index current,
                                  Index* previous_position) {
+  CRU_UNUSED(size)
+
   CodePoint result;
   if (current <= 0) {
     result = k_invalid_code_point;
diff --git a/src/win/Exception.cpp b/src/win/Exception.cpp
index df2103fd..a7b0927a 100644
--- a/src/win/Exception.cpp
+++ b/src/win/Exception.cpp
@@ -1,6 +1,5 @@
 #include "cru/win/Exception.hpp"
 
-#include <fmt/format.h>
 #include <optional>
 
 namespace cru::platform::win {
diff --git a/src/win/HeapDebug.cpp b/src/win/HeapDebug.cpp
index 6ec1ffcc..b1b9fe1a 100644
--- a/src/win/HeapDebug.cpp
+++ b/src/win/HeapDebug.cpp
@@ -1,11 +1,9 @@
 #include "cru/win/WinPreConfig.hpp"
 
-#include "cru/platform/HeapDebug.hpp"
-
 #include <crtdbg.h>
 
 namespace cru::platform {
 void SetupHeapDebug() {
   _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 }
-}
+}  // namespace cru::platform
diff --git a/src/win/graphics/direct/Brush.cpp b/src/win/graphics/direct/Brush.cpp
index b7842b97..eb6ea973 100644
--- a/src/win/graphics/direct/Brush.cpp
+++ b/src/win/graphics/direct/Brush.cpp
@@ -5,8 +5,8 @@
 #include "cru/win/graphics/direct/Factory.hpp"
 
 namespace cru::platform::graphics::win::direct {
-D2DSolidColorBrush::D2DSolidColorBrush(DirectGraphFactory* factory)
-    : DirectGraphResource(factory) {
+D2DSolidColorBrush::D2DSolidColorBrush(DirectGraphicsFactory* factory)
+    : DirectGraphicsResource(factory) {
   ThrowIfFailed(factory->GetDefaultD2D1DeviceContext()->CreateSolidColorBrush(
       Convert(color_), &brush_));
 }
diff --git a/src/win/graphics/direct/Factory.cpp b/src/win/graphics/direct/Factory.cpp
index 6694801f..4c4f1a9a 100644
--- a/src/win/graphics/direct/Factory.cpp
+++ b/src/win/graphics/direct/Factory.cpp
@@ -27,7 +27,7 @@ void InitializeCom() {
 void UninitializeCom() { ::CoUninitialize(); }
 }  // namespace
 
-DirectGraphFactory::DirectGraphFactory() {
+DirectGraphicsFactory::DirectGraphicsFactory() {
   // TODO! Detect repeated creation. Because I don't think we can create two d2d
   // and dwrite factory so we need to prevent the "probably dangerous" behavior.
 
@@ -76,31 +76,33 @@ DirectGraphFactory::DirectGraphFactory() {
       &dwrite_system_font_collection_));
 }
 
-DirectGraphFactory::~DirectGraphFactory() { UninitializeCom(); }
+DirectGraphicsFactory::~DirectGraphicsFactory() { UninitializeCom(); }
 
 Microsoft::WRL::ComPtr<ID2D1DeviceContext>
-DirectGraphFactory::CreateD2D1DeviceContext() {
+DirectGraphicsFactory::CreateD2D1DeviceContext() {
   Microsoft::WRL::ComPtr<ID2D1DeviceContext> d2d1_device_context;
   ThrowIfFailed(d2d1_device_->CreateDeviceContext(
       D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &d2d1_device_context));
   return d2d1_device_context;
 }
 
-std::unique_ptr<ISolidColorBrush> DirectGraphFactory::CreateSolidColorBrush() {
+std::unique_ptr<ISolidColorBrush>
+DirectGraphicsFactory::CreateSolidColorBrush() {
   return std::make_unique<D2DSolidColorBrush>(this);
 }
 
-std::unique_ptr<IGeometryBuilder> DirectGraphFactory::CreateGeometryBuilder() {
+std::unique_ptr<IGeometryBuilder>
+DirectGraphicsFactory::CreateGeometryBuilder() {
   return std::make_unique<D2DGeometryBuilder>(this);
 }
 
-std::unique_ptr<IFont> DirectGraphFactory::CreateFont(
-    std::u16string font_family, float font_size) {
+std::unique_ptr<IFont> DirectGraphicsFactory::CreateFont(String font_family,
+                                                         float font_size) {
   return std::make_unique<DWriteFont>(this, std::move(font_family), font_size);
 }
 
-std::unique_ptr<ITextLayout> DirectGraphFactory::CreateTextLayout(
-    std::shared_ptr<IFont> font, std::u16string text) {
+std::unique_ptr<ITextLayout> DirectGraphicsFactory::CreateTextLayout(
+    std::shared_ptr<IFont> font, String text) {
   return std::make_unique<DWriteTextLayout>(this, std::move(font),
                                             std::move(text));
 }
diff --git a/src/win/graphics/direct/Font.cpp b/src/win/graphics/direct/Font.cpp
index 1d6a5c88..413c998b 100644
--- a/src/win/graphics/direct/Font.cpp
+++ b/src/win/graphics/direct/Font.cpp
@@ -7,9 +7,9 @@
 #include <utility>
 
 namespace cru::platform::graphics::win::direct {
-DWriteFont::DWriteFont(DirectGraphFactory* factory, std::u16string font_family,
+DWriteFont::DWriteFont(DirectGraphicsFactory* factory, String font_family,
                        float font_size)
-    : DirectGraphResource(factory), font_family_(std::move(font_family)) {
+    : DirectGraphicsResource(factory), font_family_(std::move(font_family)) {
   // Get locale
   std::array<wchar_t, LOCALE_NAME_MAX_LENGTH> buffer;
   if (!::GetUserDefaultLocaleName(buffer.data(),
diff --git a/src/win/graphics/direct/Geometry.cpp b/src/win/graphics/direct/Geometry.cpp
index d07a819f..2a544859 100644
--- a/src/win/graphics/direct/Geometry.cpp
+++ b/src/win/graphics/direct/Geometry.cpp
@@ -5,8 +5,8 @@
 #include "cru/win/graphics/direct/Factory.hpp"
 
 namespace cru::platform::graphics::win::direct {
-D2DGeometryBuilder::D2DGeometryBuilder(DirectGraphFactory* factory)
-    : DirectGraphResource(factory) {
+D2DGeometryBuilder::D2DGeometryBuilder(DirectGraphicsFactory* factory)
+    : DirectGraphicsResource(factory) {
   ThrowIfFailed(factory->GetD2D1Factory()->CreatePathGeometry(&geometry_));
   ThrowIfFailed(geometry_->Open(&geometry_sink_));
 }
@@ -49,9 +49,9 @@ std::unique_ptr<IGeometry> D2DGeometryBuilder::Build() {
   return geometry;
 }
 
-D2DGeometry::D2DGeometry(DirectGraphFactory* factory,
+D2DGeometry::D2DGeometry(DirectGraphicsFactory* factory,
                          Microsoft::WRL::ComPtr<ID2D1PathGeometry> geometry)
-    : DirectGraphResource(factory), geometry_(std::move(geometry)) {}
+    : DirectGraphicsResource(factory), geometry_(std::move(geometry)) {}
 
 bool D2DGeometry::FillContains(const Point& point) {
   BOOL result;
diff --git a/src/win/graphics/direct/Resource.cpp b/src/win/graphics/direct/Resource.cpp
index 6ae74e64..0e9719f4 100644
--- a/src/win/graphics/direct/Resource.cpp
+++ b/src/win/graphics/direct/Resource.cpp
@@ -5,10 +5,12 @@
 namespace cru::platform::graphics::win::direct {
 String DirectResource::kPlatformId = u"Windows Direct";
 
-DirectGraphResource::DirectGraphResource(DirectGraphFactory* factory)
+DirectGraphicsResource::DirectGraphicsResource(DirectGraphicsFactory* factory)
     : factory_(factory) {
   Expects(factory);
 }
 
-IGraphFactory* DirectGraphResource::GetGraphFactory() { return factory_; }
+IGraphicsFactory* DirectGraphicsResource::GetGraphicsFactory() {
+  return factory_;
+}
 }  // namespace cru::platform::graphics::win::direct
diff --git a/src/win/graphics/direct/TextLayout.cpp b/src/win/graphics/direct/TextLayout.cpp
index 0b3c68ca..6ece8ed1 100644
--- a/src/win/graphics/direct/TextLayout.cpp
+++ b/src/win/graphics/direct/TextLayout.cpp
@@ -9,10 +9,9 @@
 #include <utility>
 
 namespace cru::platform::graphics::win::direct {
-DWriteTextLayout::DWriteTextLayout(DirectGraphFactory* factory,
-                                   std::shared_ptr<IFont> font,
-                                   std::u16string text)
-    : DirectGraphResource(factory), text_(std::move(text)) {
+DWriteTextLayout::DWriteTextLayout(DirectGraphicsFactory* factory,
+                                   std::shared_ptr<IFont> font, String text)
+    : DirectGraphicsResource(factory), text_(std::move(text)) {
   Expects(font);
   font_ = CheckPlatform<DWriteFont>(font, GetPlatformId());
 
@@ -24,12 +23,10 @@ DWriteTextLayout::DWriteTextLayout(DirectGraphFactory* factory,
 
 DWriteTextLayout::~DWriteTextLayout() = default;
 
-std::u16string DWriteTextLayout::GetText() { return text_; }
+String DWriteTextLayout::GetText() { return text_; }
 
-std::u16string_view DWriteTextLayout::GetTextView() { return text_; }
-
-void DWriteTextLayout::SetText(std::u16string new_text) {
-  text_.swap(new_text);
+void DWriteTextLayout::SetText(String new_text) {
+  text_ = std::move(new_text);
   ThrowIfFailed(GetDirectFactory()->GetDWriteFactory()->CreateTextLayout(
       reinterpret_cast<const wchar_t*>(text_.c_str()),
       static_cast<UINT32>(text_.size()), font_->GetComInterface(), max_width_,
@@ -100,14 +97,14 @@ std::vector<Rect> DWriteTextLayout::TextRangeRect(
   return result;
 }
 
-Point DWriteTextLayout::TextSinglePoint(Index position, bool trailing) {
+Rect DWriteTextLayout::TextSinglePoint(Index position, bool trailing) {
   DWRITE_HIT_TEST_METRICS metrics;
   FLOAT left;
   FLOAT top;
   ThrowIfFailed(text_layout_->HitTestTextPosition(static_cast<UINT32>(position),
                                                   static_cast<BOOL>(trailing),
                                                   &left, &top, &metrics));
-  return Point{left, top};
+  return Rect{left, top, 0, GetFont()->GetFontSize()};
 }
 
 TextHitTestResult DWriteTextLayout::HitTest(const Point& point) {
@@ -121,7 +118,6 @@ TextHitTestResult DWriteTextLayout::HitTest(const Point& point) {
   TextHitTestResult result;
   result.position = metrics.textPosition;
   result.trailing = trailing != 0;
-  result.insideText = inside != 0;
   return result;
 }
 }  // namespace cru::platform::graphics::win::direct
diff --git a/src/win/graphics/direct/WindowRenderTarget.cpp b/src/win/graphics/direct/WindowRenderTarget.cpp
index 7479ae24..020ce4b4 100644
--- a/src/win/graphics/direct/WindowRenderTarget.cpp
+++ b/src/win/graphics/direct/WindowRenderTarget.cpp
@@ -5,7 +5,7 @@
 
 namespace cru::platform::graphics::win::direct {
 D2DWindowRenderTarget::D2DWindowRenderTarget(
-    gsl::not_null<DirectGraphFactory*> factory, HWND hwnd)
+    gsl::not_null<DirectGraphicsFactory*> factory, HWND hwnd)
     : factory_(factory), hwnd_(hwnd) {
   const auto d3d11_device = factory->GetD3D11Device();
   const auto dxgi_factory = factory->GetDxgiFactory();
diff --git a/src/win/gui/UiApplication.cpp b/src/win/gui/UiApplication.cpp
index f4541dd0..12480417 100644
--- a/src/win/gui/UiApplication.cpp
+++ b/src/win/gui/UiApplication.cpp
@@ -37,7 +37,7 @@ WinUiApplication::WinUiApplication() {
       std::make_unique<::cru::platform::win::WinStdOutLoggerSource>());
 
   graph_factory_ = std::make_unique<
-      cru::platform::graphics::win::direct::DirectGraphFactory>();
+      cru::platform::graphics::win::direct::DirectGraphicsFactory>();
 
   god_window_ = std::make_unique<GodWindow>(this);
   timer_manager_ = std::make_unique<TimerManager>(god_window_.get());
@@ -112,7 +112,7 @@ INativeWindow* WinUiApplication::CreateWindow(INativeWindow* parent,
                              p);
 }
 
-cru::platform::graphics::IGraphFactory* WinUiApplication::GetGraphFactory() {
+cru::platform::graphics::IGraphicsFactory* WinUiApplication::GetGraphicsFactory() {
   return graph_factory_.get();
 }