Fix focusable bug

qiuxiang · Nov 24, 2022 · 51bf067 · 51bf067
1 parent 15b9ede
commit 51bf067
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/android/src/main/kotlin/qiuxiang/android_window/AndroidWindow.kt b/android/src/main/kotlin/qiuxiang/android_window/AndroidWindow.kt
@@ -15,7 +15,7 @@ import kotlin.math.roundToInt
 
 class AndroidWindow(
   val service: Service,
-  focusable: Boolean,
+  private val focusable: Boolean,
   width: Int,
   height: Int,
   private val x: Int,
@@ -76,8 +76,10 @@ class AndroidWindow(
           }
         }
         MotionEvent.ACTION_DOWN -> {
-          layoutParams.flags = layoutParams.flags and WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE.inv()
-          windowManager.updateViewLayout(rootView, layoutParams)
+          if (focusable) {
+            layoutParams.flags = layoutParams.flags and WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE.inv()
+            windowManager.updateViewLayout(rootView, layoutParams)
+          }
         }
       }
       false

diff --git a/lib/android_window.dart b/lib/android_window.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 
 import 'pigeon.g.dart';
@@ -54,15 +55,27 @@ class _AndroidWindowState extends State<AndroidWindow> {
 
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
-      onPanStart: (event) => start = true,
-      onPanUpdate: (event) {
-        if (start) {
-          _api.dragStart();
-          start = false;
-        }
+    return RawGestureDetector(
+      gestures: {
+        PanGestureRecognizer: GestureRecognizerFactoryWithHandlers(
+          () => PanGestureRecognizer(),
+          (instance) {
+            (instance as PanGestureRecognizer)
+              ..onStart = (event) {
+                start = true;
+              }
+              ..onUpdate = (event) {
+                if (start) {
+                  _api.dragStart();
+                  start = false;
+                }
+              }
+              ..onEnd = (event) {
+                _api.dragEnd();
+              };
+          },
+        ),
       },
-      onPanEnd: (event) => _api.dragEnd(),
       child: widget.child,
     );
   }