...

1 files changed, 11 insertions, 26 deletions

diff --git a/include/cru/platform/graph/painter.hpp b/include/cru/platform/graph/painter.hpp
index 97d4b4cf..3ae9cf1c 100644
--- a/include/cru/platform/graph/painter.hpp
+++ b/include/cru/platform/graph/painter.hpp
@@ -1,42 +1,27 @@
 #pragma once
-#include "../graphic_base.hpp"
-#include "../matrix.hpp"
-#include "../native_resource.hpp"
+#include "base.hpp"
 
 namespace cru::platform::graph {
-class Brush;
-class Geometry;
-class TextLayout;
+struct IBrush;
+struct IGeometry;
+struct ITextLayout;
 
-class Painter : public NativeResource {
- protected:
-  Painter() = default;
-
- public:
-  Painter(const Painter& other) = delete;
-  Painter& operator=(const Painter& other) = delete;
-
-  Painter(Painter&& other) = delete;
-  Painter& operator=(Painter&& other) = delete;
-
-  ~Painter() override = default;
-
- public:
+struct IPainter : virtual INativeResource {
   virtual Matrix GetTransform() = 0;
   virtual void SetTransform(const Matrix& matrix) = 0;
 
   virtual void Clear(const Color& color) = 0;
 
-  virtual void StrokeRectangle(const Rect& rectangle, Brush* brush,
+  virtual void StrokeRectangle(const Rect& rectangle, IBrush* brush,
                                float width) = 0;
-  virtual void FillRectangle(const Rect& rectangle, Brush* brush) = 0;
+  virtual void FillRectangle(const Rect& rectangle, IBrush* brush) = 0;
 
-  virtual void StrokeGeometry(Geometry* geometry, Brush* brush,
+  virtual void StrokeGeometry(IGeometry* geometry, IBrush* brush,
                               float width) = 0;
-  virtual void FillGeometry(Geometry* geometry, Brush* brush) = 0;
+  virtual void FillGeometry(IGeometry* geometry, IBrush* brush) = 0;
 
-  virtual void DrawText(const Point& offset, TextLayout* text_layout,
-                        Brush* brush) = 0;
+  virtual void DrawText(const Point& offset, ITextLayout* text_layout,
+                        IBrush* brush) = 0;
 
   virtual void EndDraw() = 0;
 };