1 files changed, 16 insertions, 14 deletions

diff --git a/include/cru/ui/render/BorderRenderObject.hpp b/include/cru/ui/render/BorderRenderObject.hpp
index 587f051a..3d4f4dad 100644
--- a/include/cru/ui/render/BorderRenderObject.hpp
+++ b/include/cru/ui/render/BorderRenderObject.hpp
@@ -1,5 +1,7 @@
 #pragma once
+#include "../style/ApplyBorderStyleInfo.hpp"
 #include "RenderObject.hpp"
+#include "cru/ui/Base.hpp"
 
 namespace cru::ui::render {
 class BorderRenderObject : public RenderObject {
@@ -16,11 +18,11 @@ class BorderRenderObject : public RenderObject {
   bool IsBorderEnabled() const { return is_border_enabled_; }
   void SetBorderEnabled(bool enabled) { is_border_enabled_ = enabled; }
 
-  std::shared_ptr<platform::graph::IBrush> GetBorderBrush() {
+  std::shared_ptr<platform::graphics::IBrush> GetBorderBrush() {
     return border_brush_;
   }
 
-  void SetBorderBrush(std::shared_ptr<platform::graph::IBrush> brush) {
+  void SetBorderBrush(std::shared_ptr<platform::graphics::IBrush> brush) {
     if (brush == border_brush_) return;
     border_brush_ = std::move(brush);
     InvalidatePaint();
@@ -42,32 +44,32 @@ class BorderRenderObject : public RenderObject {
     RecreateGeometry();
   }
 
-  std::shared_ptr<platform::graph::IBrush> GetForegroundBrush() {
+  std::shared_ptr<platform::graphics::IBrush> GetForegroundBrush() {
     return foreground_brush_;
   }
 
-  void SetForegroundBrush(std::shared_ptr<platform::graph::IBrush> brush) {
+  void SetForegroundBrush(std::shared_ptr<platform::graphics::IBrush> brush) {
     if (brush == foreground_brush_) return;
     foreground_brush_ = std::move(brush);
     InvalidatePaint();
   }
 
-  std::shared_ptr<platform::graph::IBrush> GetBackgroundBrush() {
+  std::shared_ptr<platform::graphics::IBrush> GetBackgroundBrush() {
     return background_brush_;
   }
 
-  void SetBackgroundBrush(std::shared_ptr<platform::graph::IBrush> brush) {
+  void SetBackgroundBrush(std::shared_ptr<platform::graphics::IBrush> brush) {
     if (brush == background_brush_) return;
     background_brush_ = std::move(brush);
     InvalidatePaint();
   }
 
-  void SetBorderStyle(const BorderStyle& style);
+  void ApplyBorderStyle(const style::ApplyBorderStyleInfo& style);
 
   RenderObject* HitTest(const Point& point) override;
 
  protected:
-  void OnDrawCore(platform::graph::IPainter* painter) override;
+  void OnDrawCore(platform::graphics::IPainter* painter) override;
 
   Size OnMeasureCore(const MeasureRequirement& requirement,
                      const MeasureSize& preferred_size) override;
@@ -87,19 +89,19 @@ class BorderRenderObject : public RenderObject {
  private:
   bool is_border_enabled_ = false;
 
-  std::shared_ptr<platform::graph::IBrush> border_brush_;
+  std::shared_ptr<platform::graphics::IBrush> border_brush_;
   Thickness border_thickness_;
   CornerRadius border_radius_;
 
-  std::shared_ptr<platform::graph::IBrush> foreground_brush_;
-  std::shared_ptr<platform::graph::IBrush> background_brush_;
+  std::shared_ptr<platform::graphics::IBrush> foreground_brush_;
+  std::shared_ptr<platform::graphics::IBrush> background_brush_;
 
   // The ring. Used for painting.
-  std::unique_ptr<platform::graph::IGeometry> geometry_;
+  std::unique_ptr<platform::graphics::IGeometry> geometry_;
   // Area including inner area of the border. Used for painting foreground and
   // background.
-  std::unique_ptr<platform::graph::IGeometry> border_inner_geometry_;
+  std::unique_ptr<platform::graphics::IGeometry> border_inner_geometry_;
   // Area including border ring and inner area. Used for hit test.
-  std::unique_ptr<platform::graph::IGeometry> border_outer_geometry_;
+  std::unique_ptr<platform::graphics::IGeometry> border_outer_geometry_;
 };
 }  // namespace cru::ui::render