diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart index c65993d99..8b0cb710c 100644 --- a/flutter/lib/common.dart +++ b/flutter/lib/common.dart @@ -252,6 +252,9 @@ class MyTheme { ), ), ), + menuBarTheme: MenuBarThemeData( + style: + MenuStyle(backgroundColor: MaterialStatePropertyAll(Colors.white))), colorScheme: ColorScheme.light( primary: Colors.blue, secondary: accent, background: grayBg), ).copyWith( @@ -352,6 +355,9 @@ class MyTheme { ), ), ), + menuBarTheme: MenuBarThemeData( + style: MenuStyle( + backgroundColor: MaterialStatePropertyAll(Color(0xFF121212)))), colorScheme: ColorScheme.dark( primary: Colors.blue, secondary: accent, diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart index 3e37cef40..0f63a2814 100644 --- a/flutter/lib/desktop/widgets/remote_menubar.dart +++ b/flutter/lib/desktop/widgets/remote_menubar.dart @@ -408,7 +408,12 @@ class _RemoteMenubarState extends State { children: [ Container( decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(10)), + borderRadius: BorderRadius.all(Radius.circular(4.0)), + color: Theme.of(context) + .menuBarTheme + .style + ?.backgroundColor + ?.resolve(MaterialState.values.toSet()), ), child: SingleChildScrollView( scrollDirection: Axis.horizontal, @@ -416,9 +421,9 @@ class _RemoteMenubarState extends State { data: themeData(), child: Row( children: [ - SizedBox(width: _MenubarTheme.buttonHMargin), + SizedBox(width: _MenubarTheme.buttonHMargin * 2), ...menubarItems, - SizedBox(width: _MenubarTheme.buttonHMargin) + SizedBox(width: _MenubarTheme.buttonHMargin * 2) ], ), ), @@ -441,7 +446,13 @@ class _RemoteMenubarState extends State { ), dividerTheme: DividerThemeData(space: 4), menuBarTheme: MenuBarThemeData( - style: MenuStyle(padding: MaterialStatePropertyAll(EdgeInsets.zero))), + style: MenuStyle( + padding: MaterialStatePropertyAll(EdgeInsets.zero), + elevation: MaterialStatePropertyAll(0), + shape: MaterialStatePropertyAll(BeveledRectangleBorder()), + ).copyWith( + backgroundColor: + Theme.of(context).menuBarTheme.style?.backgroundColor)), ); } } @@ -1863,6 +1874,7 @@ class _IconMenuButtonState extends State<_IconMenuButton> { height: _MenubarTheme.buttonSize, child: MenuItemButton( style: ButtonStyle( + backgroundColor: MaterialStatePropertyAll(Colors.transparent), padding: MaterialStatePropertyAll(EdgeInsets.zero), overlayColor: MaterialStatePropertyAll(Colors.transparent)), onHover: (value) => setState(() { @@ -1934,6 +1946,7 @@ class _IconSubmenuButtonState extends State<_IconSubmenuButton> { child: SubmenuButton( menuStyle: widget.menuStyle, style: ButtonStyle( + backgroundColor: MaterialStatePropertyAll(Colors.transparent), padding: MaterialStatePropertyAll(EdgeInsets.zero), overlayColor: MaterialStatePropertyAll(Colors.transparent)), onHover: (value) => setState(() {