hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3406 from Kingtous/master

Browse Source 
opt: resize padding for compatible ui and set the default to 5.0
This commit is contained in:
RustDesk 2023-02-27 16:56:59 +08:00 committed by GitHub
commit 47f9ed1172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flutter/lib/consts.dart
View File

@ -59,10 +59,10 @@ const double kDesktopFileTransferMaximumWidth = 300;
const double kDesktopFileTransferRowHeight = 30.0; const double kDesktopFileTransferRowHeight = 30.0;
const double kDesktopFileTransferHeaderHeight = 25.0; const double kDesktopFileTransferHeaderHeight = 25.0;
EdgeInsets get kDragToResizeAreaPadding => Platform.isLinux EdgeInsets get kDragToResizeAreaPadding => !kUseCompatibleUiMode && Platform.isLinux
? stateGlobal.fullscreen || stateGlobal.maximize ? stateGlobal.fullscreen || stateGlobal.maximize
? EdgeInsets.zero ? EdgeInsets.zero
: EdgeInsets.all(4.0) : EdgeInsets.all(5.0)
: EdgeInsets.zero; : EdgeInsets.zero;
// https://en.wikipedia.org/wiki/Non-breaking_space // https://en.wikipedia.org/wiki/Non-breaking_space
const int $nbsp = 0x00A0; const int $nbsp = 0x00A0;

2
flutter/lib/desktop/pages/desktop_tab_page.dart
View File

@ -75,7 +75,7 @@ class _DesktopTabPageState extends State<DesktopTabPage> {
isClose: false, isClose: false,
), ),
))); )));
return Platform.isMacOS return Platform.isMacOS || kUseCompatibleUiMode
? tabWidget ? tabWidget
: Obx( : Obx(
() => DragToResizeArea( () => DragToResizeArea(

2
flutter/lib/desktop/pages/file_manager_tab_page.dart
View File

@ -98,7 +98,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
labelGetter: DesktopTab.labelGetterAlias, labelGetter: DesktopTab.labelGetterAlias,
)), )),
); );
return Platform.isMacOS return Platform.isMacOS || kUseCompatibleUiMode
? tabWidget ? tabWidget
: SubWindowDragToResizeArea( : SubWindowDragToResizeArea(
child: tabWidget, child: tabWidget,

2
flutter/lib/desktop/pages/port_forward_tab_page.dart
View File

@ -107,7 +107,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
labelGetter: DesktopTab.labelGetterAlias, labelGetter: DesktopTab.labelGetterAlias,
)), )),
); );
return Platform.isMacOS return Platform.isMacOS || kUseCompatibleUiMode
? tabWidget ? tabWidget
: Obx( : Obx(
() => SubWindowDragToResizeArea( () => SubWindowDragToResizeArea(

2
flutter/lib/desktop/pages/remote_tab_page.dart
View File

@ -205,7 +205,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
), ),
), ),
); );
return Platform.isMacOS return Platform.isMacOS || kUseCompatibleUiMode
? tabWidget ? tabWidget
: Obx(() => SubWindowDragToResizeArea( : Obx(() => SubWindowDragToResizeArea(
key: contentKey, key: contentKey,

1
flutter/lib/models/state_model.dart
View File

@ -29,7 +29,6 @@ class StateGlobal {
setWindowId(int id) => _windowId = id; setWindowId(int id) => _windowId = id;
setMaximize(bool v) { setMaximize(bool v) {
if (_maximize != v) { if (_maximize != v) {
print("set maximize");
_maximize = v; _maximize = v;
_resizeEdgeSize.value = _resizeEdgeSize.value =
_maximize ? kMaximizeEdgeSize : kWindowEdgeSize; _maximize ? kMaximizeEdgeSize : kWindowEdgeSize;

2
flutter/pubspec.yaml
View File

@ -59,7 +59,7 @@ dependencies:
desktop_multi_window: desktop_multi_window:
git: git:
url: https://github.com/Kingtous/rustdesk_desktop_multi_window url: https://github.com/Kingtous/rustdesk_desktop_multi_window
ref: c717159ea8fc0b9c6b4ac50110efc1dfd3c1ba7a ref: e383fffb5c4529c9e0a710f1025a0c590b99ee08
freezed_annotation: ^2.0.3 freezed_annotation: ^2.0.3
flutter_custom_cursor: ^0.0.4 flutter_custom_cursor: ^0.0.4
window_size: window_size: