mirrors/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-05-11 02:16:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Revert "fix: linux, window, workaround, mint, mate (#10146)" (#10184)

Browse source 
This reverts commit bd0a33e467.
This commit is contained in:
RustDesk 2024-12-05 11:44:37 +09:00 • committed by GitHub
parent f13ef48cec
commit fe4094777f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 17 additions and 161 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flutter/lib/common.dart
View file

@ -1,7 +1,6 @@
import 'dart:async';
import 'dart:convert';
import 'dart:math';
import 'dart:io';
import 'package:back_button_interceptor/back_button_interceptor.dart';
import 'package:desktop_multi_window/desktop_multi_window.dart';
@ -3460,35 +3459,6 @@ Widget buildPresetPasswordWarning() {
);
}
bool get isLinuxMateDesktop =>
isLinux &&
(Platform.environment['XDG_CURRENT_DESKTOP']?.toLowerCase() == 'mate' ||
Platform.environment['XDG_SESSION_DESKTOP']?.toLowerCase() == 'mate' ||
Platform.environment['DESKTOP_SESSION']?.toLowerCase() == 'mate');
Map<String, dynamic>? _linuxOsDistro;
String getLinuxOsDistroId() {
if (_linuxOsDistro == null) {
String osInfo = bind.getOsDistroInfo();
if (osInfo.isEmpty) {
_linuxOsDistro = {};
} else {
try {
_linuxOsDistro = jsonDecode(osInfo);
} catch (e) {
debugPrint('Failed to parse os info: $e');
// Don't call `bind.getOsDistroInfo()` again if failed to parse osInfo.
_linuxOsDistro = {};
}
}
}
return (_linuxOsDistro?['id'] ?? '') as String;
}
bool get isLinuxMint =>
getLinuxOsDistroId().toLowerCase().contains('linuxmint');
// https://github.com/leanflutter/window_manager/blob/87dd7a50b4cb47a375b9fc697f05e56eea0a2ab3/lib/src/widgets/virtual_window_frame.dart#L44
Widget buildVirtualWindowFrame(BuildContext context, Widget child) {
boxShadow() => isMainDesktopWindow

11
flutter/lib/main.dart
View file

@ -485,16 +485,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
child = keyListenerBuilder(context, child);
}
if (isLinux) {
// `(!(isLinuxMateDesktop || isLinuxMint))` is not used here for clarity.
// `isLinuxMint` will call ffi function.
if (!isLinuxMateDesktop) {
if (!isLinuxMint) {
debugPrint(
'Linux distro is not linuxmint, and desktop is not mate, '
'so we build virtual window frame.');
child = buildVirtualWindowFrame(context, child);
}
}
child = buildVirtualWindowFrame(context, child);
}
return child;
},

4
flutter/lib/web/bridge.dart
View file

@ -1848,9 +1848,5 @@ class RustdeskImpl {
throw UnimplementedError("sessionGetConnToken");
}
String getOsDistroInfo({dynamic hint}) {
return '';
}
void dispose() {}
}