opt: remove drag to resize widget on macOS

2022-09-19 10:14:14 +08:00 · 2022-09-19 10:14:14 +08:00 · ef80dab48e
commit ef80dab48e
parent 429d72c9c3
4 changed files with 123 additions and 108 deletions
--- a/flutter/lib/desktop/pages/desktop_tab_page.dart
+++ b/flutter/lib/desktop/pages/desktop_tab_page.dart
@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
 import 'package:flutter_hbb/consts.dart';
@ -35,28 +37,30 @@ class _DesktopTabPageState extends State<DesktopTabPage> {
  Widget build(BuildContext context) {
    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: Overlay(initialEntries: [
-            OverlayEntry(builder: (context) {
-              gFFI.dialogManager.setOverlayState(Overlay.of(context));
-              return Scaffold(
-                  backgroundColor: MyTheme.color(context).bg,
-                  body: DesktopTab(
-                    controller: tabController,
-                    tail: ActionIcon(
-                      message: 'Settings',
-                      icon: IconFont.menu,
-                      onTap: onAddSetting,
-                      isClose: false,
-                    ),
-                  ));
-            })
-          ]),
-        )));
+    final tabWidget = Container(
+      decoration: BoxDecoration(
+          border: Border.all(color: MyTheme.color(context).border!)),
+      child: Overlay(initialEntries: [
+        OverlayEntry(builder: (context) {
+          gFFI.dialogManager.setOverlayState(Overlay.of(context));
+          return Scaffold(
+              backgroundColor: MyTheme.color(context).bg,
+              body: DesktopTab(
+                controller: tabController,
+                tail: ActionIcon(
+                  message: 'Settings',
+                  icon: IconFont.menu,
+                  onTap: onAddSetting,
+                  isClose: false,
+                ),
+              ));
+        })
+      ]),
+    );
+    return Obx(() => Platform.isMacOS
+        ? tabWidget
+        : DragToResizeArea(
+            resizeEdgeSize: fullscreen.value ? 1.0 : 8.0, child: tabWidget));
  }

  void onAddSetting() {
--- a/flutter/lib/desktop/pages/file_manager_tab_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_tab_page.dart
@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';

 import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
@ -66,20 +67,23 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {

  @override
  Widget build(BuildContext context) {
-    return SubWindowDragToResizeArea(
-      windowId: windowId(),
-      child: Container(
-        decoration: BoxDecoration(
-            border: Border.all(color: MyTheme.color(context).border!)),
-        child: Scaffold(
-            backgroundColor: MyTheme.color(context).bg,
-            body: DesktopTab(
-              controller: tabController,
-              onWindowCloseButton: handleWindowCloseButton,
-              tail: const AddButton().paddingOnly(left: 10),
-            )),
-      ),
+    final tabWidget = Container(
+      decoration: BoxDecoration(
+          border: Border.all(color: MyTheme.color(context).border!)),
+      child: Scaffold(
+          backgroundColor: MyTheme.color(context).bg,
+          body: DesktopTab(
+            controller: tabController,
+            onWindowCloseButton: handleWindowCloseButton,
+            tail: const AddButton().paddingOnly(left: 10),
+          )),
    );
+    return Platform.isMacOS
+        ? tabWidget
+        : SubWindowDragToResizeArea(
+            windowId: windowId(),
+            child: tabWidget,
+          );
  }

  void onRemoveId(String id) {
--- a/flutter/lib/desktop/pages/port_forward_tab_page.dart
+++ b/flutter/lib/desktop/pages/port_forward_tab_page.dart
@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';

 import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
@ -74,23 +75,26 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {

  @override
  Widget build(BuildContext context) {
-    return SubWindowDragToResizeArea(
-      windowId: windowId(),
-      child: Container(
-        decoration: BoxDecoration(
-            border: Border.all(color: MyTheme.color(context).border!)),
-        child: Scaffold(
-            backgroundColor: MyTheme.color(context).bg,
-            body: DesktopTab(
-              controller: tabController,
-              onWindowCloseButton: () async {
-                tabController.clear();
-                return true;
-              },
-              tail: AddButton().paddingOnly(left: 10),
-            )),
-      ),
+    final tabWidget = Container(
+      decoration: BoxDecoration(
+          border: Border.all(color: MyTheme.color(context).border!)),
+      child: Scaffold(
+          backgroundColor: MyTheme.color(context).bg,
+          body: DesktopTab(
+            controller: tabController,
+            onWindowCloseButton: () async {
+              tabController.clear();
+              return true;
+            },
+            tail: AddButton().paddingOnly(left: 10),
+          )),
    );
+    return Platform.isMacOS
+        ? tabWidget
+        : SubWindowDragToResizeArea(
+            windowId: windowId(),
+            child: tabWidget,
+          );
  }

  void onRemoveId(String id) {
--- a/flutter/lib/desktop/pages/remote_tab_page.dart
+++ b/flutter/lib/desktop/pages/remote_tab_page.dart
@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:io';

 import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
@ -86,63 +87,65 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
  @override
  Widget build(BuildContext context) {
    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: DesktopTab(
-                  controller: tabController,
-                  showTabBar: fullscreen.isFalse,
-                  onWindowCloseButton: handleWindowCloseButton,
-                  tail: const AddButton().paddingOnly(left: 10),
-                  pageViewBuilder: (pageView) {
-                    WindowController.fromWindowId(windowId())
-                        .setFullscreen(fullscreen.isTrue);
-                    return pageView;
-                  },
-                  tabBuilder: (key, icon, label, themeConf) => Obx(() {
-                    final connectionType = ConnectionTypeState.find(key);
-                    if (!connectionType.isValid()) {
-                      return Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          icon,
-                          label,
-                        ],
-                      );
-                    } else {
-                      final msgDirect = translate(connectionType.direct.value ==
-                              ConnectionType.strDirect
-                          ? 'Direct Connection'
-                          : 'Relay Connection');
-                      final msgSecure = translate(connectionType.secure.value ==
-                              ConnectionType.strSecure
-                          ? 'Secure Connection'
-                          : 'Insecure Connection');
-                      return Row(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                          icon,
-                          Tooltip(
-                            message: '$msgDirect\n$msgSecure',
-                            child: Image.asset(
-                              'assets/${connectionType.secure.value}${connectionType.direct.value}.png',
-                              width: themeConf.iconSize,
-                              height: themeConf.iconSize,
-                            ).paddingOnly(right: 5),
-                          ),
-                          label,
-                        ],
-                      );
-                    }
-                  }),
-                )),
-          ),
-        ));
+    final tabWidget = Container(
+      decoration: BoxDecoration(
+          border: Border.all(color: MyTheme.color(context).border!)),
+      child: Scaffold(
+          backgroundColor: MyTheme.color(context).bg,
+          body: DesktopTab(
+            controller: tabController,
+            showTabBar: fullscreen.isFalse,
+            onWindowCloseButton: handleWindowCloseButton,
+            tail: const AddButton().paddingOnly(left: 10),
+            pageViewBuilder: (pageView) {
+              WindowController.fromWindowId(windowId())
+                  .setFullscreen(fullscreen.isTrue);
+              return pageView;
+            },
+            tabBuilder: (key, icon, label, themeConf) => Obx(() {
+              final connectionType = ConnectionTypeState.find(key);
+              if (!connectionType.isValid()) {
+                return Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    icon,
+                    label,
+                  ],
+                );
+              } else {
+                final msgDirect = translate(
+                    connectionType.direct.value == ConnectionType.strDirect
+                        ? 'Direct Connection'
+                        : 'Relay Connection');
+                final msgSecure = translate(
+                    connectionType.secure.value == ConnectionType.strSecure
+                        ? 'Secure Connection'
+                        : 'Insecure Connection');
+                return Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    icon,
+                    Tooltip(
+                      message: '$msgDirect\n$msgSecure',
+                      child: Image.asset(
+                        'assets/${connectionType.secure.value}${connectionType.direct.value}.png',
+                        width: themeConf.iconSize,
+                        height: themeConf.iconSize,
+                      ).paddingOnly(right: 5),
+                    ),
+                    label,
+                  ],
+                );
+              }
+            }),
+          )),
+    );
+    return Obx(() => Platform.isMacOS
+        ? tabWidget
+        : SubWindowDragToResizeArea(
+            resizeEdgeSize: fullscreen.value ? 1.0 : 8.0,
+            windowId: windowId(),
+            child: tabWidget));
  }

  void onRemoveId(String id) {