From 8bb62abd3e487b66f4566e8f360bd602ab5ea297 Mon Sep 17 00:00:00 2001 From: Kingtous Date: Tue, 20 Dec 2022 22:07:48 +0800 Subject: [PATCH 1/3] fix: cannot input alt+tab when cursor is outside --- flutter/lib/desktop/pages/remote_page.dart | 7 +++++-- flutter/lib/desktop/pages/remote_tab_page.dart | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart index 130a5e6ad..e66d84a35 100644 --- a/flutter/lib/desktop/pages/remote_page.dart +++ b/flutter/lib/desktop/pages/remote_page.dart @@ -157,6 +157,11 @@ class _RemotePageState extends State focusNode: _rawKeyFocusNode, onFocusChange: (bool v) { _imageFocused = v; + if (_imageFocused) { + _ffi.inputModel.enterOrLeave(true); + } else { + _ffi.inputModel.enterOrLeave(false); + } }, inputModel: _ffi.inputModel, child: getBodyForDesktop(context))); @@ -195,7 +200,6 @@ class _RemotePageState extends State // } } - _ffi.inputModel.enterOrLeave(true); } void leaveView(PointerExitEvent evt) { @@ -208,7 +212,6 @@ class _RemotePageState extends State // } } - _ffi.inputModel.enterOrLeave(false); } Widget getBodyForDesktop(BuildContext context) { diff --git a/flutter/lib/desktop/pages/remote_tab_page.dart b/flutter/lib/desktop/pages/remote_tab_page.dart index 713c3d13c..f7237af96 100644 --- a/flutter/lib/desktop/pages/remote_tab_page.dart +++ b/flutter/lib/desktop/pages/remote_tab_page.dart @@ -37,7 +37,8 @@ class ConnectionTabPage extends StatefulWidget { State createState() => _ConnectionTabPageState(params); } -class _ConnectionTabPageState extends State { +class _ConnectionTabPageState extends State + with MultiWindowListener { final tabController = Get.put(DesktopTabController( tabType: DesktopTabType.remoteScreen, onSelected: (_, id) => bind.setCurSessionId(id: id))); @@ -105,14 +106,26 @@ class _ConnectionTabPageState extends State { } _update_remote_count(); }); + DesktopMultiWindow.addListener(this); } @override void dispose() { super.dispose(); + DesktopMultiWindow.removeListener(this); _menubarState.save(); } + @override + void onWindowBlur() { + super.onWindowBlur(); + final state = tabController.state.value; + if (state.tabs.isNotEmpty) { + final sessionId = state.tabs[state.selected].key; + bind.sessionEnterOrLeave(id: sessionId, enter: false); + } + } + @override Widget build(BuildContext context) { final tabWidget = Obx( From 52f60154db4e292c612fa15e3f01ac558c666708 Mon Sep 17 00:00:00 2001 From: Kingtous Date: Wed, 21 Dec 2022 10:40:43 +0800 Subject: [PATCH 2/3] opt: remove not working on multiple times --- flutter/lib/desktop/pages/remote_page.dart | 15 +++++++++++++-- flutter/lib/desktop/pages/remote_tab_page.dart | 10 ---------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart index e66d84a35..4061fb74d 100644 --- a/flutter/lib/desktop/pages/remote_page.dart +++ b/flutter/lib/desktop/pages/remote_page.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'dart:io'; import 'dart:ui' as ui; +import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -48,7 +49,7 @@ class RemotePage extends StatefulWidget { } class _RemotePageState extends State - with AutomaticKeepAliveClientMixin { + with AutomaticKeepAliveClientMixin, MultiWindowListener { Timer? _timer; String keyboardMode = "legacy"; final _cursorOverImage = false.obs; @@ -57,7 +58,7 @@ class _RemotePageState extends State late RxBool _remoteCursorMoved; late RxBool _keyboardEnabled; - final FocusNode _rawKeyFocusNode = FocusNode(); + final FocusNode _rawKeyFocusNode = FocusNode(debugLabel: "rawkeyFocusNode"); var _imageFocused = false; Function(bool)? _onEnterOrLeaveImage4Menubar; @@ -111,6 +112,7 @@ class _RemotePageState extends State id: widget.id, arg: 'show-remote-cursor'); _zoomCursor.value = bind.sessionGetToggleOptionSync(id: widget.id, arg: 'zoom-cursor'); + DesktopMultiWindow.addListener(this); // if (!_isCustomCursorInited) { // customCursorController.registerNeedUpdateCursorCallback( // (String? lastKey, String? currentKey) async { @@ -124,9 +126,18 @@ class _RemotePageState extends State // } } + @override + void onWindowBlur() { + super.onWindowBlur(); + // unfocus the key focus when the whole window is lost focus, + // and let OS to handle events instead. + _rawKeyFocusNode.unfocus(); + } + @override void dispose() { debugPrint("REMOTE PAGE dispose ${widget.id}"); + DesktopMultiWindow.removeListener(this); _ffi.dialogManager.hideMobileActionsOverlay(); _ffi.recordingModel.onClose(); _rawKeyFocusNode.dispose(); diff --git a/flutter/lib/desktop/pages/remote_tab_page.dart b/flutter/lib/desktop/pages/remote_tab_page.dart index f7237af96..10c2d4487 100644 --- a/flutter/lib/desktop/pages/remote_tab_page.dart +++ b/flutter/lib/desktop/pages/remote_tab_page.dart @@ -116,16 +116,6 @@ class _ConnectionTabPageState extends State _menubarState.save(); } - @override - void onWindowBlur() { - super.onWindowBlur(); - final state = tabController.state.value; - if (state.tabs.isNotEmpty) { - final sessionId = state.tabs[state.selected].key; - bind.sessionEnterOrLeave(id: sessionId, enter: false); - } - } - @override Widget build(BuildContext context) { final tabWidget = Obx( From 01f497c234c3fa3f58981819b9652ab780035a21 Mon Sep 17 00:00:00 2001 From: Kingtous Date: Wed, 21 Dec 2022 11:50:30 +0800 Subject: [PATCH 3/3] opt: remove unnecessary window listener --- flutter/lib/desktop/pages/remote_tab_page.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/flutter/lib/desktop/pages/remote_tab_page.dart b/flutter/lib/desktop/pages/remote_tab_page.dart index 10c2d4487..713c3d13c 100644 --- a/flutter/lib/desktop/pages/remote_tab_page.dart +++ b/flutter/lib/desktop/pages/remote_tab_page.dart @@ -37,8 +37,7 @@ class ConnectionTabPage extends StatefulWidget { State createState() => _ConnectionTabPageState(params); } -class _ConnectionTabPageState extends State - with MultiWindowListener { +class _ConnectionTabPageState extends State { final tabController = Get.put(DesktopTabController( tabType: DesktopTabType.remoteScreen, onSelected: (_, id) => bind.setCurSessionId(id: id))); @@ -106,13 +105,11 @@ class _ConnectionTabPageState extends State } _update_remote_count(); }); - DesktopMultiWindow.addListener(this); } @override void dispose() { super.dispose(); - DesktopMultiWindow.removeListener(this); _menubarState.save(); }