2 files changed, 4 insertions, 3 deletions
diff --git a/src/ui/events/ui_event.cpp b/src/ui/events/ui_event.cpp
index 59623bab..34339ff4 100644
--- a/src/ui/events/ui_event.cpp
+++ b/src/ui/events/ui_event.cpp
@@ -8,10 +8,10 @@ namespace cru
     {
         namespace events
         {
-            Point MouseEventArgs::GetPoint(Control* control) const
+            Point MouseEventArgs::GetPoint(Control* control, const RectRange range) const
             {
                 if (point_.has_value())
-                    return control->AbsoluteToLocal(point_.value());
+                    return control->TransformPoint(control->AbsoluteToLocal(point_.value()), RectRange::Margin, range);
                 return Point();
             }
         }
diff --git a/src/ui/events/ui_event.h b/src/ui/events/ui_event.h
index b042b706..1a6f4046 100644
--- a/src/ui/events/ui_event.h
+++ b/src/ui/events/ui_event.h
@@ -6,6 +6,7 @@
 #include "base.h"
 #include "cru_event.h"
 #include "ui/ui_base.h"
+#include "ui/layout_base.h"
 
 namespace cru
 {
@@ -54,7 +55,7 @@ namespace cru
                 MouseEventArgs& operator=(MouseEventArgs&& other) = default;
                 ~MouseEventArgs() override = default;
 
-                Point GetPoint(Control* control) const;
+                Point GetPoint(Control* control, RectRange range = RectRange::Content) const;
 
             private:
                 std::optional<Point> point_;