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

Merge branch 'rustdesk:master' into master

Browse Source
This commit is contained in:
Sahil Yeole 2023-08-10 20:07:51 +05:30 committed by GitHub
commit 86fa3928a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flutter/lib/common/widgets/peer_tab_page.dart
View File

@ -262,6 +262,7 @@ class _PeerTabPageState extends State<PeerTabPage>
Widget _createMultiSelection() { Widget _createMultiSelection() {
final textColor = Theme.of(context).textTheme.titleLarge?.color; final textColor = Theme.of(context).textTheme.titleLarge?.color;
final model = Provider.of<PeerTabModel>(context); final model = Provider.of<PeerTabModel>(context);
if (model.currentTabCachedPeers.isEmpty) return Offstage();
return Container( return Container(
padding: EdgeInsets.all(4.0), padding: EdgeInsets.all(4.0),
child: InkWell( child: InkWell(

51
flutter/lib/common/widgets/peers_view.dart
View File

@ -124,31 +124,34 @@ class _PeersViewState extends State<_PeersView> with WindowListener {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return ChangeNotifierProvider<Peers>( return ChangeNotifierProvider<Peers>(
create: (context) => widget.peers, create: (context) => widget.peers,
child: Consumer<Peers>( child: Consumer<Peers>(builder: (context, peers, child) {
builder: (context, peers, child) => peers.peers.isEmpty if (peers.peers.isEmpty) {
? Center( gFFI.peerTabModel.setCurrentTabCachedPeers([]);
child: Column( return Center(
mainAxisAlignment: MainAxisAlignment.center, child: Column(
children: [ mainAxisAlignment: MainAxisAlignment.center,
Icon( children: [
Icons.sentiment_very_dissatisfied_rounded, Icon(
color: Theme.of(context).tabBarTheme.labelColor, Icons.sentiment_very_dissatisfied_rounded,
size: 40, color: Theme.of(context).tabBarTheme.labelColor,
).paddingOnly(bottom: 10), size: 40,
Text( ).paddingOnly(bottom: 10),
translate( Text(
_emptyMessages[widget.peers.loadEvent] ?? 'Empty', translate(
), _emptyMessages[widget.peers.loadEvent] ?? 'Empty',
textAlign: TextAlign.center, ),
style: TextStyle( textAlign: TextAlign.center,
color: Theme.of(context).tabBarTheme.labelColor, style: TextStyle(
), color: Theme.of(context).tabBarTheme.labelColor,
), ),
],
), ),
) ],
: _buildPeersView(peers), ),
), );
} else {
return _buildPeersView(peers);
}
}),
); );
} }

1
flutter/lib/models/model.dart
View File

@ -425,6 +425,7 @@ class FfiModel with ChangeNotifier {
closeConnection(); closeConnection();
} }
if (_waitForFirstImage[sessionId] == false) return;
dialogManager.show( dialogManager.show(
(setState, close, context) => CustomAlertDialog( (setState, close, context) => CustomAlertDialog(
title: null, title: null,