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

refact, remote toolbar menu, windows

Browse Source 
Signed-off-by: dignow <linlong1265@gmail.com>
This commit is contained in:
dignow 2023-07-09 12:48:28 +08:00
parent e21502e6a5
commit 3148ab214a
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,6 +120,10 @@ class _ToolbarTheme {
static const Color dividerDark = MyTheme.dividerDark; static const Color dividerDark = MyTheme.dividerDark;
static const Color dividerLight = MyTheme.dividerLight; static const Color dividerLight = MyTheme.dividerLight;
static const double dividerSpaceToAction = 8; static const double dividerSpaceToAction = 8;
static const double menuBorderRadius = 5.0;
static EdgeInsets menuPadding = Platform.isWindows ? EdgeInsets.fromLTRB(4, 12, 4, 12) : EdgeInsets.fromLTRB(6, 18, 6, 18);
static const double menuButtonBorderRadius = 3.0;
} }
typedef DismissFunc = void Function(); typedef DismissFunc = void Function();
@ -484,6 +488,8 @@ class _RemoteToolbarState extends State<RemoteToolbar> {
textStyle: MaterialStatePropertyAll( textStyle: MaterialStatePropertyAll(
TextStyle(fontWeight: FontWeight.normal), TextStyle(fontWeight: FontWeight.normal),
), ),
shape: MaterialStatePropertyAll(RoundedRectangleBorder(
borderRadius: BorderRadius.circular(_ToolbarTheme.menuButtonBorderRadius))),
), ),
), ),
dividerTheme: DividerThemeData( dividerTheme: DividerThemeData(
@ -1651,14 +1657,15 @@ class _IconSubmenuButtonState extends State<_IconSubmenuButton> {
child: SubmenuButton( child: SubmenuButton(
menuStyle: widget.menuStyle ?? menuStyle: widget.menuStyle ??
MenuStyle( MenuStyle(
side: MaterialStateProperty.all(BorderSide( side: MaterialStateProperty.all(BorderSide(
width: 1, width: 1,
color: MyTheme.currentThemeMode() == ThemeMode.light color: MyTheme.currentThemeMode() == ThemeMode.light
? _ToolbarTheme.bordLight ? _ToolbarTheme.bordLight
: _ToolbarTheme.bordDark, : _ToolbarTheme.bordDark,
)), )),
visualDensity: VisualDensity.comfortable, shape: MaterialStatePropertyAll(RoundedRectangleBorder(
), borderRadius: BorderRadius.circular(_ToolbarTheme.menuBorderRadius))),
padding: MaterialStateProperty.all(_ToolbarTheme.menuPadding)),
style: ButtonStyle( style: ButtonStyle(
backgroundColor: MaterialStatePropertyAll(Colors.transparent), backgroundColor: MaterialStatePropertyAll(Colors.transparent),
padding: MaterialStatePropertyAll(EdgeInsets.zero), padding: MaterialStatePropertyAll(EdgeInsets.zero),