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

Merge pull request #5682 from dignow/fix/scrollbar_thickness

Browse Source 
fix, set scrollbar thickness to 12
This commit is contained in:
RustDesk 2023-09-13 21:37:39 +08:00 committed by GitHub
commit ab470d4a4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
flutter/lib/common.dart
View File

@ -265,6 +265,14 @@ class MyTheme {
? EdgeInsets.only(left: dialogPadding) ? EdgeInsets.only(left: dialogPadding)
: EdgeInsets.only(left: dialogPadding / 3); : EdgeInsets.only(left: dialogPadding / 3);
static ScrollbarThemeData scrollbarTheme = ScrollbarThemeData(
thickness: MaterialStateProperty.all(kScrollbarThickness),
);
static ScrollbarThemeData scrollbarThemeDark = scrollbarTheme.copyWith(
thumbColor: MaterialStateProperty.all(Colors.grey[500]),
);
static ThemeData lightTheme = ThemeData( static ThemeData lightTheme = ThemeData(
brightness: Brightness.light, brightness: Brightness.light,
hoverColor: Color.fromARGB(255, 224, 224, 224), hoverColor: Color.fromARGB(255, 224, 224, 224),
@ -280,6 +288,7 @@ class MyTheme {
), ),
), ),
), ),
scrollbarTheme: scrollbarTheme,
inputDecorationTheme: isDesktop inputDecorationTheme: isDesktop
? InputDecorationTheme( ? InputDecorationTheme(
fillColor: grayBg, fillColor: grayBg,
@ -364,6 +373,7 @@ class MyTheme {
), ),
), ),
), ),
scrollbarTheme: scrollbarThemeDark,
inputDecorationTheme: isDesktop inputDecorationTheme: isDesktop
? InputDecorationTheme( ? InputDecorationTheme(
fillColor: Color(0xFF24252B), fillColor: Color(0xFF24252B),
@ -390,9 +400,6 @@ class MyTheme {
tabBarTheme: const TabBarTheme( tabBarTheme: const TabBarTheme(
labelColor: Colors.white70, labelColor: Colors.white70,
), ),
scrollbarTheme: ScrollbarThemeData(
thumbColor: MaterialStateProperty.all(Colors.grey[500]),
),
tooltipTheme: tooltipTheme(), tooltipTheme: tooltipTheme(),
splashColor: isDesktop ? Colors.transparent : null, splashColor: isDesktop ? Colors.transparent : null,
highlightColor: isDesktop ? Colors.transparent : null, highlightColor: isDesktop ? Colors.transparent : null,

2
flutter/lib/consts.dart
View File

@ -13,6 +13,8 @@ const String kPeerPlatformLinux = "Linux";
const String kPeerPlatformMacOS = "Mac OS"; const String kPeerPlatformMacOS = "Mac OS";
const String kPeerPlatformAndroid = "Android"; const String kPeerPlatformAndroid = "Android";
const double kScrollbarThickness = 12.0;
/// [kAppTypeMain] used by 'Desktop Main Page' , 'Mobile (Client and Server)', "Install Page" /// [kAppTypeMain] used by 'Desktop Main Page' , 'Mobile (Client and Server)', "Install Page"
const String kAppTypeMain = "main"; const String kAppTypeMain = "main";

2
flutter/lib/desktop/pages/remote_page.dart
View File

@ -694,6 +694,7 @@ class _ImagePaintState extends State<ImagePaint> {
enableCustomMouseWheelScrolling: cursorOverImage.isFalse, enableCustomMouseWheelScrolling: cursorOverImage.isFalse,
customMouseWheelScrollConfig: scrollConfig, customMouseWheelScrollConfig: scrollConfig,
child: RawScrollbar( child: RawScrollbar(
thickness: kScrollbarThickness,
thumbColor: Colors.grey, thumbColor: Colors.grey,
controller: _horizontal, controller: _horizontal,
thumbVisibility: false, thumbVisibility: false,
@ -711,6 +712,7 @@ class _ImagePaintState extends State<ImagePaint> {
enableCustomMouseWheelScrolling: cursorOverImage.isFalse, enableCustomMouseWheelScrolling: cursorOverImage.isFalse,
customMouseWheelScrollConfig: scrollConfig, customMouseWheelScrollConfig: scrollConfig,
child: RawScrollbar( child: RawScrollbar(
thickness: kScrollbarThickness,
thumbColor: Colors.grey, thumbColor: Colors.grey,
controller: _vertical, controller: _vertical,
thumbVisibility: false, thumbVisibility: false,