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

open individual window, add offset

Browse Source 
Signed-off-by: dignow <linlong1265@gmail.com>
This commit is contained in:
dignow 2023-10-19 07:50:59 +08:00
parent d7036aae48
commit 80951a8e6e
3 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
flutter/lib/common.dart
View File

@ -1673,8 +1673,10 @@ Future<Offset?> _adjustRestoreMainWindowOffset(
/// Restore window position and size on start /// Restore window position and size on start
/// Note that windowId must be provided if it's subwindow /// Note that windowId must be provided if it's subwindow
//
// display is used to set the offset of the window in individual display mode.
Future<bool> restoreWindowPosition(WindowType type, Future<bool> restoreWindowPosition(WindowType type,
{int? windowId, String? peerId}) async { {int? windowId, String? peerId, int? display}) async {
if (bind if (bind
.mainGetEnv(key: "DISABLE_RUSTDESK_RESTORE_WINDOW_POSITION") .mainGetEnv(key: "DISABLE_RUSTDESK_RESTORE_WINDOW_POSITION")
.isNotEmpty) { .isNotEmpty) {
@ -1710,9 +1712,8 @@ Future<bool> restoreWindowPosition(WindowType type,
debugPrint("no window position saved, ignoring position restoration"); debugPrint("no window position saved, ignoring position restoration");
return false; return false;
} }
if (type == WindowType.RemoteDesktop && if (type == WindowType.RemoteDesktop) {
!isRemotePeerPos && if (!isRemotePeerPos && windowId != null) {
windowId != null) {
if (lpos.offsetWidth != null) { if (lpos.offsetWidth != null) {
lpos.offsetWidth = lpos.offsetWidth! + windowId * 20; lpos.offsetWidth = lpos.offsetWidth! + windowId * 20;
} }
@ -1720,6 +1721,15 @@ Future<bool> restoreWindowPosition(WindowType type,
lpos.offsetHeight = lpos.offsetHeight! + windowId * 20; lpos.offsetHeight = lpos.offsetHeight! + windowId * 20;
} }
} }
if (display != null) {
if (lpos.offsetWidth != null) {
lpos.offsetWidth = lpos.offsetWidth! + display * 30;
}
if (lpos.offsetHeight != null) {
lpos.offsetHeight = lpos.offsetHeight! + display * 30;
}
}
}
final size = await _adjustRestoreMainWindowSize(lpos.width, lpos.height); final size = await _adjustRestoreMainWindowSize(lpos.width, lpos.height);
final offset = await _adjustRestoreMainWindowOffset( final offset = await _adjustRestoreMainWindowOffset(

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

@ -48,7 +48,8 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
late ToolbarState _toolbarState; late ToolbarState _toolbarState;
String? peerId; String? peerId;
bool isScreenRectSet = false; bool _isScreenRectSet = false;
int? _display;
var connectionMap = RxList<Widget>.empty(growable: true); var connectionMap = RxList<Widget>.empty(growable: true);
@ -61,7 +62,8 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
final display = params['display']; final display = params['display'];
final displays = params['displays']; final displays = params['displays'];
final screenRect = parseParamScreenRect(params); final screenRect = parseParamScreenRect(params);
isScreenRectSet = screenRect != null; _isScreenRectSet = screenRect != null;
_display = display as int?;
tryMoveToScreenAndSetFullscreen(screenRect); tryMoveToScreenAndSetFullscreen(screenRect);
if (peerId != null) { if (peerId != null) {
ConnectionTypeState.init(peerId!); ConnectionTypeState.init(peerId!);
@ -202,7 +204,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
_update_remote_count(); _update_remote_count();
return returnValue; return returnValue;
}); });
if (!isScreenRectSet) { if (!_isScreenRectSet) {
Future.delayed(Duration.zero, () { Future.delayed(Duration.zero, () {
restoreWindowPosition( restoreWindowPosition(
WindowType.RemoteDesktop, WindowType.RemoteDesktop,
@ -210,6 +212,7 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
peerId: tabController.state.value.tabs.isEmpty peerId: tabController.state.value.tabs.isEmpty
? null ? null
: tabController.state.value.tabs[0].key, : tabController.state.value.tabs[0].key,
display: _display,
); );
}); });
} }

9
flutter/lib/main.dart
View File

@ -200,8 +200,13 @@ void runMultiWindow(
case kAppTypeDesktopRemote: case kAppTypeDesktopRemote:
// If screen rect is set, the window will be moved to the target screen and then set fullscreen. // If screen rect is set, the window will be moved to the target screen and then set fullscreen.
if (argument['screen_rect'] == null) { if (argument['screen_rect'] == null) {
await restoreWindowPosition(WindowType.RemoteDesktop, // int? display = argument['display'] as int?;
windowId: kWindowId!, peerId: argument['id'] as String?); await restoreWindowPosition(
WindowType.RemoteDesktop,
windowId: kWindowId!,
peerId: argument['id'] as String?,
display: argument['display'] as int?,
);
} }
break; break;
case kAppTypeDesktopFileTransfer: case kAppTypeDesktopFileTransfer: