From a5fe4ee3e632a1471604229c912ab87d9b24bcf2 Mon Sep 17 00:00:00 2001 From: 21pages Date: Sun, 12 Mar 2023 10:48:54 +0800 Subject: [PATCH 1/2] add elevation for remote menubar/draggable Signed-off-by: 21pages --- .../lib/desktop/widgets/remote_menubar.dart | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart index c444214c6..fb4439905 100644 --- a/flutter/lib/desktop/widgets/remote_menubar.dart +++ b/flutter/lib/desktop/widgets/remote_menubar.dart @@ -108,6 +108,7 @@ class _MenubarTheme { static const double buttonHMargin = 3; static const double buttonVMargin = 6; static const double iconRadius = 8; + static const double elevation = 3; } typedef DismissFunc = void Function(); @@ -369,10 +370,13 @@ class _RemoteMenubarState extends State { alignment: FractionalOffset(_fractionX.value, 0), child: Offstage( offstage: _dragging.isTrue, - child: _DraggableShowHide( - dragging: _dragging, - fractionX: _fractionX, - show: show, + child: Material( + elevation: _MenubarTheme.elevation, + child: _DraggableShowHide( + dragging: _dragging, + fractionX: _fractionX, + show: show, + ), ), ), ); @@ -406,15 +410,14 @@ class _RemoteMenubarState extends State { return Column( mainAxisSize: MainAxisSize.min, children: [ - Container( - decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(4.0)), - color: Theme.of(context) - .menuBarTheme - .style - ?.backgroundColor - ?.resolve(MaterialState.values.toSet()), - ), + Material( + elevation: _MenubarTheme.elevation, + borderRadius: BorderRadius.all(Radius.circular(4.0)), + color: Theme.of(context) + .menuBarTheme + .style + ?.backgroundColor + ?.resolve(MaterialState.values.toSet()), child: SingleChildScrollView( scrollDirection: Axis.horizontal, child: Theme( From 118bd9523a8d6275ce056277620d3b8ed309861c Mon Sep 17 00:00:00 2001 From: 21pages Date: Mon, 13 Mar 2023 08:17:16 +0800 Subject: [PATCH 2/2] Increase contrast of quality monitor Signed-off-by: 21pages --- flutter/lib/common/widgets/overlay.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flutter/lib/common/widgets/overlay.dart b/flutter/lib/common/widgets/overlay.dart index ba7b8a059..c67f0f7fb 100644 --- a/flutter/lib/common/widgets/overlay.dart +++ b/flutter/lib/common/widgets/overlay.dart @@ -331,7 +331,7 @@ class QualityMonitor extends StatelessWidget { Expanded( flex: 8, child: AutoSizeText(info, - style: TextStyle(color: MyTheme.darkGray), + style: TextStyle(color: Color.fromARGB(255, 210, 210, 210)), textAlign: TextAlign.right, maxLines: 1)), Spacer(flex: 1), @@ -353,7 +353,7 @@ class QualityMonitor extends StatelessWidget { ? Container( constraints: BoxConstraints(maxWidth: 200), padding: const EdgeInsets.all(8), - color: MyTheme.canvasColor.withAlpha(120), + color: MyTheme.canvasColor.withAlpha(150), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [