mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-12-12 10:19:09 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #3578 from Kingtous/master

Browse Source 
fix: window overflow & prevent setMaximize when fullscreen
This commit is contained in:
RustDesk 2023-03-10 08:31:48 +08:00 committed by GitHub
commit f70dad524d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,10 +28,9 @@ class StateGlobal {
setWindowId(int id) => _windowId = id; setWindowId(int id) => _windowId = id;
setMaximize(bool v) { setMaximize(bool v) {
if (_maximize != v) { if (_maximize != v && !_fullscreen) {
_maximize = v; _maximize = v;
_resizeEdgeSize.value = _resizeEdgeSize.value = _maximize ? kMaximizeEdgeSize : kWindowEdgeSize;
_maximize ? kMaximizeEdgeSize : kWindowEdgeSize;
} }
} }
setFullscreen(bool v) { setFullscreen(bool v) {
@ -39,7 +38,13 @@ class StateGlobal {
_fullscreen = v; _fullscreen = v;
_showTabBar.value = !_fullscreen; _showTabBar.value = !_fullscreen;
_resizeEdgeSize.value = _resizeEdgeSize.value =
fullscreen ? kFullScreenEdgeSize : kWindowEdgeSize; fullscreen
? kFullScreenEdgeSize
: _maximize
? kMaximizeEdgeSize
: kWindowEdgeSize;
print(
"fullscreen: ${fullscreen}, resizeEdgeSize: ${_resizeEdgeSize.value}");
_windowBorderWidth.value = fullscreen ? 0 : kWindowBorderWidth; _windowBorderWidth.value = fullscreen ? 0 : kWindowBorderWidth;
WindowController.fromWindowId(windowId) WindowController.fromWindowId(windowId)
.setFullscreen(_fullscreen) .setFullscreen(_fullscreen)

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: 3e2655677c54f421f9e378680d8171b95a211e0f ref: e3947d4b4f8edaa655de63cd47f2a59a6e024218
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: