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

adjust tab colors to fix issue #2957

Browse Source
This commit is contained in:
rustdesk 2023-01-29 23:30:49 +08:00
parent f6f49519f7
commit 92748f7ef4
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
flutter/lib/desktop/widgets/tabbar_widget.dart
View File

@ -765,7 +765,7 @@ class _ListView extends StatelessWidget {
tabBuilder: tabBuilder, tabBuilder: tabBuilder,
tabMenuBuilder: tabMenuBuilder, tabMenuBuilder: tabMenuBuilder,
maxLabelWidth: maxLabelWidth, maxLabelWidth: maxLabelWidth,
selectedTabBackgroundColor: selectedTabBackgroundColor, selectedTabBackgroundColor: selectedTabBackgroundColor ?? MyTheme.tabbar(context).selectedTabBackgroundColor,
unSelectedTabBackgroundColor: unSelectedTabBackgroundColor, unSelectedTabBackgroundColor: unSelectedTabBackgroundColor,
); );
}).toList())); }).toList()));
@ -910,7 +910,7 @@ class _TabState extends State<_Tab> with RestorationMixin {
tabSelected: isSelected, tabSelected: isSelected,
onClose: () => widget.onClose(), onClose: () => widget.onClose(),
))) )))
])).paddingSymmetric(horizontal: 10), ])).paddingOnly(left: 10, right: 5),
Offstage( Offstage(
offstage: !showDivider, offstage: !showDivider,
child: VerticalDivider( child: VerticalDivider(
@ -956,6 +956,7 @@ class _CloseButton extends StatelessWidget {
child: Offstage( child: Offstage(
offstage: !visible, offstage: !visible,
child: InkWell( child: InkWell(
hoverColor: MyTheme.tabbar(context).closeHoverColor,
customBorder: const RoundedRectangleBorder(), customBorder: const RoundedRectangleBorder(),
onTap: () => onClose(), onTap: () => onClose(),
child: Icon( child: Icon(
@ -966,7 +967,7 @@ class _CloseButton extends StatelessWidget {
: MyTheme.tabbar(context).unSelectedIconColor, : MyTheme.tabbar(context).unSelectedIconColor,
), ),
), ),
)).paddingOnly(left: 5); )).paddingOnly(left: 10);
} }
} }
@ -1055,6 +1056,8 @@ class TabbarTheme extends ThemeExtension<TabbarTheme> {
final Color? unSelectedIconColor; final Color? unSelectedIconColor;
final Color? dividerColor; final Color? dividerColor;
final Color? hoverColor; final Color? hoverColor;
final Color? closeHoverColor;
final Color? selectedTabBackgroundColor;
const TabbarTheme( const TabbarTheme(
{required this.selectedTabIconColor, {required this.selectedTabIconColor,
@ -1064,27 +1067,33 @@ class TabbarTheme extends ThemeExtension<TabbarTheme> {
required this.selectedIconColor, required this.selectedIconColor,
required this.unSelectedIconColor, required this.unSelectedIconColor,
required this.dividerColor, required this.dividerColor,
required this.hoverColor}); required this.hoverColor,
required this.closeHoverColor,
required this.selectedTabBackgroundColor});
static const light = TabbarTheme( static const light = TabbarTheme(
selectedTabIconColor: MyTheme.accent, selectedTabIconColor: MyTheme.accent,
unSelectedTabIconColor: Color.fromARGB(255, 162, 203, 241), unSelectedTabIconColor: Color.fromARGB(255, 162, 203, 241),
selectedTextColor: Color.fromARGB(255, 26, 26, 26), selectedTextColor: Colors.black,
unSelectedTextColor: Color.fromARGB(255, 96, 96, 96), unSelectedTextColor: Color.fromARGB(255, 112, 112, 112),
selectedIconColor: Color.fromARGB(255, 26, 26, 26), selectedIconColor: Color.fromARGB(255, 26, 26, 26),
unSelectedIconColor: Color.fromARGB(255, 96, 96, 96), unSelectedIconColor: Color.fromARGB(255, 96, 96, 96),
dividerColor: Color.fromARGB(255, 238, 238, 238), dividerColor: Color.fromARGB(255, 238, 238, 238),
hoverColor: Color.fromARGB(51, 158, 158, 158)); hoverColor: Color.fromARGB(51, 158, 158, 158),
closeHoverColor: Colors.black,
selectedTabBackgroundColor: Color.fromARGB(255, 240, 240, 240));
static const dark = TabbarTheme( static const dark = TabbarTheme(
selectedTabIconColor: MyTheme.accent, selectedTabIconColor: MyTheme.accent,
unSelectedTabIconColor: Color.fromARGB(255, 30, 65, 98), unSelectedTabIconColor: Color.fromARGB(255, 30, 65, 98),
selectedTextColor: Color.fromARGB(255, 255, 255, 255), selectedTextColor: Color.fromARGB(255, 255, 255, 255),
unSelectedTextColor: Color.fromARGB(255, 207, 207, 207), unSelectedTextColor: Color.fromARGB(255, 192, 192, 192),
selectedIconColor: Color.fromARGB(255, 215, 215, 215), selectedIconColor: Color.fromARGB(255, 192, 192, 192),
unSelectedIconColor: Color.fromARGB(255, 255, 255, 255), unSelectedIconColor: Color.fromARGB(255, 255, 255, 255),
dividerColor: Color.fromARGB(255, 64, 64, 64), dividerColor: Color.fromARGB(255, 64, 64, 64),
hoverColor: Colors.black26); hoverColor: Colors.black26,
closeHoverColor: Colors.black,
selectedTabBackgroundColor: Colors.black26);
@override @override
ThemeExtension<TabbarTheme> copyWith({ ThemeExtension<TabbarTheme> copyWith({
@ -1096,6 +1105,8 @@ class TabbarTheme extends ThemeExtension<TabbarTheme> {
Color? unSelectedIconColor, Color? unSelectedIconColor,
Color? dividerColor, Color? dividerColor,
Color? hoverColor, Color? hoverColor,
Color? closeHoverColor,
Color? selectedTabBackgroundColor,
}) { }) {
return TabbarTheme( return TabbarTheme(
selectedTabIconColor: selectedTabIconColor ?? this.selectedTabIconColor, selectedTabIconColor: selectedTabIconColor ?? this.selectedTabIconColor,
@ -1107,6 +1118,8 @@ class TabbarTheme extends ThemeExtension<TabbarTheme> {
unSelectedIconColor: unSelectedIconColor ?? this.unSelectedIconColor, unSelectedIconColor: unSelectedIconColor ?? this.unSelectedIconColor,
dividerColor: dividerColor ?? this.dividerColor, dividerColor: dividerColor ?? this.dividerColor,
hoverColor: hoverColor ?? this.hoverColor, hoverColor: hoverColor ?? this.hoverColor,
closeHoverColor: closeHoverColor ?? this.closeHoverColor,
selectedTabBackgroundColor: selectedTabBackgroundColor ?? this.selectedTabBackgroundColor,
); );
} }
@ -1131,6 +1144,8 @@ class TabbarTheme extends ThemeExtension<TabbarTheme> {
Color.lerp(unSelectedIconColor, other.unSelectedIconColor, t), Color.lerp(unSelectedIconColor, other.unSelectedIconColor, t),
dividerColor: Color.lerp(dividerColor, other.dividerColor, t), dividerColor: Color.lerp(dividerColor, other.dividerColor, t),
hoverColor: Color.lerp(hoverColor, other.hoverColor, t), hoverColor: Color.lerp(hoverColor, other.hoverColor, t),
closeHoverColor: Color.lerp(closeHoverColor, other.closeHoverColor, t),
selectedTabBackgroundColor: Color.lerp(selectedTabBackgroundColor, other.selectedTabBackgroundColor, t),
); );
} }