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

Merge pull request #1639 from Kingtous/master

Browse Source 
opt: adapt global scroll on mobile & adjust desktop connection page scrollbar
This commit is contained in:
RustDesk 2022-09-28 21:28:19 +08:00 committed by GitHub
commit 77276dd78e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
flutter/lib/common/widgets/peer_card.dart
View File

@ -73,32 +73,47 @@ class _PeerCardState extends State<_PeerCard>
_menuPos = RelativeRect.fromLTRB(x, y, x, y); _menuPos = RelativeRect.fromLTRB(x, y, x, y);
_showPeerMenu(peer.id); _showPeerMenu(peer.id);
}, },
child: ListTile( child: Container(
contentPadding: const EdgeInsets.only(left: 12), // padding: EdgeInsets.only(left: 12, top: 8, bottom: 8),
subtitle: Text('${peer.username}@${peer.hostname}'), child: Row(
title: Row(children: [ children: [
getOnline(4, peer.online), Container(
Text(peer.alias.isEmpty ? formatID(peer.id) : peer.alias) width: 50,
]), height: 50,
leading: Container( decoration: BoxDecoration(
decoration: BoxDecoration( color: str2color('${peer.id}${peer.platform}', 0x7f),
color: str2color('${peer.id}${peer.platform}', 0x7f), borderRadius: BorderRadius.circular(4),
borderRadius: BorderRadius.circular(4), ),
padding: const EdgeInsets.all(6),
child: getPlatformImage(peer.platform)),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(children: [
getOnline(4, peer.online),
Text(peer.alias.isEmpty
? formatID(peer.id)
: peer.alias)
]),
Text('${peer.username}@${peer.hostname}')
],
).paddingOnly(left: 8.0),
), ),
padding: const EdgeInsets.all(6), InkWell(
child: getPlatformImage(peer.platform)), child: const Padding(
trailing: InkWell( padding: EdgeInsets.all(12),
child: const Padding( child: Icon(Icons.more_vert)),
padding: EdgeInsets.all(12), onTapDown: (e) {
child: Icon(Icons.more_vert)), final x = e.globalPosition.dx;
onTapDown: (e) { final y = e.globalPosition.dy;
final x = e.globalPosition.dx; _menuPos = RelativeRect.fromLTRB(x, y, x, y);
final y = e.globalPosition.dy; },
_menuPos = RelativeRect.fromLTRB(x, y, x, y); onTap: () {
}, _showPeerMenu(peer.id);
onTap: () { })
_showPeerMenu(peer.id); ],
}), ),
))); )));
} }

7
flutter/lib/desktop/pages/connection_page.dart
View File

@ -63,6 +63,7 @@ class _ConnectionPageState extends State<ConnectionPage>
scrollController: _scrollController, scrollController: _scrollController,
child: CustomScrollView( child: CustomScrollView(
controller: _scrollController, controller: _scrollController,
physics: NeverScrollableScrollPhysics(),
slivers: [ slivers: [
SliverList( SliverList(
delegate: SliverChildListDelegate([ delegate: SliverChildListDelegate([
@ -72,7 +73,7 @@ class _ConnectionPageState extends State<ConnectionPage>
], ],
).marginOnly(top: 22), ).marginOnly(top: 22),
SizedBox(height: 12), SizedBox(height: 12),
Divider(), Divider().paddingOnly(right: 12),
])), ])),
SliverFillRemaining( SliverFillRemaining(
hasScrollBody: false, hasScrollBody: false,
@ -97,10 +98,10 @@ class _ConnectionPageState extends State<ConnectionPage>
menuPadding: EdgeInsets.only(left: 12.0, right: 3.0), menuPadding: EdgeInsets.only(left: 12.0, right: 3.0),
), ),
], ],
), ).paddingOnly(right: 12.0),
) )
], ],
).marginSymmetric(horizontal: 12.0), ).paddingOnly(left: 12.0),
), ),
), ),
const Divider(), const Divider(),

21
flutter/lib/mobile/pages/connection_page.dart
View File

@ -66,15 +66,16 @@ class _ConnectionPageState extends State<ConnectionPage> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
Provider.of<FfiModel>(context); Provider.of<FfiModel>(context);
return Column( return CustomScrollView(
mainAxisAlignment: MainAxisAlignment.start, slivers: [
mainAxisSize: MainAxisSize.max, SliverList(
crossAxisAlignment: CrossAxisAlignment.center, delegate: SliverChildListDelegate([
children: <Widget>[
_buildUpdateUI(), _buildUpdateUI(),
_buildRemoteIDTextField(), _buildRemoteIDTextField(),
Expanded( ])),
child: PeerTabPage( SliverFillRemaining(
hasScrollBody: false,
child: PeerTabPage(
tabs: [ tabs: [
translate('Recent Sessions'), translate('Recent Sessions'),
translate('Favorites'), translate('Favorites'),
@ -87,8 +88,10 @@ class _ConnectionPageState extends State<ConnectionPage> {
DiscoveredPeersView(), DiscoveredPeersView(),
const AddressBook(), const AddressBook(),
], ],
)), ),
]).marginOnly(top: 2, left: 10, right: 10); )
],
).marginOnly(top: 2, left: 10, right: 10);
} }
/// Callback for the connect button. /// Callback for the connect button.