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

hide empty waiting layer after images are reached

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-08-23 23:57:09 +08:00
parent dade589075
commit f2d96b895f
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
flutter/lib/desktop/pages/remote_page.dart
View File

@ -234,6 +234,8 @@ class _RemotePageState extends State<RemotePage>
bind.sessionInputOsPassword(sessionId: sessionId, value: '');
},
child: BlockableOverlay(
/// the Overlay key will be set with _blockableOverlayState in BlockableOverlay
/// see override build() in [BlockableOverlay]
state: _blockableOverlayState,
underlying: Container(
color: Colors.transparent,
@ -244,9 +246,6 @@ class _RemotePageState extends State<RemotePage>
Widget buildBody(BuildContext context) {
return Scaffold(
backgroundColor: Theme.of(context).colorScheme.background,
/// the Overlay key will be set with _blockableOverlayState in BlockableOverlay
/// see override build() in [BlockableOverlay]
body: Stack(
children: [
Container(
@ -273,7 +272,11 @@ class _RemotePageState extends State<RemotePage>
},
inputModel: _ffi.inputModel,
child: getBodyForDesktop(context))),
emptyOverlay(),
Obx(
() => _ffi.ffiModel.waitForFirstImage.isTrue
? emptyOverlay()
: Offstage(),
),
RemoteToolbar(
id: widget.id,
ffi: _ffi,

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

@ -38,8 +38,6 @@ import 'platform_model.dart';
typedef HandleMsgBox = Function(Map<String, dynamic> evt, String id);
typedef ReconnectHandle = Function(OverlayDialogManager, SessionID, bool);
final _waitForImageDialogShow = <UuidValue, bool>{};
final _waitForFirstImage = <UuidValue, bool>{};
final _constSessionId = Uuid().v4obj();
class CachedPeerData {
@ -100,6 +98,9 @@ class FfiModel with ChangeNotifier {
WeakReference<FFI> parent;
late final SessionID sessionId;
RxBool waitForImageDialogShow = true.obs;
RxBool waitForFirstImage = true.obs;
Map<String, bool> get permissions => _permissions;
Display get display => _display;
@ -498,7 +499,7 @@ class FfiModel with ChangeNotifier {
closeConnection();
}
if (_waitForFirstImage[sessionId] == false) return;
if (waitForFirstImage.isFalse) return;
dialogManager.show(
(setState, close, context) => CustomAlertDialog(
title: null,
@ -509,7 +510,7 @@ class FfiModel with ChangeNotifier {
onCancel: onClose),
tag: '$sessionId-waiting-for-image',
);
_waitForImageDialogShow[sessionId] = true;
waitForImageDialogShow.value = true;
bind.sessionOnWaitingForImageDialogShow(sessionId: sessionId);
}
@ -578,7 +579,7 @@ class FfiModel with ChangeNotifier {
}
if (displays.isNotEmpty) {
_reconnects = 1;
_waitForFirstImage[sessionId] = true;
waitForFirstImage.value = true;
}
Map<String, dynamic> features = json.decode(evt['features']);
_pi.features.privacyMode = features['privacy_mode'] == 1;
@ -1814,12 +1815,12 @@ class FFI {
}
void onEvent2UIRgba() async {
if (_waitForImageDialogShow[sessionId] == true) {
_waitForImageDialogShow[sessionId] = false;
if (ffiModel.waitForImageDialogShow.isTrue) {
ffiModel.waitForImageDialogShow.value = false;
clearWaitingForImage(dialogManager, sessionId);
}
if (_waitForFirstImage[sessionId] == true) {
_waitForFirstImage[sessionId] = false;
if (ffiModel.waitForFirstImage.value == true) {
ffiModel.waitForFirstImage.value = false;
dialogManager.dismissAll();
await canvasModel.updateViewStyle();
await canvasModel.updateScrollStyle();