lee/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2025-12-14 20:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into modern-menubar

Browse Source
This commit is contained in:
NicKoehler
2023-02-15 13:37:36 +01:00
parent 957bb65b9f 6e12e77f51
commit 84f97fbf1f
13 changed files with 393 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
flutter/lib/desktop/widgets/remote_menubar.dart
View File

@@ -447,13 +447,16 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
bottom: Radius.circular(10),
),
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(width: 2.5),
...menubarItems,
SizedBox(width: 2.5)
],
child: SingleChildScrollView(
scrollDirection: Axis.horizontal,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
SizedBox(width: 2.5),
...menubarItems,
SizedBox(width: 2.5)
],
),
),
),
_buildDraggableShowHide(context),
@@ -1513,13 +1516,16 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
if (bind.sessionIsKeyboardModeSupported(
id: widget.id, mode: mode.key)) {
if (mode.key == 'translate') {
if (!Platform.isWindows ||
widget.ffi.ffiModel.pi.platform != kPeerPlatformWindows) {
if (Platform.isLinux ||
widget.ffi.ffiModel.pi.platform == kPeerPlatformLinux) {
continue;
}
}
list.add(MenuEntryRadioOption(
text: translate(mode.menu), value: mode.key));
var text = translate(mode.menu);
if (mode.key == 'translate') {
text = '$text beta';
}
list.add(MenuEntryRadioOption(text: text, value: mode.key));
}
}
return list;