flutter_desktop: new remote menu, mid commit

Signed-off-by: fufesou <shuanglongchen@yeah.net>

flutter/lib/desktop/pages/connection_tab_page.dart

@@ -22,26 +22,25 @@ class ConnectionTabPage extends StatefulWidget {
 
 class _ConnectionTabPageState extends State<ConnectionTabPage> {
   final tabController = Get.put(DesktopTabController());
-  static final Rx<String> _fullscreenID = "".obs;
   static final IconData selectedIcon = Icons.desktop_windows_sharp;
   static final IconData unselectedIcon = Icons.desktop_windows_outlined;
 
   var connectionMap = RxList<Widget>.empty(growable: true);
 
   _ConnectionTabPageState(Map<String, dynamic> params) {
+    final RxBool fullscreen = Get.find(tag: 'fullscreen');
     if (params['id'] != null) {
       tabController.add(TabInfo(
           key: params['id'],
           label: params['id'],
           selectedIcon: selectedIcon,
           unselectedIcon: unselectedIcon,
-          page: RemotePage(
-            key: ValueKey(params['id']),
-            id: params['id'],
-            tabBarHeight:
-                _fullscreenID.value.isNotEmpty ? 0 : kDesktopRemoteTabBarHeight,
-            fullscreenID: _fullscreenID,
-          )));
+          page: Obx(() => RemotePage(
+	        key: ValueKey(params['id']),
+                id: params['id'],
+                tabBarHeight:
+                    fullscreen.isTrue ? 0 : kDesktopRemoteTabBarHeight,
+              ))));
     }
   }
 
@@ -54,6 +53,8 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
     rustDeskWinManager.setMethodHandler((call, fromWindowId) async {
       print(
           "call ${call.method} with args ${call.arguments} from window ${fromWindowId}");
+
+      final RxBool fullscreen = Get.find(tag: 'fullscreen');
       // for simplify, just replace connectionId
       if (call.method == "new_remote_desktop") {
         final args = jsonDecode(call.arguments);
@@ -64,14 +65,13 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
             label: id,
             selectedIcon: selectedIcon,
             unselectedIcon: unselectedIcon,
-            page: RemotePage(
-              key: ValueKey(id),
-              id: id,
-              tabBarHeight: _fullscreenID.value.isNotEmpty
-                  ? 0
-                  : kDesktopRemoteTabBarHeight,
-              fullscreenID: _fullscreenID,
-            )));
+            closable: false,
+            page: Obx(() => RemotePage(
+                  key: ValueKey(id),
+                  id: id,
+                  tabBarHeight:
+                      fullscreen.isTrue ? 0 : kDesktopRemoteTabBarHeight,
+                ))));
       } else if (call.method == "onDestroy") {
         tabController.state.value.tabs.forEach((tab) {
           print("executing onDestroy hook, closing ${tab.label}}");
@@ -88,29 +88,31 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
   @override
   Widget build(BuildContext context) {
     final theme = isDarkTheme() ? TarBarTheme.dark() : TarBarTheme.light();
-    return SubWindowDragToResizeArea(
-      windowId: windowId(),
-      child: Container(
-        decoration: BoxDecoration(
-            border: Border.all(color: MyTheme.color(context).border!)),
-        child: Scaffold(
-            backgroundColor: MyTheme.color(context).bg,
-            body: Obx(() => DesktopTab(
-                  controller: tabController,
-                  theme: theme,
-                  isMainWindow: false,
-                  showTabBar: _fullscreenID.value.isEmpty,
-                  tail: AddButton(
-                    theme: theme,
-                  ).paddingOnly(left: 10),
-                  pageViewBuilder: (pageView) {
-                    WindowController.fromWindowId(windowId())
-                        .setFullscreen(_fullscreenID.value.isNotEmpty);
-                    return pageView;
-                  },
-                ))),
-      ),
-    );
+    final RxBool fullscreen = Get.find(tag: 'fullscreen');
+    return Obx(() => SubWindowDragToResizeArea(
+          resizeEdgeSize: fullscreen.value ? 1.0 : 8.0,
+          windowId: windowId(),
+          child: Container(
+            decoration: BoxDecoration(
+                border: Border.all(color: MyTheme.color(context).border!)),
+            child: Scaffold(
+                backgroundColor: MyTheme.color(context).bg,
+                body: Obx(() => DesktopTab(
+                      controller: tabController,
+                      theme: theme,
+                      isMainWindow: false,
+                      showTabBar: fullscreen.isFalse,
+                      tail: AddButton(
+                        theme: theme,
+                      ).paddingOnly(left: 10),
+                      pageViewBuilder: (pageView) {
+                        WindowController.fromWindowId(windowId())
+                            .setFullscreen(fullscreen.isTrue);
+                        return pageView;
+                      },
+                    ))),
+          ),
+        ));
   }
 
   void onRemoveId(String id) {

flutter/lib/desktop/pages/desktop_tab_page.dart

@@ -4,6 +4,7 @@ import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_setting_page.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
+import 'package:get/get.dart';
 import 'package:window_manager/window_manager.dart';
 
 class DesktopTabPage extends StatefulWidget {
@@ -33,26 +34,29 @@ class _DesktopTabPageState extends State<DesktopTabPage> {
   @override
   Widget build(BuildContext context) {
     final dark = isDarkTheme();
-    return DragToResizeArea(
-      child: Container(
-        decoration: BoxDecoration(
-            border: Border.all(color: MyTheme.color(context).border!)),
-        child: Scaffold(
-            backgroundColor: MyTheme.color(context).bg,
-            body: DesktopTab(
-              controller: tabController,
-              theme: dark ? TarBarTheme.dark() : TarBarTheme.light(),
-              isMainWindow: true,
-              tail: ActionIcon(
-                message: 'Settings',
-                icon: IconFont.menu,
-                theme: dark ? TarBarTheme.dark() : TarBarTheme.light(),
-                onTap: onAddSetting,
-                is_close: false,
-              ),
-            )),
-      ),
-    );
+    RxBool fullscreen = false.obs;
+    Get.put(fullscreen, tag: 'fullscreen');
+    return Obx(() => DragToResizeArea(
+          resizeEdgeSize: fullscreen.value ? 1.0 : 8.0,
+          child: Container(
+            decoration: BoxDecoration(
+                border: Border.all(color: MyTheme.color(context).border!)),
+            child: Scaffold(
+                backgroundColor: MyTheme.color(context).bg,
+                body: DesktopTab(
+                  controller: tabController,
+                  theme: dark ? TarBarTheme.dark() : TarBarTheme.light(),
+                  isMainWindow: true,
+                  tail: ActionIcon(
+                    message: 'Settings',
+                    icon: IconFont.menu,
+                    theme: dark ? TarBarTheme.dark() : TarBarTheme.light(),
+                    onTap: onAddSetting,
+                    is_close: false,
+                  ),
+                )),
+          ),
+        ));
   }
 
   void onAddSetting() {

flutter/lib/desktop/pages/remote_page.dart

@@ -9,9 +9,11 @@ import 'package:flutter_hbb/models/chat_model.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:wakelock/wakelock.dart';
+import 'package:tuple/tuple.dart';
 
 // import 'package:window_manager/window_manager.dart';
 
+import '../widgets/remote_menubar.dart';
 import '../../common.dart';
 import '../../mobile/widgets/dialog.dart';
 import '../../mobile/widgets/overlay.dart';
@@ -21,16 +23,14 @@ import '../../models/platform_model.dart';
 final initText = '\1' * 1024;
 
 class RemotePage extends StatefulWidget {
-  RemotePage(
-      {Key? key,
-      required this.id,
-      required this.tabBarHeight,
-      required this.fullscreenID})
-      : super(key: key);
+  RemotePage({
+    Key? key,
+    required this.id,
+    required this.tabBarHeight,
+  }) : super(key: key);
 
   final String id;
   final double tabBarHeight;
-  final Rx<String> fullscreenID;
 
   @override
   _RemotePageState createState() => _RemotePageState();
@@ -50,11 +50,15 @@ class _RemotePageState extends State<RemotePage>
 
   late FFI _ffi;
 
+  void _updateTabBarHeight() {
+    _ffi.canvasModel.tabBarHeight = widget.tabBarHeight;
+  }
+
   @override
   void initState() {
     super.initState();
     _ffi = FFI();
-    _ffi.canvasModel.tabBarHeight = super.widget.tabBarHeight;
+    _updateTabBarHeight();
     Get.put(_ffi, tag: widget.id);
     _ffi.connect(widget.id, tabBarHeight: super.widget.tabBarHeight);
     WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -70,6 +74,9 @@ class _RemotePageState extends State<RemotePage>
     _ffi.listenToMouse(true);
     _ffi.qualityMonitorModel.checkShowQualityMonitor(widget.id);
     // WindowManager.instance.addListener(this);
+    PrivacyModeState.init(widget.id);
+    BlockInputState.init(widget.id);
+    CurrentDisplayState.init(widget.id);
   }
 
   @override
@@ -90,6 +97,9 @@ class _RemotePageState extends State<RemotePage>
     // WindowManager.instance.removeListener(this);
     Get.delete<FFI>(tag: widget.id);
     super.dispose();
+    PrivacyModeState.delete(widget.id);
+    BlockInputState.delete(widget.id);
+    CurrentDisplayState.delete(widget.id);
   }
 
   void resetTool() {
@@ -217,6 +227,7 @@ class _RemotePageState extends State<RemotePage>
   @override
   Widget build(BuildContext context) {
     super.build(context);
+    _updateTabBarHeight();
     return WillPopScope(
         onWillPop: () async {
           clientClose(_ffi.dialogManager);
@@ -289,6 +300,7 @@ class _RemotePageState extends State<RemotePage>
   }
 
   Widget? getBottomAppBar(FfiModel ffiModel) {
+    final RxBool fullscreen = Get.find(tag: 'fullscreen');
     return MouseRegion(
         cursor: SystemMouseCursors.basic,
         child: BottomAppBar(
@@ -323,15 +335,11 @@ class _RemotePageState extends State<RemotePage>
                           : <Widget>[
                               IconButton(
                                 color: Colors.white,
-                                icon: Icon(widget.fullscreenID.value.isEmpty
+                                icon: Icon(fullscreen.isTrue
                                     ? Icons.fullscreen
                                     : Icons.close_fullscreen),
                                 onPressed: () {
-                                  if (widget.fullscreenID.value.isEmpty) {
-                                    widget.fullscreenID.value = widget.id;
-                                  } else {
-                                    widget.fullscreenID.value = "";
-                                  }
+                                  fullscreen.value = !fullscreen.value;
                                 },
                               )
                             ]) +
@@ -404,7 +412,7 @@ class _RemotePageState extends State<RemotePage>
     }
     if (_isPhysicalMouse) {
       _ffi.handleMouse(getEvent(e, 'mousemove'),
-          tabBarHeight: super.widget.tabBarHeight);
+          tabBarHeight: widget.tabBarHeight);
     }
   }
 
@@ -418,7 +426,7 @@ class _RemotePageState extends State<RemotePage>
     }
     if (_isPhysicalMouse) {
       _ffi.handleMouse(getEvent(e, 'mousedown'),
-          tabBarHeight: super.widget.tabBarHeight);
+          tabBarHeight: widget.tabBarHeight);
     }
   }
 
@@ -426,7 +434,7 @@ class _RemotePageState extends State<RemotePage>
     if (e.kind != ui.PointerDeviceKind.mouse) return;
     if (_isPhysicalMouse) {
       _ffi.handleMouse(getEvent(e, 'mouseup'),
-          tabBarHeight: super.widget.tabBarHeight);
+          tabBarHeight: widget.tabBarHeight);
     }
   }
 
@@ -434,7 +442,7 @@ class _RemotePageState extends State<RemotePage>
     if (e.kind != ui.PointerDeviceKind.mouse) return;
     if (_isPhysicalMouse) {
       _ffi.handleMouse(getEvent(e, 'mousemove'),
-          tabBarHeight: super.widget.tabBarHeight);
+          tabBarHeight: widget.tabBarHeight);
     }
   }
 
@@ -500,6 +508,10 @@ class _RemotePageState extends State<RemotePage>
       ));
     }
     paints.add(QualityMonitor(_ffi.qualityMonitorModel));
+    paints.add(RemoteMenubar(
+      id: widget.id,
+      ffi: _ffi,
+    ));
     return Stack(
       children: paints,
     );