CalvinBackup/tauri-plugins-workspace
1
0
Fork 0
mirror of https://github.com/tauri-apps/plugins-workspace.git synced 2026-06-06 13:53:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1' into v1-into-v2-again

Browse Source
This commit is contained in:
FabianLars
2023-11-23 17:50:47 +01:00
parent 5106b9d0c6 8c9ff2a2a9
commit 058d5dde0d
36 changed files with 1050 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dialog/src/commands.rs
+2 -2
View File
@@ -98,7 +98,7 @@ pub(crate) async fn open<R: Runtime>(
dialog_builder = dialog_builder.set_parent(&window);
}
if let Some(title) = options.title {
dialog_builder = dialog_builder.set_title(&title);
dialog_builder = dialog_builder.set_title(title);
}
if let Some(default_path) = options.default_path {
dialog_builder = set_default_path(dialog_builder, default_path);
@@ -178,7 +178,7 @@ pub(crate) async fn save<R: Runtime>(
dialog_builder = dialog_builder.set_parent(&window);
}
if let Some(title) = options.title {
dialog_builder = dialog_builder.set_title(&title);
dialog_builder = dialog_builder.set_title(title);
}
if let Some(default_path) = options.default_path {
dialog_builder = set_default_path(dialog_builder, default_path);
plugins/dialog/src/desktop.rs
+2 -2
View File
@@ -126,13 +126,13 @@ impl<R: Runtime> From<FileDialogBuilder<R>> for FileDialog {
let mut builder = FileDialog::new();
if let Some(title) = d.title {
builder = builder.set_title(&title);
builder = builder.set_title(title);
}
if let Some(starting_directory) = d.starting_directory {
builder = builder.set_directory(starting_directory);
}
if let Some(file_name) = d.file_name {
builder = builder.set_file_name(&file_name);
builder = builder.set_file_name(file_name);
}
for filter in d.filters {
let v: Vec<&str> = filter.extensions.iter().map(|x| &**x).collect();