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

make draggable color same with menubar color

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-03-11 19:53:19 +08:00
parent fc8e3df7dc
commit 45ab0e5a62
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flutter/lib/common.dart
View File

@ -111,32 +111,39 @@ class ColorThemeExtension extends ThemeExtension<ColorThemeExtension> {
required this.border, required this.border,
required this.border2, required this.border2,
required this.highlight, required this.highlight,
required this.drag_indicator,
}); });
final Color? border; final Color? border;
final Color? border2; final Color? border2;
final Color? highlight; final Color? highlight;
final Color? drag_indicator;
static const light = ColorThemeExtension( static final light = ColorThemeExtension(
border: Color(0xFFCCCCCC), border: Color(0xFFCCCCCC),
border2: Color(0xFFBBBBBB), border2: Color(0xFFBBBBBB),
highlight: Color(0xFFE5E5E5), highlight: Color(0xFFE5E5E5),
drag_indicator: Colors.grey[800],
); );
static const dark = ColorThemeExtension( static final dark = ColorThemeExtension(
border: Color(0xFF555555), border: Color(0xFF555555),
border2: Color(0xFFE5E5E5), border2: Color(0xFFE5E5E5),
highlight: Color(0xFF3F3F3F), highlight: Color(0xFF3F3F3F),
drag_indicator: Colors.grey,
); );
@override @override
ThemeExtension<ColorThemeExtension> copyWith( ThemeExtension<ColorThemeExtension> copyWith(
{Color? border, Color? border2, Color? highlight}) { {Color? border,
Color? border2,
Color? highlight,
Color? drag_indicator}) {
return ColorThemeExtension( return ColorThemeExtension(
border: border ?? this.border, border: border ?? this.border,
border2: border2 ?? this.border2, border2: border2 ?? this.border2,
highlight: highlight ?? this.highlight, highlight: highlight ?? this.highlight,
); drag_indicator: drag_indicator ?? this.drag_indicator);
} }
@override @override
@ -149,6 +156,7 @@ class ColorThemeExtension extends ThemeExtension<ColorThemeExtension> {
border: Color.lerp(border, other.border, t), border: Color.lerp(border, other.border, t),
border2: Color.lerp(border2, other.border2, t), border2: Color.lerp(border2, other.border2, t),
highlight: Color.lerp(highlight, other.highlight, t), highlight: Color.lerp(highlight, other.highlight, t),
drag_indicator: Color.lerp(drag_indicator, other.drag_indicator, t),
); );
} }
} }

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

@ -2107,7 +2107,7 @@ class _DraggableShowHideState extends State<_DraggableShowHide> {
child: Icon( child: Icon(
Icons.drag_indicator, Icons.drag_indicator,
size: 20, size: 20,
color: Colors.grey[800], color: MyTheme.color(context).drag_indicator,
), ),
feedback: widget, feedback: widget,
onDragStarted: (() { onDragStarted: (() {
@ -2159,7 +2159,11 @@ class _DraggableShowHideState extends State<_DraggableShowHide> {
data: TextButtonThemeData(style: buttonStyle), data: TextButtonThemeData(style: buttonStyle),
child: Container( child: Container(
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Theme.of(context)
.menuBarTheme
.style
?.backgroundColor
?.resolve(MaterialState.values.toSet()),
borderRadius: BorderRadius.vertical( borderRadius: BorderRadius.vertical(
bottom: Radius.circular(5), bottom: Radius.circular(5),
), ),