mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-25 13:19:04 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3660 from 21pages/fix

Browse Source 
menubar dark theme elevation
This commit is contained in:
RustDesk 2023-03-15 17:11:39 +08:00 committed by GitHub
commit 28ce635498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
flutter/lib/common.dart
View File

@ -112,18 +112,21 @@ class ColorThemeExtension extends ThemeExtension<ColorThemeExtension> {
required this.border2,
required this.highlight,
required this.drag_indicator,
required this.shadow,
});
final Color? border;
final Color? border2;
final Color? highlight;
final Color? drag_indicator;
final Color? shadow;
static final light = ColorThemeExtension(
border: Color(0xFFCCCCCC),
border2: Color(0xFFBBBBBB),
highlight: Color(0xFFE5E5E5),
drag_indicator: Colors.grey[800],
shadow: Colors.black,
);
static final dark = ColorThemeExtension(
@ -131,19 +134,24 @@ class ColorThemeExtension extends ThemeExtension<ColorThemeExtension> {
border2: Color(0xFFE5E5E5),
highlight: Color(0xFF3F3F3F),
drag_indicator: Colors.grey,
shadow: Colors.grey,
);
@override
ThemeExtension<ColorThemeExtension> copyWith(
{Color? border,
Color? border2,
Color? highlight,
Color? drag_indicator}) {
ThemeExtension<ColorThemeExtension> copyWith({
Color? border,
Color? border2,
Color? highlight,
Color? drag_indicator,
Color? shadow,
}) {
return ColorThemeExtension(
border: border ?? this.border,
border2: border2 ?? this.border2,
highlight: highlight ?? this.highlight,
drag_indicator: drag_indicator ?? this.drag_indicator);
border: border ?? this.border,
border2: border2 ?? this.border2,
highlight: highlight ?? this.highlight,
drag_indicator: drag_indicator ?? this.drag_indicator,
shadow: shadow ?? this.shadow,
);
}
@override
@ -157,6 +165,7 @@ class ColorThemeExtension extends ThemeExtension<ColorThemeExtension> {
border2: Color.lerp(border2, other.border2, t),
highlight: Color.lerp(highlight, other.highlight, t),
drag_indicator: Color.lerp(drag_indicator, other.drag_indicator, t),
shadow: Color.lerp(shadow, other.shadow, t),
);
}
}

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

@ -372,6 +372,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
offstage: _dragging.isTrue,
child: Material(
elevation: _MenubarTheme.elevation,
shadowColor: MyTheme.color(context).shadow,
child: _DraggableShowHide(
dragging: _dragging,
fractionX: _fractionX,
@ -412,6 +413,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
children: [
Material(
elevation: _MenubarTheme.elevation,
shadowColor: MyTheme.color(context).shadow,
borderRadius: BorderRadius.all(Radius.circular(4.0)),
color: Theme.of(context)
.menuBarTheme