Test scroll

Jack253-png · Sep 20, 2024 · eba86fb · eba86fb
1 parent dee17f8
commit eba86fb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/flutter-ui/src/main/java/com/primogemstudio/advancedfmk/flutter/FlutterNative.java b/flutter-ui/src/main/java/com/primogemstudio/advancedfmk/flutter/FlutterNative.java
@@ -21,6 +21,8 @@ public final class FlutterNative {
 
     public static native void sendMetricsEvent(long instance, int width, int height, long view);
 
+    public static native void sendScrollEvent(long instance, double x, double y, double xAmount, double yAmount, long view);
+
     public static native void pollEvents(long instance);
 
     public static native int getTexture(long instance);

diff --git a/flutter-ui/src/main/java/com/primogemstudio/advancedfmk/flutter/MouseEvent.kt b/flutter-ui/src/main/java/com/primogemstudio/advancedfmk/flutter/MouseEvent.kt
@@ -23,9 +23,10 @@ object MouseEvent {
         return false
     }
 
-    fun onMouseScroll(x: Double, y: Double, amount: Double): Boolean {
+    fun onMouseScroll(x: Double, y: Double, xAmount: Double, yAmount: Double): Boolean {
         for (i in instances) {
             if (i.hitTest(x, y)) {
+                FlutterNative.sendScrollEvent(i.handle, x, y, xAmount, yAmount, 0)
                 return true
             }
         }

diff --git a/flutter-ui/src/main/java/com/primogemstudio/advancedfmk/mixin/MouseHandlerMixin.java b/flutter-ui/src/main/java/com/primogemstudio/advancedfmk/mixin/MouseHandlerMixin.java
@@ -44,8 +44,6 @@ private void onMouseScroll(long window, double xOffset, double yOffset, Callback
         double[] x = {0};
         double[] y = {0};
         glfwGetCursorPos(window, x, y);
-        System.out.println(xOffset + " " + yOffset + " " + x[0] + " " + y[0]);
-        if (MouseEvent.INSTANCE.onMouseScroll(x[0], y[0], yOffset)) ci.cancel();
-
+        if (MouseEvent.INSTANCE.onMouseScroll(x[0], y[0], xOffset, yOffset)) ci.cancel();
     }
 }