weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3249 from fufesou/fix/monitor_count_sync

Browse Source 
fix sync displays info && select monitor menu
This commit is contained in:
RustDesk
2023-02-17 13:41:43 +08:00
committed by GitHub
parent 000799d181 302499d1e0
commit 0f414822bb
14 changed files with 234 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/lib/desktop/widgets/material_mod_popup_menu.dart
View File

@@ -1400,7 +1400,7 @@ class PopupMenuButtonState<T> extends State<PopupMenuButton<T>> {
}
return MenuButton(
icon: widget.icon ?? Icon(Icons.adaptive.more),
child: widget.icon ?? Icon(Icons.adaptive.more),
tooltip:
widget.tooltip ?? MaterialLocalizations.of(context).showMenuTooltip,
onPressed: widget.enabled ? showButtonMenu : null,

6
flutter/lib/desktop/widgets/menu_button.dart
View File

@@ -5,7 +5,7 @@ class MenuButton extends StatefulWidget {
final Color color;
final Color hoverColor;
final Color? splashColor;
final Widget icon;
final Widget child;
final String? tooltip;
final EdgeInsetsGeometry padding;
final bool enableFeedback;
@@ -14,7 +14,7 @@ class MenuButton extends StatefulWidget {
required this.onPressed,
required this.color,
required this.hoverColor,
required this.icon,
required this.child,
this.splashColor,
this.tooltip = "",
this.padding = const EdgeInsets.symmetric(horizontal: 3, vertical: 6),
@@ -51,7 +51,7 @@ class _MenuButtonState extends State<MenuButton> {
splashColor: widget.splashColor,
enableFeedback: widget.enableFeedback,
onTap: widget.onPressed,
child: widget.icon,
child: widget.child,
),
),
),

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

@@ -476,7 +476,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
onPressed: () {
widget.state.switchPin();
},
icon: SvgPicture.asset(
child: SvgPicture.asset(
pin ? "assets/pinned.svg" : "assets/unpinned.svg",
color: Colors.white,
),
@@ -492,7 +492,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
onPressed: () {
_setFullscreen(!isFullscreen);
},
icon: SvgPicture.asset(
child: SvgPicture.asset(
isFullscreen ? "assets/fullscreen_exit.svg" : "assets/fullscreen.svg",
color: Colors.white,
),
@@ -503,7 +503,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
Widget _buildMonitor(BuildContext context) {
final pi = widget.ffi.ffiModel.pi;
return mod_menu.PopupMenuButton(
final monitor = mod_menu.PopupMenuButton(
tooltip: translate('Select Monitor'),
position: mod_menu.PopupMenuPosition.under,
icon: Stack(
@@ -528,43 +528,44 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
itemBuilder: (BuildContext context) {
final List<Widget> rowChildren = [];
for (int i = 0; i < pi.displays.length; i++) {
rowChildren.add(
Stack(
alignment: Alignment.center,
children: [
SvgPicture.asset(
"assets/display.svg",
color: Colors.white,
),
TextButton(
child: Container(
alignment: AlignmentDirectional.center,
constraints:
const BoxConstraints(minHeight: _MenubarTheme.height),
child: Padding(
padding: const EdgeInsets.only(bottom: 2.5),
child: Text(
(i + 1).toString(),
style: TextStyle(
color: Colors.white,
),
rowChildren.add(MenuButton(
color: _MenubarTheme.blueColor,
hoverColor: _MenubarTheme.hoverBlueColor,
child: Container(
alignment: AlignmentDirectional.center,
constraints:
const BoxConstraints(minHeight: _MenubarTheme.height),
child: Stack(
alignment: Alignment.center,
children: [
SvgPicture.asset(
"assets/display.svg",
color: Colors.white,
),
Padding(
padding: const EdgeInsets.only(bottom: 2.5),
child: Text(
(i + 1).toString(),
style: TextStyle(
color: Colors.white,
fontSize: 12,
),
),
),
onPressed: () {
if (Navigator.canPop(context)) {
Navigator.pop(context);
_menuDismissCallback();
}
RxInt display = CurrentDisplayState.find(widget.id);
if (display.value != i) {
bind.sessionSwitchDisplay(id: widget.id, value: i);
}
},
)
],
)
],
),
),
);
onPressed: () {
if (Navigator.canPop(context)) {
Navigator.pop(context);
_menuDismissCallback();
}
RxInt display = CurrentDisplayState.find(widget.id);
if (display.value != i) {
bind.sessionSwitchDisplay(id: widget.id, value: i);
}
},
));
}
return <mod_menu.PopupMenuEntry<String>>[
mod_menu.PopupMenuItem<String>(
@@ -580,6 +581,11 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
];
},
);
return Obx(() => Offstage(
offstage: stateGlobal.displaysCount.value < 2,
child: monitor,
));
}
Widget _buildControl(BuildContext context) {
@@ -678,7 +684,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
? translate('Stop session recording')
: translate('Start session recording'),
onPressed: () => value.toggle(),
icon: SvgPicture.asset(
child: SvgPicture.asset(
"assets/rec.svg",
color: Colors.white,
),
@@ -701,7 +707,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
onPressed: () {
clientClose(widget.id, widget.ffi.dialogManager);
},
icon: SvgPicture.asset(
child: SvgPicture.asset(
"assets/close.svg",
color: Colors.white,
),
@@ -771,7 +777,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
return tooltipText == null
? const Offstage()
: MenuButton(
icon: _getVoiceCallIcon(),
child: _getVoiceCallIcon(),
tooltip: translate(tooltipText),
onPressed: () => bind.sessionCloseVoiceCall(id: widget.id),
color: _MenubarTheme.redColor,