Merge pull request #1325 from Kingtous/flutter_desktop

feat: can resize window when without title bar
2022-08-22 14:25:52 +08:00 · 2022-08-22 14:25:52 +08:00 · 968cff967e
commit 968cff967e
parent 3028d7c0ff 48e25accae
5 changed files with 92 additions and 83 deletions
--- a/flutter/lib/desktop/pages/connection_tab_page.dart
+++ b/flutter/lib/desktop/pages/connection_tab_page.dart
@ -72,34 +72,37 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {

  @override
  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Column(
-        children: [
-          Obx(() => Visibility(
-              visible: _fullscreenID.value.isEmpty,
-              child: DesktopTabBar(
-                tabs: tabs,
-                onTabClose: onRemoveId,
-                dark: isDarkTheme(),
-                mainTab: false,
-              ))),
-          Expanded(child: Obx(() {
-            WindowController.fromWindowId(windowId())
-                .setFullscreen(_fullscreenID.value.isNotEmpty);
-            return PageView(
-                controller: DesktopTabBar.controller.value,
-                children: tabs
-                    .map((tab) => RemotePage(
-                          key: ValueKey(tab.label),
-                          id: tab.label,
-                          tabBarHeight: _fullscreenID.value.isNotEmpty
-                              ? 0
-                              : kDesktopRemoteTabBarHeight,
-                          fullscreenID: _fullscreenID,
-                        )) //RemotePage(key: ValueKey(e), id: e))
-                    .toList());
-          })),
-        ],
+    return SubWindowDragToResizeArea(
+      windowId: windowId(),
+      child: Scaffold(
+        body: Column(
+          children: [
+            Obx(() => Visibility(
+                visible: _fullscreenID.value.isEmpty,
+                child: DesktopTabBar(
+                  tabs: tabs,
+                  onTabClose: onRemoveId,
+                  dark: isDarkTheme(),
+                  mainTab: false,
+                ))),
+            Expanded(child: Obx(() {
+              WindowController.fromWindowId(windowId())
+                  .setFullscreen(_fullscreenID.value.isNotEmpty);
+              return PageView(
+                  controller: DesktopTabBar.controller.value,
+                  children: tabs
+                      .map((tab) => RemotePage(
+                            key: ValueKey(tab.label),
+                            id: tab.label,
+                            tabBarHeight: _fullscreenID.value.isNotEmpty
+                                ? 0
+                                : kDesktopRemoteTabBarHeight,
+                            fullscreenID: _fullscreenID,
+                          )) //RemotePage(key: ValueKey(e), id: e))
+                      .toList());
+            })),
+          ],
+        ),
      ),
    );
  }
--- a/flutter/lib/desktop/pages/desktop_tab_page.dart
+++ b/flutter/lib/desktop/pages/desktop_tab_page.dart
@ -5,6 +5,7 @@ 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 {
  const DesktopTabPage({Key? key}) : super(key: key);
@ -30,34 +31,36 @@ class _DesktopTabPageState extends State<DesktopTabPage> {

  @override
  Widget build(BuildContext context) {
-    return Container(
-      decoration: BoxDecoration(
-          border: Border.all(color: MyTheme.color(context).border!)),
-      child: Scaffold(
-        backgroundColor: MyTheme.color(context).bg,
-        body: Column(
-          children: [
-            DesktopTabBar(
-              tabs: tabs,
-              dark: isDarkTheme(),
-              mainTab: true,
-              onAddSetting: onAddSetting,
-            ),
-            Obx((() => Expanded(
-                  child: PageView(
-                      controller: DesktopTabBar.controller.value,
-                      children: tabs.map((tab) {
-                        switch (tab.label) {
-                          case kTabLabelHomePage:
-                            return DesktopHomePage(key: ValueKey(tab.label));
-                          case kTabLabelSettingPage:
-                            return DesktopSettingPage(key: ValueKey(tab.label));
-                          default:
-                            return Container();
-                        }
-                      }).toList()),
-                ))),
-          ],
+    return DragToResizeArea(
+      child: Container(
+        decoration: BoxDecoration(
+            border: Border.all(color: MyTheme.color(context).border!)),
+        child: Scaffold(
+          backgroundColor: MyTheme.color(context).bg,
+          body: Column(
+            children: [
+              DesktopTabBar(
+                tabs: tabs,
+                dark: isDarkTheme(),
+                mainTab: true,
+                onAddSetting: onAddSetting,
+              ),
+              Obx((() => Expanded(
+                    child: PageView(
+                        controller: DesktopTabBar.controller.value,
+                        children: tabs.map((tab) {
+                          switch (tab.label) {
+                            case kTabLabelHomePage:
+                              return DesktopHomePage(key: ValueKey(tab.label));
+                            case kTabLabelSettingPage:
+                              return DesktopSettingPage(key: ValueKey(tab.label));
+                            default:
+                              return Container();
+                          }
+                        }).toList()),
+                  ))),
+            ],
+          ),
        ),
      ),
    );
--- a/flutter/lib/desktop/pages/file_manager_tab_page.dart
+++ b/flutter/lib/desktop/pages/file_manager_tab_page.dart
@ -68,27 +68,31 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {

  @override
  Widget build(BuildContext context) {
-    return Scaffold(
-      body: Column(
-        children: [
-          DesktopTabBar(
-            tabs: tabs,
-            onTabClose: onRemoveId,
-            dark: isDarkTheme(),
-            mainTab: false,
-          ),
-          Expanded(
-            child: Obx(
-              () => PageView(
-                  controller: DesktopTabBar.controller.value,
-                  children: tabs
-                      .map((tab) => FileManagerPage(
-                          key: ValueKey(tab.label),
-                          id: tab.label)) //RemotePage(key: ValueKey(e), id: e))
-                      .toList()),
+    return SubWindowDragToResizeArea(
+      windowId: windowId(),
+      child: Scaffold(
+        body: Column(
+          children: [
+            DesktopTabBar(
+              tabs: tabs,
+              onTabClose: onRemoveId,
+              dark: isDarkTheme(),
+              mainTab: false,
            ),
-          )
-        ],
+            Expanded(
+              child: Obx(
+                () => PageView(
+                    controller: DesktopTabBar.controller.value,
+                    children: tabs
+                        .map((tab) => FileManagerPage(
+                            key: ValueKey(tab.label),
+                            id: tab
+                                .label)) //RemotePage(key: ValueKey(e), id: e))
+                        .toList()),
+              ),
+            )
+          ],
+        ),
      ),
    );
  }
--- a/flutter/pubspec.lock
+++ b/flutter/pubspec.lock
@ -252,8 +252,8 @@ packages:
    dependency: "direct main"
    description:
      path: "."
-      ref: "6e6b6f557f655e9c985007d754b6282a0e524932"
-      resolved-ref: "6e6b6f557f655e9c985007d754b6282a0e524932"
+      ref: e013c81d75320bbf28adddeaadf462264ee6039d
+      resolved-ref: e013c81d75320bbf28adddeaadf462264ee6039d
      url: "https://github.com/Kingtous/rustdesk_desktop_multi_window"
    source: git
    version: "0.1.0"
@ -1230,8 +1230,8 @@ packages:
    dependency: "direct main"
    description:
      path: "."
-      ref: "75a6c813babca461f359a586785d797f7806e390"
-      resolved-ref: "75a6c813babca461f359a586785d797f7806e390"
+      ref: f1d69e5d0531af947373ec26ae22808f08b1aac6
+      resolved-ref: f1d69e5d0531af947373ec26ae22808f08b1aac6
      url: "https://github.com/Kingtous/rustdesk_window_manager"
    source: git
    version: "0.2.5"
--- a/flutter/pubspec.yaml
+++ b/flutter/pubspec.yaml
@ -61,12 +61,11 @@ dependencies:
    window_manager:
        git:
            url: https://github.com/Kingtous/rustdesk_window_manager
-            ref: 75a6c813babca461f359a586785d797f7806e390
+            ref: f1d69e5d0531af947373ec26ae22808f08b1aac6
    desktop_multi_window:
-        # path: ../../rustdesk_desktop_multi_window
        git:
            url: https://github.com/Kingtous/rustdesk_desktop_multi_window
-            ref: 6e6b6f557f655e9c985007d754b6282a0e524932
+            ref: e013c81d75320bbf28adddeaadf462264ee6039d
    freezed_annotation: ^2.0.3
    tray_manager:
        git: