Merge pull request #703 from squidowl/default-custom-theme-name

Append file-name when saving theme on macos

CHANGELOG.md

@@ -13,6 +13,7 @@ Fixed:
 - Long username & password combinations could cause SASL authentication to fail
 - `nick_password_command` is now working as intended
 - Don't add suffix (`: `) to prompt if there is no valid nick to autocomplete
+- Append .toml filename when saving themes on macOS
 
 Changed:
 - Changed focus buffer shortcuts to include `Ctrl` (`⌘` on macOS) to avoid interfering with default text input shortcuts for word navigation (`⌥ + ←`, `⌥ + →`)

Cargo.toml

@@ -52,7 +52,7 @@ version = "1.0"
 features = ["v4"]
 
 [dependencies.rfd]
-version = "0.14.1"
+version = "0.15.2"
 default-features = false
 features = ["xdg-portal", "tokio"]
 

src/screen/dashboard/theme_editor.rs

@@ -115,17 +115,9 @@ impl ThemeEditor {
             }
             Message::Save => {
                 let task = async move {
-                    // TODO: rfd `set_directory` can't be used in combination with `set_file_name` on macOS.
-                    // https://github.com/PolyMeilex/rfd/issues/214
-
-                    let mut dialog =
-                        rfd::AsyncFileDialog::new().set_directory(Config::themes_dir());
-
-                    if !cfg!(target_os = "macos") {
-                        dialog = dialog.set_file_name("custom-theme.toml");
-                    }
-
-                    dialog
+                    rfd::AsyncFileDialog::new()
+                        .set_directory(Config::themes_dir())
+                        .set_file_name("custom-theme.toml")
                         .save_file()
                         .await
                         .map(|handle| handle.path().to_path_buf())