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

Merge pull request #5302 from 21pages/fix

Browse Source 
fix waiting for image, should not await dialogManager.show
This commit is contained in:
RustDesk 2023-08-09 15:19:13 +08:00 committed by GitHub
commit f022cbb93f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,19 +425,18 @@ class FfiModel with ChangeNotifier {
closeConnection(); closeConnection();
} }
Future.delayed(Duration.zero, () async { dialogManager.show(
await dialogManager.show( (setState, close, context) => CustomAlertDialog(
(setState, close, context) => CustomAlertDialog( title: null,
title: null, content: SelectionArea(child: msgboxContent(type, title, text)),
content: SelectionArea(child: msgboxContent(type, title, text)), actions: [
actions: [ dialogButton("Cancel", onPressed: onClose, isOutline: true)
dialogButton("Cancel", onPressed: onClose, isOutline: true) ],
], onCancel: onClose),
onCancel: onClose), tag: '$sessionId-waiting-for-image',
tag: '$sessionId-waiting-for-image', );
); _waitForImageDialogShow[sessionId] = true;
_waitForImageDialogShow[sessionId] = true; bind.sessionOnWaitingForImageDialogShow(sessionId: sessionId);
});
} }
_updateSessionWidthHeight(SessionID sessionId) { _updateSessionWidthHeight(SessionID sessionId) {
@ -1902,7 +1901,7 @@ Future<void> initializeCursorAndCanvas(FFI ffi) async {
} }
clearWaitingForImage(OverlayDialogManager? dialogManager, SessionID sessionId) { clearWaitingForImage(OverlayDialogManager? dialogManager, SessionID sessionId) {
final durations = [100, 500, 1000, 2000]; final durations = [0, 100, 500, 1000, 2000];
for (var duration in durations) { for (var duration in durations) {
Future.delayed(Duration(milliseconds: duration), () { Future.delayed(Duration(milliseconds: duration), () {
dialogManager?.dismissByTag('$sessionId-waiting-for-image'); dialogManager?.dismissByTag('$sessionId-waiting-for-image');

8
src/flutter.rs
View File

@ -345,6 +345,14 @@ impl FlutterHandler {
*self.notify_rendered.write().unwrap() = false; *self.notify_rendered.write().unwrap() = false;
self.renderer.write().unwrap().set_size(width, height); self.renderer.write().unwrap().set_size(width, height);
} }
pub fn on_waiting_for_image_dialog_show(&self) {
#[cfg(any(feature = "flutter_texture_render"))]
{
*self.notify_rendered.write().unwrap() = false;
}
// rgba array render will notify every frame
}
} }
impl InvokeUiSession for FlutterHandler { impl InvokeUiSession for FlutterHandler {

6
src/flutter_ffi.rs
View File

@ -1266,6 +1266,12 @@ pub fn session_change_prefer_codec(session_id: SessionID) {
} }
} }
pub fn session_on_waiting_for_image_dialog_show(session_id: SessionID) {
if let Some(session) = SESSIONS.read().unwrap().get(&session_id) {
session.ui_handler.on_waiting_for_image_dialog_show();
}
}
pub fn main_set_home_dir(_home: String) { pub fn main_set_home_dir(_home: String) {
#[cfg(any(target_os = "android", target_os = "ios"))] #[cfg(any(target_os = "android", target_os = "ios"))]
{ {