From d04f047d14a543b36fe372481b924922348898ad Mon Sep 17 00:00:00 2001
From: fufesou <shuanglongchen@yeah.net>
Date: Sat, 28 Jan 2023 21:11:03 +0800
Subject: [PATCH] feat mouse click and move through monitor widget

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 flutter/lib/common/widgets/overlay.dart    |  8 ++-
 flutter/lib/desktop/pages/remote_page.dart | 60 ++++++++++++++--------
 flutter/lib/mobile/pages/remote_page.dart  |  6 ++-
 3 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/flutter/lib/common/widgets/overlay.dart b/flutter/lib/common/widgets/overlay.dart
index 81797962e..d9684bace 100644
--- a/flutter/lib/common/widgets/overlay.dart
+++ b/flutter/lib/common/widgets/overlay.dart
@@ -324,10 +324,8 @@ class QualityMonitor extends StatelessWidget {
   Widget build(BuildContext context) => ChangeNotifierProvider.value(
       value: qualityMonitorModel,
       child: Consumer<QualityMonitorModel>(
-          builder: (context, qualityMonitorModel, child) => Positioned(
-              top: 10,
-              right: 10,
-              child: qualityMonitorModel.show
+          builder: (context, qualityMonitorModel, child) =>
+              qualityMonitorModel.show
                   ? Container(
                       padding: const EdgeInsets.all(8),
                       color: MyTheme.canvasColor.withAlpha(120),
@@ -357,5 +355,5 @@ class QualityMonitor extends StatelessWidget {
                         ],
                       ),
                     )
-                  : const SizedBox.shrink())));
+                  : const SizedBox.shrink()));
 }
diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart
index fb67154bc..2e4668159 100644
--- a/flutter/lib/desktop/pages/remote_page.dart
+++ b/flutter/lib/desktop/pages/remote_page.dart
@@ -279,6 +279,34 @@ class _RemotePageState extends State<RemotePage>
     }
   }
 
+  Widget _buildRawPointerMouseRegion(
+    Widget child,
+    PointerEnterEventListener? onEnter,
+    PointerExitEventListener? onExit,
+  ) {
+    return RawPointerMouseRegion(
+      onEnter: enterView,
+      onExit: leaveView,
+      onPointerDown: (event) {
+        // A double check for blur status.
+        // Note: If there's an `onPointerDown` event is triggered, `_isWindowBlur` is expected being false.
+        // Sometimes the system does not send the necessary focus event to flutter. We should manually
+        // handle this inconsistent status by setting `_isWindowBlur` to false. So we can
+        // ensure the grab-key thread is running when our users are clicking the remote canvas.
+        if (_isWindowBlur) {
+          debugPrint(
+              "Unexpected status: onPointerDown is triggered while the remote window is in blur status");
+          _isWindowBlur = false;
+        }
+        if (!_rawKeyFocusNode.hasFocus) {
+          _rawKeyFocusNode.requestFocus();
+        }
+      },
+      inputModel: _ffi.inputModel,
+      child: child,
+    );
+  }
+
   Widget getBodyForDesktop(BuildContext context) {
     var paints = <Widget>[
       MouseRegion(onEnter: (evt) {
@@ -295,27 +323,8 @@ class _RemotePageState extends State<RemotePage>
           cursorOverImage: _cursorOverImage,
           keyboardEnabled: _keyboardEnabled,
           remoteCursorMoved: _remoteCursorMoved,
-          listenerBuilder: (child) => RawPointerMouseRegion(
-            onEnter: enterView,
-            onExit: leaveView,
-            onPointerDown: (event) {
-              // A double check for blur status.
-              // Note: If there's an `onPointerDown` event is triggered, `_isWindowBlur` is expected being false.
-              // Sometimes the system does not send the necessary focus event to flutter. We should manually
-              // handle this inconsistent status by setting `_isWindowBlur` to false. So we can
-              // ensure the grab-key thread is running when our users are clicking the remote canvas.
-              if (_isWindowBlur) {
-                debugPrint(
-                    "Unexpected status: onPointerDown is triggered while the remote window is in blur status");
-                _isWindowBlur = false;
-              }
-              if (!_rawKeyFocusNode.hasFocus) {
-                _rawKeyFocusNode.requestFocus();
-              }
-            },
-            inputModel: _ffi.inputModel,
-            child: child,
-          ),
+          listenerBuilder: (child) =>
+              _buildRawPointerMouseRegion(child, enterView, leaveView),
         );
       }))
     ];
@@ -328,7 +337,14 @@ class _RemotePageState extends State<RemotePage>
             zoomCursor: _zoomCursor,
           ))));
     }
-    paints.add(QualityMonitor(_ffi.qualityMonitorModel));
+    paints.add(
+      Positioned(
+        top: 10,
+        right: 10,
+        child: _buildRawPointerMouseRegion(
+            QualityMonitor(_ffi.qualityMonitorModel), null, null),
+      ),
+    );
     paints.add(RemoteMenubar(
       id: widget.id,
       ffi: _ffi,
diff --git a/flutter/lib/mobile/pages/remote_page.dart b/flutter/lib/mobile/pages/remote_page.dart
index 0a10d8011..c4b07b375 100644
--- a/flutter/lib/mobile/pages/remote_page.dart
+++ b/flutter/lib/mobile/pages/remote_page.dart
@@ -497,7 +497,11 @@ class _RemotePageState extends State<RemotePage> {
         child: Stack(children: () {
           final paints = [
             ImagePaint(),
-            QualityMonitor(gFFI.qualityMonitorModel),
+            Positioned(
+              top: 10,
+              right: 10,
+              child: QualityMonitor(gFFI.qualityMonitorModel),
+            ),
             getHelpTools(),
             SizedBox(
               width: 0,