revert PR #560

haxeui · Jan 29, 2024 · 8636c72 · 8636c72
1 parent 291f9b6
commit 8636c72
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 60 deletions.
diff --git a/haxe/ui/containers/ScrollView.hx b/haxe/ui/containers/ScrollView.hx
@@ -735,17 +735,6 @@ class ScrollViewEvents extends haxe.ui.events.Events {
     private function onHScroll(event:UIEvent) {
         _scrollview.invalidateComponent(InvalidationFlags.SCROLL);
         _target.dispatch(new ScrollEvent(ScrollEvent.CHANGE));
-
-        if (!_scrollview.virtual) {
-            var scrollX:Float = event.value;
-            var oldScrollX:Float = event.previousValue;
-            var diffX = scrollX - oldScrollX;
-
-            var mouseX = haxe.ui.core.Screen.instance.currentMouseX;
-            var mouseY = haxe.ui.core.Screen.instance.currentMouseY;
-            // components have not yet moved so comparing actual and future position
-            simulateHoveringEvents(mouseX, mouseY, mouseX + diffX, mouseY);
-        }
     }
 
     private function onHScrollScroll(event:UIEvent) {
@@ -755,52 +744,6 @@ class ScrollViewEvents extends haxe.ui.events.Events {
     private function onVScroll(event:UIEvent) {
         _scrollview.invalidateComponent(InvalidationFlags.SCROLL);
         _target.dispatch(new ScrollEvent(ScrollEvent.CHANGE));
-
-        if (!_scrollview.virtual) {
-            var scrollY:Float = event.value;
-            var oldScrollY:Float = event.previousValue;
-            var diffY = scrollY - oldScrollY;
-
-            var mouseX = haxe.ui.core.Screen.instance.currentMouseX;
-            var mouseY = haxe.ui.core.Screen.instance.currentMouseY;
-            // components have not yet moved so comparing actual and future position
-            simulateHoveringEvents(mouseX, mouseY, mouseX, mouseY + diffY);
-        }
-    }
-
-    private function simulateHoveringEvents(oldScreenX:Float, oldScreenY:Float, newScreenX:Float, newScreenY:Float) {
-
-        var oldComponents = _scrollview.findComponentsUnderPoint(oldScreenX, oldScreenY);
-        var newComponents = _scrollview.findComponentsUnderPoint(newScreenX, newScreenY, true);
-
-        var oldHoveredComponents = [];
-        var newHoveredComponents = [];
-
-        for ( c in oldComponents) {
-            @:privateAccess if (c.__events != null && (c.__events._map.exists(MouseEvent.MOUSE_OUT) ||
-            c.__events._map.exists(MouseEvent.MOUSE_OVER))) {
-                oldHoveredComponents.push(c);
-            }
-        }
-        for ( c in newComponents) {
-            @:privateAccess if (c.__events != null && (c.__events._map.exists(MouseEvent.MOUSE_OUT) ||
-            c.__events._map.exists(MouseEvent.MOUSE_OVER))) {
-                newHoveredComponents.push(c);
-            }
-        }
-
-        for ( c in oldHoveredComponents) {
-            if (newHoveredComponents.indexOf(c) ==-1) {
-                var mouseEvent = new MouseEvent(MouseEvent.MOUSE_OUT);  
-                c.dispatch(mouseEvent);
-            }
-        }
-        for ( c in newHoveredComponents) {
-            if (oldHoveredComponents.indexOf(c) == -1) {
-                var mouseEvent = new MouseEvent(MouseEvent.MOUSE_OVER);
-                c.dispatch(mouseEvent);
-            }
-        }
     }
 
     private function onVScrollScroll(event:UIEvent) {

diff --git a/haxe/ui/core/Component.hx b/haxe/ui/core/Component.hx
@@ -895,12 +895,11 @@ class Component extends ComponentImpl
      * @param screenX The global, on-screen `x` position of the point to check for components under
      * @param screenY The global, on-screen `y` position of the point to check for components under
      * @param type Used to filter all components that aren't of a specific type. `null` by default, which means no filter is applied.
-     * @param deepSearch Look into children even if parent is not under point
      * @return An array of all components that overlap the "global" position `(x, y)`
      */
-    public function findComponentsUnderPoint<T:Component>(screenX:Float, screenY:Float, type:Class<T> = null, deepSearch:Bool = false):Array<Component> {
+    public function findComponentsUnderPoint<T:Component>(screenX:Float, screenY:Float, type:Class<T> = null):Array<Component> {
         var c:Array<Component> = [];
-        if (deepSearch || hitTest(screenX, screenY, false)) {
+        if (hitTest(screenX, screenY, false)) {
             for (child in childComponents) {
                 if (child.hitTest(screenX, screenY, false)) {
                     var match = true;