From 352384646db9c38e07467aeae482d7d5a1fbded4 Mon Sep 17 00:00:00 2001 From: fufesou Date: Tue, 1 Nov 2022 18:16:52 +0800 Subject: [PATCH] fix build Signed-off-by: fufesou --- flutter/lib/desktop/pages/desktop_tab_page.dart | 8 ++++++-- flutter/lib/desktop/pages/file_manager_tab_page.dart | 7 ++++++- flutter/lib/desktop/pages/port_forward_tab_page.dart | 7 ++++++- flutter/lib/desktop/pages/remote_tab_page.dart | 7 ++++++- flutter/lib/models/state_model.dart | 6 ++++-- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/flutter/lib/desktop/pages/desktop_tab_page.dart b/flutter/lib/desktop/pages/desktop_tab_page.dart index 20a433152..794dd1c08 100644 --- a/flutter/lib/desktop/pages/desktop_tab_page.dart +++ b/flutter/lib/desktop/pages/desktop_tab_page.dart @@ -83,7 +83,11 @@ class _DesktopTabPageState extends State { ); return Platform.isMacOS ? tabWidget - : DragToResizeArea( - resizeEdgeSize: stateGlobal.resizeEdgeSize, child: tabWidget); + : Obx( + () => DragToResizeArea( + resizeEdgeSize: stateGlobal.resizeEdgeSize.value, + child: tabWidget, + ), + ); } } diff --git a/flutter/lib/desktop/pages/file_manager_tab_page.dart b/flutter/lib/desktop/pages/file_manager_tab_page.dart index 3ce42bba3..66a14bd37 100644 --- a/flutter/lib/desktop/pages/file_manager_tab_page.dart +++ b/flutter/lib/desktop/pages/file_manager_tab_page.dart @@ -5,6 +5,7 @@ import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/consts.dart'; +import 'package:flutter_hbb/models/state_model.dart'; import 'package:flutter_hbb/desktop/pages/file_manager_page.dart'; import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; import 'package:flutter_hbb/utils/multi_window_manager.dart'; @@ -86,7 +87,11 @@ class _FileManagerTabPageState extends State { ); return Platform.isMacOS ? tabWidget - : SubWindowDragToResizeArea(child: tabWidget); + : SubWindowDragToResizeArea( + child: tabWidget, + resizeEdgeSize: stateGlobal.resizeEdgeSize.value, + windowId: stateGlobal.windowId, + ); } void onRemoveId(String id) { diff --git a/flutter/lib/desktop/pages/port_forward_tab_page.dart b/flutter/lib/desktop/pages/port_forward_tab_page.dart index 73ae5f8f0..c0eea86e6 100644 --- a/flutter/lib/desktop/pages/port_forward_tab_page.dart +++ b/flutter/lib/desktop/pages/port_forward_tab_page.dart @@ -5,6 +5,7 @@ import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/consts.dart'; +import 'package:flutter_hbb/models/state_model.dart'; import 'package:flutter_hbb/desktop/pages/port_forward_page.dart'; import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; import 'package:flutter_hbb/utils/multi_window_manager.dart'; @@ -97,7 +98,11 @@ class _PortForwardTabPageState extends State { ); return Platform.isMacOS ? tabWidget - : SubWindowDragToResizeArea(child: tabWidget); + : SubWindowDragToResizeArea( + child: tabWidget, + resizeEdgeSize: stateGlobal.resizeEdgeSize.value, + windowId: stateGlobal.windowId, + ); } void onRemoveId(String id) { diff --git a/flutter/lib/desktop/pages/remote_tab_page.dart b/flutter/lib/desktop/pages/remote_tab_page.dart index b6cce5aa3..29253d537 100644 --- a/flutter/lib/desktop/pages/remote_tab_page.dart +++ b/flutter/lib/desktop/pages/remote_tab_page.dart @@ -6,6 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/common/shared_state.dart'; import 'package:flutter_hbb/consts.dart'; +import 'package:flutter_hbb/models/state_model.dart'; import 'package:flutter_hbb/desktop/pages/remote_page.dart'; import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart'; import 'package:flutter_hbb/utils/multi_window_manager.dart'; @@ -143,7 +144,11 @@ class _ConnectionTabPageState extends State { ); return Platform.isMacOS ? tabWidget - : SubWindowDragToResizeArea(child: tabWidget); + : SubWindowDragToResizeArea( + child: tabWidget, + resizeEdgeSize: stateGlobal.resizeEdgeSize.value, + windowId: stateGlobal.windowId, + ); } void onRemoveId(String id) { diff --git a/flutter/lib/models/state_model.dart b/flutter/lib/models/state_model.dart index 6a452d311..f6e3820b9 100644 --- a/flutter/lib/models/state_model.dart +++ b/flutter/lib/models/state_model.dart @@ -7,20 +7,22 @@ class StateGlobal { int _windowId = -1; bool _fullscreen = false; final RxBool _showTabBar = true.obs; + final RxDouble _resizeEdgeSize = 8.0.obs; int get windowId => _windowId; bool get fullscreen => _fullscreen; double get tabBarHeight => fullscreen ? 0 : kDesktopRemoteTabBarHeight; double get windowBorderWidth => fullscreen ? 0 : kWindowBorderWidth; RxBool get showTabBar => _showTabBar; - double get resizeEdgeSize => - fullscreen ? kFullScreenEdgeSize : kWindowEdgeSize; + RxDouble get resizeEdgeSize => _resizeEdgeSize; setWindowId(int id) => _windowId = id; setFullscreen(bool v) { if (_fullscreen != v) { _fullscreen = v; _showTabBar.value = !_fullscreen; + _resizeEdgeSize.value = + fullscreen ? kFullScreenEdgeSize : kWindowEdgeSize; WindowController.fromWindowId(windowId).setFullscreen(_fullscreen); } }