Add check for IsBordered.

4 files changed, 73 insertions, 31 deletions

diff --git a/CruUI-Generate/cru_ui.cpp b/CruUI-Generate/cru_ui.cpp
index 418d2498..252dfd9a 100644
--- a/CruUI-Generate/cru_ui.cpp
+++ b/CruUI-Generate/cru_ui.cpp
@@ -982,11 +982,20 @@ namespace cru::ui
     {
         if (border_geometry_ != nullptr)
         {
-            BOOL contains;
-            border_geometry_->FillContainsPoint(Convert(point), D2D1::Matrix3x2F::Identity(), &contains);
-            if (!contains)
-                border_geometry_->StrokeContainsPoint(Convert(point), GetBorderProperty().GetStrokeWidth(), nullptr, D2D1::Matrix3x2F::Identity(), &contains);
-            return contains != 0;
+            if (IsBordered())
+            {
+                BOOL contains;
+                border_geometry_->FillContainsPoint(Convert(point), D2D1::Matrix3x2F::Identity(), &contains);
+                if (!contains)
+                    border_geometry_->StrokeContainsPoint(Convert(point), GetBorderProperty().GetStrokeWidth(), nullptr, D2D1::Matrix3x2F::Identity(), &contains);
+                return contains != 0;
+            }
+            else
+            {
+                BOOL contains;
+                border_geometry_->FillContainsPoint(Convert(point), D2D1::Matrix3x2F::Identity(), &contains);
+                return contains != 0;
+            }
         }
         return false;
     }
@@ -1306,16 +1315,28 @@ namespace cru::ui
 
     void Control::RegenerateBorderGeometry()
     {
-        const auto bound_rect = GetRect(RectRange::HalfBorder);
-        const auto bound_rounded_rect = D2D1::RoundedRect(Convert(bound_rect),
-            GetBorderProperty().GetRadiusX(),
-            GetBorderProperty().GetRadiusY());
+        if (IsBordered())
+        {
+            const auto bound_rect = GetRect(RectRange::HalfBorder);
+            const auto bound_rounded_rect = D2D1::RoundedRect(Convert(bound_rect),
+                GetBorderProperty().GetRadiusX(),
+                GetBorderProperty().GetRadiusY());
 
-        Microsoft::WRL::ComPtr<ID2D1RoundedRectangleGeometry> geometry;
-        ThrowIfFailed(
-            graph::GraphManager::GetInstance()->GetD2D1Factory()->CreateRoundedRectangleGeometry(bound_rounded_rect, &geometry)
-        );
-        border_geometry_ = std::move(geometry);
+            Microsoft::WRL::ComPtr<ID2D1RoundedRectangleGeometry> geometry;
+            ThrowIfFailed(
+                graph::GraphManager::GetInstance()->GetD2D1Factory()->CreateRoundedRectangleGeometry(bound_rounded_rect, &geometry)
+            );
+            border_geometry_ = std::move(geometry);
+        }
+        else
+        {
+            const auto bound_rect = GetRect(RectRange::Padding);
+            Microsoft::WRL::ComPtr<ID2D1RectangleGeometry> geometry;
+            ThrowIfFailed(
+                graph::GraphManager::GetInstance()->GetD2D1Factory()->CreateRectangleGeometry(Convert(bound_rect), &geometry)
+            );
+            border_geometry_ = std::move(geometry);
+        }
     }
 
     void Control::OnMouseEnter(MouseEventArgs & args)
diff --git a/CruUI-Generate/cru_ui.hpp b/CruUI-Generate/cru_ui.hpp
index 2196c918..302ce611 100644
--- a/CruUI-Generate/cru_ui.hpp
+++ b/CruUI-Generate/cru_ui.hpp
@@ -1851,7 +1851,7 @@ namespace cru::ui
         bool is_bordered_ = false;
         BorderProperty border_property_;
 
-        Microsoft::WRL::ComPtr<ID2D1RoundedRectangleGeometry> border_geometry_ = nullptr;
+        Microsoft::WRL::ComPtr<ID2D1Geometry> border_geometry_ = nullptr;
 
         AnyMap additional_property_map_{};
 
diff --git a/src/ui/control.cpp b/src/ui/control.cpp
index 9d0afe06..42e5f71f 100644
--- a/src/ui/control.cpp
+++ b/src/ui/control.cpp
@@ -193,11 +193,20 @@ namespace cru::ui
     {
         if (border_geometry_ != nullptr)
         {
-            BOOL contains;
-            border_geometry_->FillContainsPoint(Convert(point), D2D1::Matrix3x2F::Identity(), &contains);
-            if (!contains)
-                border_geometry_->StrokeContainsPoint(Convert(point), GetBorderProperty().GetStrokeWidth(), nullptr, D2D1::Matrix3x2F::Identity(), &contains);
-            return contains != 0;
+            if (IsBordered())
+            {
+                BOOL contains;
+                border_geometry_->FillContainsPoint(Convert(point), D2D1::Matrix3x2F::Identity(), &contains);
+                if (!contains)
+                    border_geometry_->StrokeContainsPoint(Convert(point), GetBorderProperty().GetStrokeWidth(), nullptr, D2D1::Matrix3x2F::Identity(), &contains);
+                return contains != 0;
+            }
+            else
+            {
+                BOOL contains;
+                border_geometry_->FillContainsPoint(Convert(point), D2D1::Matrix3x2F::Identity(), &contains);
+                return contains != 0;
+            }
         }
         return false;
     }
@@ -517,16 +526,28 @@ namespace cru::ui
 
     void Control::RegenerateBorderGeometry()
     {
-        const auto bound_rect = GetRect(RectRange::HalfBorder);
-        const auto bound_rounded_rect = D2D1::RoundedRect(Convert(bound_rect),
-            GetBorderProperty().GetRadiusX(),
-            GetBorderProperty().GetRadiusY());
-
-        Microsoft::WRL::ComPtr<ID2D1RoundedRectangleGeometry> geometry;
-        ThrowIfFailed(
-            graph::GraphManager::GetInstance()->GetD2D1Factory()->CreateRoundedRectangleGeometry(bound_rounded_rect, &geometry)
-        );
-        border_geometry_ = std::move(geometry);
+        if (IsBordered())
+        {
+            const auto bound_rect = GetRect(RectRange::HalfBorder);
+            const auto bound_rounded_rect = D2D1::RoundedRect(Convert(bound_rect),
+                GetBorderProperty().GetRadiusX(),
+                GetBorderProperty().GetRadiusY());
+
+            Microsoft::WRL::ComPtr<ID2D1RoundedRectangleGeometry> geometry;
+            ThrowIfFailed(
+                graph::GraphManager::GetInstance()->GetD2D1Factory()->CreateRoundedRectangleGeometry(bound_rounded_rect, &geometry)
+            );
+            border_geometry_ = std::move(geometry);
+        }
+        else
+        {
+            const auto bound_rect = GetRect(RectRange::Padding);
+            Microsoft::WRL::ComPtr<ID2D1RectangleGeometry> geometry;
+            ThrowIfFailed(
+                graph::GraphManager::GetInstance()->GetD2D1Factory()->CreateRectangleGeometry(Convert(bound_rect), &geometry)
+            );
+            border_geometry_ = std::move(geometry);
+        }
     }
 
     void Control::OnMouseEnter(MouseEventArgs & args)
diff --git a/src/ui/control.hpp b/src/ui/control.hpp
index 75c10c04..776eacb0 100644
--- a/src/ui/control.hpp
+++ b/src/ui/control.hpp
@@ -372,7 +372,7 @@ namespace cru::ui
         bool is_bordered_ = false;
         BorderProperty border_property_;
 
-        Microsoft::WRL::ComPtr<ID2D1RoundedRectangleGeometry> border_geometry_ = nullptr;
+        Microsoft::WRL::ComPtr<ID2D1Geometry> border_geometry_ = nullptr;
 
         AnyMap additional_property_map_{};