From 6d1d844b142ca6a7ee342a3d247b920fa6c3a60b Mon Sep 17 00:00:00 2001 From: fufesou <13586388+fufesou@users.noreply.github.com> Date: Fri, 7 Jun 2024 09:54:50 +0800 Subject: [PATCH] refact: Wayland, do not show multi displays (#8277) Signed-off-by: fufesou --- flutter/lib/common/widgets/toolbar.dart | 3 ++- flutter/lib/desktop/widgets/remote_toolbar.dart | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flutter/lib/common/widgets/toolbar.dart b/flutter/lib/common/widgets/toolbar.dart index 78e8e7a83..1c55da674 100644 --- a/flutter/lib/common/widgets/toolbar.dart +++ b/flutter/lib/common/widgets/toolbar.dart @@ -583,10 +583,11 @@ Future> toolbarDisplayToggle( child: Text(translate('Lock after session end')))); } - if (bind.mainGetUseTextureRender() && + if (!pi.isWayland && pi.isSupportMultiDisplay && PrivacyModeState.find(id).isEmpty && pi.displaysCount.value > 1 && + bind.mainGetUseTextureRender() && bind.mainGetUserDefaultOption(key: kKeyShowMonitorsToolbar) == 'Y') { final value = bind.sessionGetDisplaysAsIndividualWindows(sessionId: ffi.sessionId) == diff --git a/flutter/lib/desktop/widgets/remote_toolbar.dart b/flutter/lib/desktop/widgets/remote_toolbar.dart index 6d3136c60..a9fadc336 100644 --- a/flutter/lib/desktop/widgets/remote_toolbar.dart +++ b/flutter/lib/desktop/widgets/remote_toolbar.dart @@ -467,7 +467,8 @@ class _RemoteToolbarState extends State { toolbarItems.add(Obx(() { if (PrivacyModeState.find(widget.id).isEmpty && - pi.displaysCount.value > 1) { + pi.displaysCount.value > 1 && + !pi.isWayland) { return _MonitorMenu( id: widget.id, ffi: widget.ffi,