mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-24 20:59:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #5887 from sahilyeole/fix/wayland_screen_share_prompt

Browse Source 
Fix wayland screen prompt on display menu
This commit is contained in:
RustDesk 2023-10-03 13:13:52 +08:00 committed by GitHub
commit 94830cffca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
flutter/lib/desktop/widgets/remote_toolbar.dart
View File

@ -1053,10 +1053,12 @@ class _ResolutionsMenuState extends State<_ResolutionsMenu> {
FfiModel get ffiModel => widget.ffi.ffiModel; FfiModel get ffiModel => widget.ffi.ffiModel;
Display get display => ffiModel.display; Display get display => ffiModel.display;
List<Resolution> get resolutions => pi.resolutions; List<Resolution> get resolutions => pi.resolutions;
bool get isWayland => bind.mainCurrentIsWayland();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_getLocalResolutionWayland();
} }
@override @override
@ -1065,7 +1067,6 @@ class _ResolutionsMenuState extends State<_ResolutionsMenu> {
final visible = final visible =
ffiModel.keyboard && (isVirtualDisplay || resolutions.length > 1); ffiModel.keyboard && (isVirtualDisplay || resolutions.length > 1);
if (!visible) return Offstage(); if (!visible) return Offstage();
_getLocalResolution();
final showOriginalBtn = final showOriginalBtn =
display.isOriginalResolutionSet && !display.isOriginalResolution; display.isOriginalResolutionSet && !display.isOriginalResolution;
final showFitLocalBtn = !_isRemoteResolutionFitLocal(); final showFitLocalBtn = !_isRemoteResolutionFitLocal();
@ -1101,6 +1102,20 @@ class _ResolutionsMenuState extends State<_ResolutionsMenu> {
); );
} }
Future<void> _getLocalResolutionWayland() async {
if (!isWayland) return _getLocalResolution();
final window = await window_size.getWindowInfo();
final screen = window.screen;
if (screen != null) {
setState(() {
_localResolution = Resolution(
screen.frame.width.toInt(),
screen.frame.height.toInt(),
);
});
}
}
_getLocalResolution() { _getLocalResolution() {
_localResolution = null; _localResolution = null;
final String currentDisplay = bind.mainGetCurrentDisplay(); final String currentDisplay = bind.mainGetCurrentDisplay();