hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

separate menubars open only when clicked

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-03-10 13:54:23 +08:00
parent cdea6daf89
commit bb201a47cb
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,7 +414,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
child: Theme( child: Theme(
data: themeData(), data: themeData(),
child: MenuBar( child: Row(
children: [ children: [
SizedBox(width: _MenubarTheme.buttonHMargin), SizedBox(width: _MenubarTheme.buttonHMargin),
...menubarItems, ...menubarItems,
@ -440,6 +440,8 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
), ),
), ),
dividerTheme: DividerThemeData(space: 4), dividerTheme: DividerThemeData(space: 4),
menuBarTheme: MenuBarThemeData(
style: MenuStyle(padding: MaterialStatePropertyAll(EdgeInsets.zero))),
); );
} }
} }
@ -552,6 +554,7 @@ class _MonitorMenu extends StatelessWidget {
final pi = ffi.ffiModel.pi; final pi = ffi.ffiModel.pi;
for (int i = 0; i < pi.displays.length; i++) { for (int i = 0; i < pi.displays.length; i++) {
rowChildren.add(_IconMenuButton( rowChildren.add(_IconMenuButton(
topLevel: false,
color: _MenubarTheme.blueColor, color: _MenubarTheme.blueColor,
hoverColor: _MenubarTheme.hoverBlueColor, hoverColor: _MenubarTheme.hoverBlueColor,
tooltip: "", tooltip: "",
@ -1819,6 +1822,7 @@ class _IconMenuButton extends StatefulWidget {
final VoidCallback? onPressed; final VoidCallback? onPressed;
final double? hMargin; final double? hMargin;
final double? vMargin; final double? vMargin;
final bool topLevel;
const _IconMenuButton({ const _IconMenuButton({
Key? key, Key? key,
this.assetName, this.assetName,
@ -1829,6 +1833,7 @@ class _IconMenuButton extends StatefulWidget {
required this.onPressed, required this.onPressed,
this.hMargin, this.hMargin,
this.vMargin, this.vMargin,
this.topLevel = true,
}) : super(key: key); }) : super(key: key);
@override @override
@ -1848,7 +1853,7 @@ class _IconMenuButtonState extends State<_IconMenuButton> {
width: _MenubarTheme.buttonSize, width: _MenubarTheme.buttonSize,
height: _MenubarTheme.buttonSize, height: _MenubarTheme.buttonSize,
); );
return SizedBox( final button = SizedBox(
width: _MenubarTheme.buttonSize, width: _MenubarTheme.buttonSize,
height: _MenubarTheme.buttonSize, height: _MenubarTheme.buttonSize,
child: MenuItemButton( child: MenuItemButton(
@ -1874,6 +1879,11 @@ class _IconMenuButtonState extends State<_IconMenuButton> {
).marginSymmetric( ).marginSymmetric(
horizontal: widget.hMargin ?? _MenubarTheme.buttonHMargin, horizontal: widget.hMargin ?? _MenubarTheme.buttonHMargin,
vertical: widget.vMargin ?? _MenubarTheme.buttonVMargin); vertical: widget.vMargin ?? _MenubarTheme.buttonVMargin);
if (widget.topLevel) {
return MenuBar(children: [button]);
} else {
return button;
}
} }
} }
@ -1914,7 +1924,7 @@ class _IconSubmenuButtonState extends State<_IconSubmenuButton> {
width: _MenubarTheme.buttonSize, width: _MenubarTheme.buttonSize,
height: _MenubarTheme.buttonSize, height: _MenubarTheme.buttonSize,
); );
return SizedBox( final button = SizedBox(
width: _MenubarTheme.buttonSize, width: _MenubarTheme.buttonSize,
height: _MenubarTheme.buttonSize, height: _MenubarTheme.buttonSize,
child: SubmenuButton( child: SubmenuButton(
@ -1940,6 +1950,7 @@ class _IconSubmenuButtonState extends State<_IconSubmenuButton> {
.marginSymmetric( .marginSymmetric(
horizontal: _MenubarTheme.buttonHMargin, horizontal: _MenubarTheme.buttonHMargin,
vertical: _MenubarTheme.buttonVMargin); vertical: _MenubarTheme.buttonVMargin);
return MenuBar(children: [button]);
} }
} }