use component offset

haxeui · Oct 28, 2024 · f5004b9 · f5004b9
1 parent 35c0a1a
commit f5004b9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/haxe/ui/components/ColorPicker.hx b/haxe/ui/components/ColorPicker.hx
@@ -582,7 +582,7 @@ private class HSVColorPickerImpl extends ColorPickerImpl {
         Screen.instance.registerEvent(MouseEvent.MOUSE_MOVE, onScreenMouseMove);
         Screen.instance.registerEvent(MouseEvent.MOUSE_UP, onScreenMouseUp);
 
-        applyHSVFromCoord(e.screenX - saturationValueGraph.screenLeft, e.screenY - saturationValueGraph.screenTop);
+        applyHSVFromCoord(e.screenX - (saturationValueGraph.screenLeft + getComponentOffset().x), e.screenY - (saturationValueGraph.screenTop + getComponentOffset().y));
     }
 
     private var _trackingHue:Bool = false;
@@ -594,14 +594,14 @@ private class HSVColorPickerImpl extends ColorPickerImpl {
         Screen.instance.registerEvent(MouseEvent.MOUSE_MOVE, onScreenMouseMove);
         Screen.instance.registerEvent(MouseEvent.MOUSE_UP, onScreenMouseUp);
 
-        applyHueFromCoord(e.screenX - hueGraph.screenLeft, e.screenY - hueGraph.screenTop);
+        applyHueFromCoord(e.screenX - (hueGraph.screenLeft + getComponentOffset().x), e.screenY - (hueGraph.screenTop + getComponentOffset().y));
     }
 
     private function onScreenMouseMove(e:MouseEvent) {
         if (_trackingSaturationValue) {
-            applyHSVFromCoord(e.screenX - saturationValueGraph.screenLeft, e.screenY - saturationValueGraph.screenTop);
+            applyHSVFromCoord(e.screenX - (saturationValueGraph.screenLeft + getComponentOffset().x), e.screenY - (saturationValueGraph.screenTop + getComponentOffset().y));
         } else if (_trackingHue) {
-            applyHueFromCoord(e.screenX - hueGraph.screenLeft, e.screenY - hueGraph.screenTop);
+            applyHueFromCoord(e.screenX - (hueGraph.screenLeft + getComponentOffset().x), e.screenY - (hueGraph.screenTop + getComponentOffset().y));
         }
     }
 

diff --git a/haxe/ui/components/DropDown.hx b/haxe/ui/components/DropDown.hx
@@ -825,7 +825,7 @@ class DropDownEvents extends ButtonEvents {
             _wrapper.removeClass("popup-from-bottom");
             if (_dropdown.dropdownVerticalPosition == "bottom" || _wrapper.screenTop + _wrapper.actualComponentHeight > Screen.instance.actualHeight) {
                 _wrapper.addClass("popup-from-bottom");
-                _wrapper.top = (_dropdown.screenTop - _wrapper.actualComponentHeight) + Toolkit.scaleY;
+                _wrapper.top = (_dropdown.screenTop + componentOffset.y - _wrapper.actualComponentHeight) + Toolkit.scaleY;
                 _wrapper.syncComponentValidation();
                 _wrapper.validateNow();
                 var marginLeft = 0.0;