Default to system theme, set min window size

1borgy · Nov 19, 2023 · 5a8321e · 5a8321e
1 parent 2482c4f
commit 5a8321e
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 9 deletions.
diff --git a/cascade/Cargo.toml b/cascade/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cascade"
-version = "0.1.3+dev1"
+version = "0.1.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -10,6 +10,7 @@ anyhow = "1.0.71"
 byteorder = "1.4.3"
 count-write = "0.1.0"
 crc = "3.0.1"
+dark-light = "1.0.0"
 directories = "5.0.1"
 enum-iterator = "1.4.1"
 filetime = "0.2.21"

diff --git a/cascade/src/config.rs b/cascade/src/config.rs
@@ -320,15 +320,35 @@ pub struct CascadeTheme {
 )]
 pub enum CascadeBackground {
     Light,
-    #[default]
     Dark,
+    #[default]
+    System,
 }
 
 impl CascadeBackground {
     pub fn get_palette(&self) -> CascadePalette {
         match self {
             CascadeBackground::Light => CascadePalette::light(),
             CascadeBackground::Dark => CascadePalette::dark(),
+            CascadeBackground::System => {
+                // autodetect dark/light theme on system
+                let mode = dark_light::detect();
+
+                match mode {
+                    dark_light::Mode::Dark => {
+                        log::info!("autodetected system dark theme");
+                        CascadePalette::dark()
+                    }
+                    dark_light::Mode::Light => {
+                        log::info!("autodetected system light theme");
+                        CascadePalette::light()
+                    }
+                    dark_light::Mode::Default => {
+                        log::warn!("could not autodetect system theme; defaulting to light");
+                        CascadePalette::light()
+                    }
+                }
+            }
         }
     }
 }
@@ -362,6 +382,7 @@ impl Display for CascadeBackground {
             match self {
                 CascadeBackground::Light => "light",
                 CascadeBackground::Dark => "dark",
+                CascadeBackground::System => "system",
             }
         )
     }

diff --git a/cascade_cli/Cargo.toml b/cascade_cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cascade_cli"
-version = "0.1.3+dev1"
+version = "0.1.3"
 edition = "2021"
 build = "build.rs"
 

diff --git a/cascade_gui/Cargo.toml b/cascade_gui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cascade_gui"
-version = "0.1.3+dev1"
+version = "0.1.3"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/cascade_gui/src/gui.rs b/cascade_gui/src/gui.rs
@@ -112,6 +112,7 @@ impl Cascade {
         iced::Settings {
             window: window::Settings {
                 size: (720, 520),
+                min_size: Some((720, 520)),
                 ..Default::default()
             },
             ..Default::default()

diff --git a/cascade_gui/src/views/dashboard.rs b/cascade_gui/src/views/dashboard.rs
@@ -80,11 +80,16 @@ impl DashboardView {
             .clone()
             .ok_or(DashboardError::TricksetNotSet)?;
 
-        let dialog = FileDialog::new();
-
-        if let Some(selected_path) =
-            dialog.add_filter("SKA", &["SKA"]).pick_file()
-        {
+        let dialog =
+            FileDialog::new().add_filter("SKA", &["SKA"]).set_directory(
+                self.config
+                    .paths
+                    .saves_dir
+                    .clone()
+                    .ok_or(DashboardError::SavesDirNotSet)?,
+            );
+
+        if let Some(selected_path) = dialog.pick_file() {
             fs::copy(selected_path, trickset_path)?;
             self.status_text = "successfully set trickset".to_string();
         }