...

11 files changed, 51 insertions, 46 deletions

diff --git a/include/cru/win/graphics/direct/Brush.hpp b/include/cru/win/graphics/direct/Brush.hpp
index fbff83b5..9d8e5384 100644
--- a/include/cru/win/graphics/direct/Brush.hpp
+++ b/include/cru/win/graphics/direct/Brush.hpp
@@ -9,12 +9,12 @@ struct ID2DBrush : virtual IBrush {
   virtual ID2D1Brush* GetD2DBrushInterface() const = 0;
 };
 
-class D2DSolidColorBrush : public DirectGraphResource,
+class D2DSolidColorBrush : public DirectGraphicsResource,
                            public virtual ISolidColorBrush,
                            public virtual ID2DBrush,
                            public virtual IComResource<ID2D1SolidColorBrush> {
  public:
-  explicit D2DSolidColorBrush(DirectGraphFactory* factory);
+  explicit D2DSolidColorBrush(DirectGraphicsFactory* factory);
 
   CRU_DELETE_COPY(D2DSolidColorBrush)
   CRU_DELETE_MOVE(D2DSolidColorBrush)
diff --git a/include/cru/win/graphics/direct/Factory.hpp b/include/cru/win/graphics/direct/Factory.hpp
index 70f3ede1..efcebba7 100644
--- a/include/cru/win/graphics/direct/Factory.hpp
+++ b/include/cru/win/graphics/direct/Factory.hpp
@@ -4,14 +4,15 @@
 #include "cru/platform/graphics/Factory.hpp"
 
 namespace cru::platform::graphics::win::direct {
-class DirectGraphFactory : public DirectResource, public virtual IGraphFactory {
+class DirectGraphicsFactory : public DirectResource,
+                              public virtual IGraphicsFactory {
  public:
-  DirectGraphFactory();
+  DirectGraphicsFactory();
 
-  CRU_DELETE_COPY(DirectGraphFactory)
-  CRU_DELETE_MOVE(DirectGraphFactory)
+  CRU_DELETE_COPY(DirectGraphicsFactory)
+  CRU_DELETE_MOVE(DirectGraphicsFactory)
 
-  ~DirectGraphFactory() override;
+  ~DirectGraphicsFactory() override;
 
  public:
   ID3D11Device* GetD3D11Device() const { return d3d11_device_.Get(); }
@@ -38,11 +39,11 @@ class DirectGraphFactory : public DirectResource, public virtual IGraphFactory {
 
   std::unique_ptr<IGeometryBuilder> CreateGeometryBuilder() override;
 
-  std::unique_ptr<IFont> CreateFont(std::u16string font_family,
+  std::unique_ptr<IFont> CreateFont(String font_family,
                                     float font_size) override;
 
   std::unique_ptr<ITextLayout> CreateTextLayout(std::shared_ptr<IFont> font,
-                                                std::u16string text) override;
+                                                String text) override;
 
  private:
   Microsoft::WRL::ComPtr<ID3D11Device> d3d11_device_;
diff --git a/include/cru/win/graphics/direct/Font.hpp b/include/cru/win/graphics/direct/Font.hpp
index fd3921a3..3cd94f82 100644
--- a/include/cru/win/graphics/direct/Font.hpp
+++ b/include/cru/win/graphics/direct/Font.hpp
@@ -7,11 +7,11 @@
 #include <string_view>
 
 namespace cru::platform::graphics::win::direct {
-class DWriteFont : public DirectGraphResource,
+class DWriteFont : public DirectGraphicsResource,
                    public virtual IFont,
                    public virtual IComResource<IDWriteTextFormat> {
  public:
-  DWriteFont(DirectGraphFactory* factory, std::u16string font_family,
+  DWriteFont(DirectGraphicsFactory* factory, String font_family,
              float font_size);
 
   CRU_DELETE_COPY(DWriteFont)
@@ -27,7 +27,7 @@ class DWriteFont : public DirectGraphResource,
   float GetFontSize() override;
 
  private:
-  std::u16string font_family_;
+  String font_family_;
   Microsoft::WRL::ComPtr<IDWriteTextFormat> text_format_;
 };
 }  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graphics/direct/Geometry.hpp b/include/cru/win/graphics/direct/Geometry.hpp
index edfec590..b3b82f9c 100644
--- a/include/cru/win/graphics/direct/Geometry.hpp
+++ b/include/cru/win/graphics/direct/Geometry.hpp
@@ -5,10 +5,10 @@
 #include "cru/platform/graphics/Geometry.hpp"
 
 namespace cru::platform::graphics::win::direct {
-class D2DGeometryBuilder : public DirectGraphResource,
+class D2DGeometryBuilder : public DirectGraphicsResource,
                            public virtual IGeometryBuilder {
  public:
-  explicit D2DGeometryBuilder(DirectGraphFactory* factory);
+  explicit D2DGeometryBuilder(DirectGraphicsFactory* factory);
 
   CRU_DELETE_COPY(D2DGeometryBuilder)
   CRU_DELETE_MOVE(D2DGeometryBuilder)
@@ -33,11 +33,11 @@ class D2DGeometryBuilder : public DirectGraphResource,
   Microsoft::WRL::ComPtr<ID2D1GeometrySink> geometry_sink_;
 };
 
-class D2DGeometry : public DirectGraphResource,
+class D2DGeometry : public DirectGraphicsResource,
                     public virtual IGeometry,
                     public IComResource<ID2D1Geometry> {
  public:
-  D2DGeometry(DirectGraphFactory* factory,
+  D2DGeometry(DirectGraphicsFactory* factory,
               Microsoft::WRL::ComPtr<ID2D1PathGeometry> geometry);
 
   CRU_DELETE_COPY(D2DGeometry)
diff --git a/include/cru/win/graphics/direct/Resource.hpp b/include/cru/win/graphics/direct/Resource.hpp
index e6ffb203..c376628d 100644
--- a/include/cru/win/graphics/direct/Resource.hpp
+++ b/include/cru/win/graphics/direct/Resource.hpp
@@ -6,7 +6,7 @@
 #include <string_view>
 
 namespace cru::platform::graphics::win::direct {
-class DirectGraphFactory;
+class DirectGraphicsFactory;
 
 class DirectResource : public Object, public virtual IPlatformResource {
  public:
@@ -25,25 +25,25 @@ class DirectResource : public Object, public virtual IPlatformResource {
   String GetPlatformId() const final { return kPlatformId; }
 };
 
-class DirectGraphResource : public DirectResource,
-                            public virtual IGraphResource {
+class DirectGraphicsResource : public DirectResource,
+                            public virtual IGraphicsResource {
  protected:
   // Param factory can't be null.
-  explicit DirectGraphResource(DirectGraphFactory* factory);
+  explicit DirectGraphicsResource(DirectGraphicsFactory* factory);
 
  public:
-  CRU_DELETE_COPY(DirectGraphResource)
-  CRU_DELETE_MOVE(DirectGraphResource)
+  CRU_DELETE_COPY(DirectGraphicsResource)
+  CRU_DELETE_MOVE(DirectGraphicsResource)
 
-  ~DirectGraphResource() override = default;
+  ~DirectGraphicsResource() override = default;
 
  public:
-  IGraphFactory* GetGraphFactory() final;
+  IGraphicsFactory* GetGraphicsFactory() final;
 
  public:
-  DirectGraphFactory* GetDirectFactory() const { return factory_; }
+  DirectGraphicsFactory* GetDirectFactory() const { return factory_; }
 
  private:
-  DirectGraphFactory* factory_;
+  DirectGraphicsFactory* factory_;
 };
 }  // namespace cru::platform::graphics::win::direct
diff --git a/include/cru/win/graphics/direct/TextLayout.hpp b/include/cru/win/graphics/direct/TextLayout.hpp
index aa040278..1ac56a9d 100644
--- a/include/cru/win/graphics/direct/TextLayout.hpp
+++ b/include/cru/win/graphics/direct/TextLayout.hpp
@@ -10,12 +10,12 @@
 namespace cru::platform::graphics::win::direct {
 class DWriteFont;
 
-class DWriteTextLayout : public DirectGraphResource,
+class DWriteTextLayout : public DirectGraphicsResource,
                          public virtual ITextLayout,
                          public virtual IComResource<IDWriteTextLayout> {
  public:
-  DWriteTextLayout(DirectGraphFactory* factory, std::shared_ptr<IFont> font,
-                   std::u16string text);
+  DWriteTextLayout(DirectGraphicsFactory* factory, std::shared_ptr<IFont> font,
+                   String text);
 
   CRU_DELETE_COPY(DWriteTextLayout)
   CRU_DELETE_MOVE(DWriteTextLayout)
@@ -28,9 +28,8 @@ class DWriteTextLayout : public DirectGraphResource,
   }
 
  public:
-  std::u16string GetText() override;
-  std::u16string_view GetTextView() override;
-  void SetText(std::u16string new_text) override;
+  String GetText() override;
+  void SetText(String new_text) override;
 
   std::shared_ptr<IFont> GetFont() override;
   void SetFont(std::shared_ptr<IFont> font) override;
@@ -38,15 +37,22 @@ class DWriteTextLayout : public DirectGraphResource,
   void SetMaxWidth(float max_width) override;
   void SetMaxHeight(float max_height) override;
 
+  bool IsEditMode() override;
+  void SetEditMode(bool enable) override;
+
+  Index GetLineIndexFromCharIndex(Index char_index) override;
+  float GetLineHeight(Index line_index) override;
+  Index GetLineCount() override;
+
   Rect GetTextBounds(bool includingTrailingSpace = false) override;
   // Return empty vector if text_range.count is 0. Text range could be in
   // reverse direction, it should be normalized first in implementation.
   std::vector<Rect> TextRangeRect(const TextRange& text_range) override;
-  Point TextSinglePoint(Index position, bool trailing) override;
+  Rect TextSinglePoint(Index position, bool trailing) override;
   TextHitTestResult HitTest(const Point& point) override;
 
  private:
-  std::u16string text_;
+  String text_;
   std::shared_ptr<DWriteFont> font_;
   float max_width_ = std::numeric_limits<float>::max();
   float max_height_ = std::numeric_limits<float>::max();
diff --git a/include/cru/win/graphics/direct/WindowRenderTarget.hpp b/include/cru/win/graphics/direct/WindowRenderTarget.hpp
index 75b1bf20..c197841d 100644
--- a/include/cru/win/graphics/direct/WindowRenderTarget.hpp
+++ b/include/cru/win/graphics/direct/WindowRenderTarget.hpp
@@ -5,7 +5,7 @@ namespace cru::platform::graphics::win::direct {
 // Represents a window render target.
 class D2DWindowRenderTarget : public Object {
  public:
-  D2DWindowRenderTarget(gsl::not_null<DirectGraphFactory*> factory, HWND hwnd);
+  D2DWindowRenderTarget(gsl::not_null<DirectGraphicsFactory*> factory, HWND hwnd);
 
   CRU_DELETE_COPY(D2DWindowRenderTarget)
   CRU_DELETE_MOVE(D2DWindowRenderTarget)
@@ -13,7 +13,7 @@ class D2DWindowRenderTarget : public Object {
   ~D2DWindowRenderTarget() override = default;
 
  public:
-  graphics::win::direct::DirectGraphFactory* GetDirectFactory() const {
+  graphics::win::direct::DirectGraphicsFactory* GetDirectFactory() const {
     return factory_;
   }
 
@@ -33,7 +33,7 @@ class D2DWindowRenderTarget : public Object {
   void CreateTargetBitmap();
 
  private:
-  DirectGraphFactory* factory_;
+  DirectGraphicsFactory* factory_;
   HWND hwnd_;
   Microsoft::WRL::ComPtr<ID2D1DeviceContext> d2d1_device_context_;
   Microsoft::WRL::ComPtr<IDXGISwapChain1> dxgi_swap_chain_;
diff --git a/include/cru/win/gui/GodWindow.hpp b/include/cru/win/gui/GodWindow.hpp
index 0343b159..d9a128e6 100644
--- a/include/cru/win/gui/GodWindow.hpp
+++ b/include/cru/win/gui/GodWindow.hpp
@@ -3,6 +3,7 @@
 
 #include "WindowNativeMessageEventArgs.hpp"
 #include "cru/common/Event.hpp"
+#include "cru/common/String.hpp"
 
 #include <memory>
 
diff --git a/include/cru/win/gui/InputMethod.hpp b/include/cru/win/gui/InputMethod.hpp
index 51a007d8..df687617 100644
--- a/include/cru/win/gui/InputMethod.hpp
+++ b/include/cru/win/gui/InputMethod.hpp
@@ -65,7 +65,7 @@ class WinInputMethodContext : public WinNativeResource,
 
   IEvent<std::nullptr_t>* CompositionEvent() override;
 
-  IEvent<std::u16string_view>* TextEvent() override;
+  IEvent<StringView>* TextEvent() override;
 
  private:
   void OnWindowNativeMessage(WindowNativeMessageEventArgs& args);
diff --git a/include/cru/win/gui/UiApplication.hpp b/include/cru/win/gui/UiApplication.hpp
index 4cf46858..daf72795 100644
--- a/include/cru/win/gui/UiApplication.hpp
+++ b/include/cru/win/gui/UiApplication.hpp
@@ -7,7 +7,7 @@
 #include <memory>
 
 namespace cru::platform::graphics::win::direct {
-class DirectGraphFactory;
+class DirectGraphicsFactory;
 }
 
 namespace cru::platform::gui::win {
@@ -41,11 +41,11 @@ class WinUiApplication : public WinNativeResource,
   void CancelTimer(long long id) override;
 
   std::vector<INativeWindow*> GetAllWindow() override;
-  INativeWindow* CreateWindow(INativeWindow* parent, CreateWindowFlag flag) override;
+  INativeWindow* CreateWindow() override;
 
-  cru::platform::graphics::IGraphFactory* GetGraphFactory() override;
+  cru::platform::graphics::IGraphicsFactory* GetGraphicsFactory() override;
 
-  cru::platform::graphics::win::direct::DirectGraphFactory* GetDirectFactory() {
+  cru::platform::graphics::win::direct::DirectGraphicsFactory* GetDirectFactory() {
     return graph_factory_.get();
   }
 
@@ -60,7 +60,7 @@ class WinUiApplication : public WinNativeResource,
  private:
   HINSTANCE instance_handle_;
 
-  std::unique_ptr<cru::platform::graphics::win::direct::DirectGraphFactory>
+  std::unique_ptr<cru::platform::graphics::win::direct::DirectGraphicsFactory>
       graph_factory_;
 
   std::unique_ptr<GodWindow> god_window_;
diff --git a/include/cru/win/gui/Window.hpp b/include/cru/win/gui/Window.hpp
index 97a74fa7..9f241b0a 100644
--- a/include/cru/win/gui/Window.hpp
+++ b/include/cru/win/gui/Window.hpp
@@ -2,7 +2,6 @@
 #include "Resource.hpp"
 
 #include "WindowNativeMessageEventArgs.hpp"
-#include "cru/platform/GraphBase.hpp"
 #include "cru/platform/gui/Base.hpp"
 #include "cru/platform/gui/Window.hpp"
 #include "cru/win/graphics/direct/WindowRenderTarget.hpp"
@@ -27,8 +26,6 @@ class WinNativeWindow : public WinNativeResource, public virtual INativeWindow {
 
   WinNativeWindow* GetParent() override { return parent_window_; }
 
-  bool IsVisible() override;
-  void SetVisible(bool is_visible) override;
 
   Size GetClientSize() override;
   void SetClientSize(const Size& size) override;