Merge pull request #1582 from Kingtous/master

opt: more configurable scroll logic & edge size

flutter/lib/common.dart

@@ -248,6 +248,7 @@ List<Locale> supportedLocales = const [
   // specify CN/TW to fix CJK issue in flutter
   Locale('zh', 'CN'),
   Locale('zh', 'TW'),
+  Locale('zh', 'SG'),
   Locale('fr'),
   Locale('de'),
   Locale('it'),

flutter/lib/consts.dart

@@ -15,6 +15,11 @@ const int kMobileDefaultDisplayHeight = 1280;
 const int kDesktopDefaultDisplayWidth = 1080;
 const int kDesktopDefaultDisplayHeight = 720;
 
+/// [kDefaultScrollAmountMultiplier] indicates how many rows can be scrolled after a minimum scroll action of mouse
+const kDefaultScrollAmountMultiplier = 3.0;
+const kFullScreenEdgeSize = 1.0;
+const kWindowEdgeSize = 4.0;
+
 const kInvalidValueStr = "InvalidValueStr";
 
 /// flutter/packages/flutter/lib/src/services/keyboard_key.dart -> _keyLabels

flutter/lib/desktop/pages/desktop_tab_page.dart

@@ -60,7 +60,9 @@ class _DesktopTabPageState extends State<DesktopTabPage> {
     return Platform.isMacOS
         ? tabWidget
         : Obx(() => DragToResizeArea(
-            resizeEdgeSize: fullscreen.value ? 1.0 : 8.0, child: tabWidget));
+            resizeEdgeSize:
+                fullscreen.value ? kFullScreenEdgeSize : kWindowEdgeSize,
+            child: tabWidget));
   }
 
   void onAddSetting() {

flutter/lib/desktop/pages/file_manager_tab_page.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/pages/file_manager_page.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
@@ -81,6 +82,7 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
     return Platform.isMacOS
         ? tabWidget
         : SubWindowDragToResizeArea(
+            resizeEdgeSize: kWindowEdgeSize,
             windowId: windowId(),
             child: tabWidget,
           );

flutter/lib/desktop/pages/port_forward_tab_page.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:desktop_multi_window/desktop_multi_window.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/pages/port_forward_page.dart';
 import 'package:flutter_hbb/desktop/widgets/tabbar_widget.dart';
 import 'package:flutter_hbb/utils/multi_window_manager.dart';
@@ -92,6 +93,7 @@ class _PortForwardTabPageState extends State<PortForwardTabPage> {
     return Platform.isMacOS
         ? tabWidget
         : SubWindowDragToResizeArea(
+            resizeEdgeSize: kWindowEdgeSize,
             windowId: windowId(),
             child: tabWidget,
           );

flutter/lib/desktop/pages/remote_tab_page.dart

@@ -143,7 +143,8 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
     return Platform.isMacOS
         ? tabWidget
         : Obx(() => SubWindowDragToResizeArea(
-            resizeEdgeSize: fullscreen.value ? 1.0 : 8.0,
+            resizeEdgeSize:
+                fullscreen.value ? kFullScreenEdgeSize : kWindowEdgeSize,
             windowId: windowId(),
             child: tabWidget));
   }

flutter/lib/desktop/widgets/peer_widget.dart

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_hbb/desktop/widgets/scroll_wrapper.dart';
 import 'package:get/get.dart';
 import 'package:provider/provider.dart';
 import 'package:visibility_detector/visibility_detector.dart';
@@ -41,6 +42,7 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
   static const int _maxQueryCount = 3;
 
   final _curPeers = <String>{};
+  final _scrollController = ScrollController();
   var _lastChangeTime = DateTime.now();
   var _lastQueryPeers = <String>{};
   var _lastQueryTime = DateTime.now().subtract(const Duration(hours: 1));
@@ -84,53 +86,58 @@ class _PeerWidgetState extends State<_PeerWidget> with WindowListener {
             ? Center(
                 child: Text(translate("Empty")),
               )
-            : SingleChildScrollView(
-                controller: ScrollController(),
-                child: ObxValue<RxString>((searchText) {
-                  return FutureBuilder<List<Peer>>(
-                    builder: (context, snapshot) {
-                      if (snapshot.hasData) {
-                        final peers = snapshot.data!;
-                        final cards = <Widget>[];
-                        for (final peer in peers) {
-                          cards.add(Offstage(
-                              key: ValueKey("off${peer.id}"),
-                              offstage: widget.offstageFunc(peer),
-                              child: Obx(
-                                () => SizedBox(
-                                  width: 220,
-                                  height:
-                                      peerCardUiType.value == PeerUiType.grid
-                                          ? 140
-                                          : 42,
-                                  child: VisibilityDetector(
-                                    key: ValueKey(peer.id),
-                                    onVisibilityChanged: (info) {
-                                      final peerId =
-                                          (info.key as ValueKey).value;
-                                      if (info.visibleFraction > 0.00001) {
-                                        _curPeers.add(peerId);
-                                      } else {
-                                        _curPeers.remove(peerId);
-                                      }
-                                      _lastChangeTime = DateTime.now();
-                                    },
-                                    child: widget.peerCardWidgetFunc(peer),
+            : DesktopScrollWrapper(
+                scrollController: _scrollController,
+                child: SingleChildScrollView(
+                  controller: _scrollController,
+                  child: ObxValue<RxString>((searchText) {
+                    return FutureBuilder<List<Peer>>(
+                      builder: (context, snapshot) {
+                        if (snapshot.hasData) {
+                          final peers = snapshot.data!;
+                          final cards = <Widget>[];
+                          for (final peer in peers) {
+                            cards.add(Offstage(
+                                key: ValueKey("off${peer.id}"),
+                                offstage: widget.offstageFunc(peer),
+                                child: Obx(
+                                  () => SizedBox(
+                                    width: 220,
+                                    height:
+                                        peerCardUiType.value == PeerUiType.grid
+                                            ? 140
+                                            : 42,
+                                    child: VisibilityDetector(
+                                      key: ValueKey(peer.id),
+                                      onVisibilityChanged: (info) {
+                                        final peerId =
+                                            (info.key as ValueKey).value;
+                                        if (info.visibleFraction > 0.00001) {
+                                          _curPeers.add(peerId);
+                                        } else {
+                                          _curPeers.remove(peerId);
+                                        }
+                                        _lastChangeTime = DateTime.now();
+                                      },
+                                      child: widget.peerCardWidgetFunc(peer),
+                                    ),
                                   ),
-                                ),
-                              )));
+                                )));
+                          }
+                          return Wrap(
+                              spacing: space,
+                              runSpacing: space,
+                              children: cards);
+                        } else {
+                          return const Center(
+                            child: CircularProgressIndicator(),
+                          );
                         }
-                        return Wrap(
-                            spacing: space, runSpacing: space, children: cards);
-                      } else {
-                        return const Center(
-                          child: CircularProgressIndicator(),
-                        );
-                      }
-                    },
-                    future: matchPeers(searchText.value, peers.peers),
-                  );
-                }, peerSearchText),
+                      },
+                      future: matchPeers(searchText.value, peers.peers),
+                    );
+                  }, peerSearchText),
+                ),
               ),
       ),
     );

flutter/lib/desktop/widgets/scroll_wrapper.dart

+import 'package:flutter/widgets.dart';
+import 'package:flutter_hbb/consts.dart';
+import 'package:flutter_improved_scrolling/flutter_improved_scrolling.dart';
+
+class DesktopScrollWrapper extends StatelessWidget {
+  final ScrollController scrollController;
+  final Widget child;
+  const DesktopScrollWrapper(
+      {Key? key, required this.scrollController, required this.child})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return ImprovedScrolling(
+      scrollController: scrollController,
+      enableCustomMouseWheelScrolling: false,
+      customMouseWheelScrollConfig: const CustomMouseWheelScrollConfig(
+          scrollAmountMultiplier: kDefaultScrollAmountMultiplier),
+      child: child,
+    );
+  }
+}

flutter/pubspec.yaml

@@ -80,6 +80,7 @@ dependencies:
     desktop_drop: ^0.3.3
     scroll_pos: ^0.3.0
     rxdart: ^0.27.5
+    flutter_improved_scrolling: ^0.0.3
 
 dev_dependencies:
     icons_launcher: ^2.0.4