fix(dialog): fix message dialog return with custom buttons, fixes #711 (

#769) * fix confirm * remove unnecessary lines * fix * change file
tauri-apps · Nov 27, 2023 · 2e2c0a1 · 2e2c0a1
1 parent f49b391
commit 2e2c0a1
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 23 deletions.
diff --git a/.changes/dialog-return-result.md b/.changes/dialog-return-result.md
@@ -0,0 +1,6 @@
+---
+"dialog": patch
+"dialog-js": patch
+---
+
+Fix incorrect result for dialog messages.
diff --git a/plugins/dialog/src/desktop.rs b/plugins/dialog/src/desktop.rs
@@ -53,14 +53,8 @@ impl<R: Runtime> Dialog<R> {
 
 #[cfg(not(target_os = "linux"))]
 macro_rules! run_dialog {
-    ($e:expr, $h: ident) => {{
-        std::thread::spawn(move || {
-            let response = tauri::async_runtime::block_on($e);
-            $h(!matches!(
-                response,
-                rfd::MessageDialogResult::No | rfd::MessageDialogResult::Cancel
-            ));
-        });
+    ($e:expr, $h: expr) => {{
+        std::thread::spawn(move || $h(tauri::async_runtime::block_on($e)));
     }};
 }
 
@@ -69,24 +63,15 @@ macro_rules! run_dialog {
     ($e:expr, $h: ident) => {{
         std::thread::spawn(move || {
             let context = glib::MainContext::default();
-            context.invoke_with_priority(glib::PRIORITY_HIGH, move || {
-                let response = $e;
-                $h(!matches!(
-                    response,
-                    rfd::MessageDialogResult::No | rfd::MessageDialogResult::Cancel
-                ));
-            });
+            context.invoke_with_priority(glib::PRIORITY_HIGH, move || $h($e));
         });
     }};
 }
 
 #[cfg(not(target_os = "linux"))]
 macro_rules! run_file_dialog {
     ($e:expr, $h: ident) => {{
-        std::thread::spawn(move || {
-            let response = tauri::async_runtime::block_on($e);
-            $h(response);
-        });
+        std::thread::spawn(move || $h(tauri::async_runtime::block_on($e)));
     }};
 }
 
@@ -95,10 +80,7 @@ macro_rules! run_file_dialog {
     ($e:expr, $h: ident) => {{
         std::thread::spawn(move || {
             let context = glib::MainContext::default();
-            context.invoke_with_priority(glib::PRIORITY_HIGH, move || {
-                let response = $e;
-                $h(response);
-            });
+            context.invoke_with_priority(glib::PRIORITY_HIGH, move || $h($e));
         });
     }};
 }
@@ -226,5 +208,16 @@ pub fn show_message_dialog<R: Runtime, F: FnOnce(bool) + Send + 'static>(
     dialog: MessageDialogBuilder<R>,
     f: F,
 ) {
+    use rfd::MessageDialogResult;
+
+    let ok_label = dialog.ok_button_label.clone();
+    let f = move |res| {
+        f(match res {
+            MessageDialogResult::Ok | MessageDialogResult::Yes => true,
+            MessageDialogResult::Custom(s) => ok_label.map_or(s == OK, |ok_label| ok_label == s),
+            _ => false,
+        });
+    };
+
     run_dialog!(MessageDialog::from(dialog).show(), f);
 }