Merge pull request #5762 from 21pages/scroll

tags and users add scrollbar
This commit is contained in:
RustDesk 2023-09-21 12:03:16 +08:00 committed by GitHub
commit a1c910e3aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 16 deletions

View File

@ -1,3 +1,4 @@
import 'package:dynamic_layouts/dynamic_layouts.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hbb/common/formatter/id_formatter.dart';
import 'package:flutter_hbb/common/widgets/peer_card.dart';
@ -156,9 +157,13 @@ class _AddressBookState extends State<AddressBook> {
} else {
tags = gFFI.abModel.tags;
}
return Wrap(
children: tags
.map((e) => AddressBookTag(
return DynamicGridView.builder(
gridDelegate: SliverGridDelegateWithWrapping(
mainAxisSpacing: 0, crossAxisSpacing: 0),
itemCount: tags.length,
itemBuilder: (BuildContext context, int index) {
final e = tags[index];
return AddressBookTag(
name: e,
tags: gFFI.abModel.selectedTags,
onTap: () {
@ -167,9 +172,8 @@ class _AddressBookState extends State<AddressBook> {
} else {
gFFI.abModel.selectedTags.add(e);
}
}))
.toList(),
);
});
});
});
}

View File

@ -148,16 +148,15 @@ class _MyGroupState extends State<MyGroup> {
Widget _buildUserContacts() {
return Obx(() {
return Column(
children: gFFI.groupModel.users
.where((p0) {
if (searchUserText.isNotEmpty) {
return p0.name.contains(searchUserText.value);
}
return true;
})
.map((e) => _buildUserItem(e))
.toList());
final items = gFFI.groupModel.users.where((p0) {
if (searchUserText.isNotEmpty) {
return p0.name.contains(searchUserText.value);
}
return true;
}).toList();
return ListView.builder(
itemCount: items.length,
itemBuilder: (context, index) => _buildUserItem(items[index]));
});
}