From 977ac2a3b2f99b76ddb942fb3a3d480ead57206c Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Fri, 23 Jun 2023 13:26:45 +0800
Subject: [PATCH] revert back to hasScrollBody=false, though true can remember
 scroll position, but it causes much more problems

---
 flutter/lib/common/widgets/peer_tab_page.dart  | 2 +-
 flutter/lib/desktop/pages/connection_page.dart | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/flutter/lib/common/widgets/peer_tab_page.dart b/flutter/lib/common/widgets/peer_tab_page.dart
index 29623c771..08f62ec82 100644
--- a/flutter/lib/common/widgets/peer_tab_page.dart
+++ b/flutter/lib/common/widgets/peer_tab_page.dart
@@ -388,7 +388,7 @@ class _PeerSortDropdownState extends State<PeerSortDropdown> {
     var menuPos = RelativeRect.fromLTRB(0, 0, 0, 0);
     return InkWell(
       child: Icon(
-        Icons.sort,
+        Icons.sort_rounded,
         size: 18,
       ),
       onTapDown: (details) {
diff --git a/flutter/lib/desktop/pages/connection_page.dart b/flutter/lib/desktop/pages/connection_page.dart
index 91d6b6032..742123888 100644
--- a/flutter/lib/desktop/pages/connection_page.dart
+++ b/flutter/lib/desktop/pages/connection_page.dart
@@ -134,7 +134,7 @@ class _ConnectionPageState extends State<ConnectionPage>
                   Divider().paddingOnly(right: 12),
                 ])),
                 SliverFillRemaining(
-                  hasScrollBody: true,
+                  hasScrollBody: false,
                   child: PeerTabPage().paddingOnly(right: 12.0),
                 )
               ],
@@ -245,8 +245,6 @@ class _ConnectionPageState extends State<ConnectionPage>
     final em = 14.0;
     return Container(
       height: 3 * em,
-      color: Theme.of(context)
-          .scaffoldBackgroundColor, // has to set this if using hasScrollBody in above silvers
       child: Obx(() => Row(
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [