CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-08-15 19:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* fix confirm

* remove unnecessary lines

* fix

* change file
This commit is contained in:
pashokitsme
2023-11-27 19:55:26 +02:00
committed by GitHub
parent f49b391f10
commit 2e2c0a1b95
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.changes/dialog-return-result.md
+6
View File
@@ -0,0 +1,6 @@
---
"dialog": patch
"dialog-js": patch
---
Fix incorrect result for dialog messages.
plugins/dialog/src/desktop.rs
+16 -23
View File
@@ -53,14 +53,8 @@ impl<R: Runtime> Dialog<R> {
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
macro_rules! run_dialog { macro_rules! run_dialog {
($e:expr, $h: ident) => {{ ($e:expr, $h: expr) => {{
std::thread::spawn(move || { std::thread::spawn(move || $h(tauri::async_runtime::block_on($e)));
let response = tauri::async_runtime::block_on($e);
$h(!matches!(
response,
rfd::MessageDialogResult::No | rfd::MessageDialogResult::Cancel
));
});
}}; }};
} }
@@ -69,13 +63,7 @@ macro_rules! run_dialog {
($e:expr, $h: ident) => {{ ($e:expr, $h: ident) => {{
std::thread::spawn(move || { std::thread::spawn(move || {
let context = glib::MainContext::default(); let context = glib::MainContext::default();
context.invoke_with_priority(glib::PRIORITY_HIGH, move || { context.invoke_with_priority(glib::PRIORITY_HIGH, move || $h($e));
let response = $e;
$h(!matches!(
response,
rfd::MessageDialogResult::No | rfd::MessageDialogResult::Cancel
));
});
}); });
}}; }};
} }
@@ -83,10 +71,7 @@ macro_rules! run_dialog {
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
macro_rules! run_file_dialog { macro_rules! run_file_dialog {
($e:expr, $h: ident) => {{ ($e:expr, $h: ident) => {{
std::thread::spawn(move || { std::thread::spawn(move || $h(tauri::async_runtime::block_on($e)));
let response = tauri::async_runtime::block_on($e);
$h(response);
});
}}; }};
} }
@@ -95,10 +80,7 @@ macro_rules! run_file_dialog {
($e:expr, $h: ident) => {{ ($e:expr, $h: ident) => {{
std::thread::spawn(move || { std::thread::spawn(move || {
let context = glib::MainContext::default(); let context = glib::MainContext::default();
context.invoke_with_priority(glib::PRIORITY_HIGH, move || { context.invoke_with_priority(glib::PRIORITY_HIGH, move || $h($e));
let response = $e;
$h(response);
});
}); });
}}; }};
} }
@@ -226,5 +208,16 @@ pub fn show_message_dialog<R: Runtime, F: FnOnce(bool) + Send + 'static>(
dialog: MessageDialogBuilder<R>, dialog: MessageDialogBuilder<R>,
f: F, 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); run_dialog!(MessageDialog::from(dialog).show(), f);
} }