leyoda/cosmic-settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: disable autohide when the dark or light more buttons are pressed

Browse source
This commit is contained in:
Ashley Wulber 2024-03-27 15:06:10 -04:00 • committed by Michael Murphy
parent 4f9ce0f6f8
commit bbf9eae401
1 changed files with 12 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

55
cosmic-settings/src/pages/desktop/appearance.rs
View file

@ -431,24 +431,18 @@ impl Page {
pub fn update(&mut self, message: Message) -> Command<app::Message> { pub fn update(&mut self, message: Message) -> Command<app::Message> {
self.theme_builder_needs_update = false; self.theme_builder_needs_update = false;
let mut needs_sync = false; let mut needs_sync = false;
let mut ret = match message { let ret = match message {
Message::DarkMode(enabled) => { Message::DarkMode(enabled) => {
self.theme_mode.is_dark = enabled;
if let Some(config) = self.theme_mode_config.as_ref() { if let Some(config) = self.theme_mode_config.as_ref() {
// only update dark mode if autoswitch is disabled // must disable auto switch if the user manually switches the theme
if !self.theme_mode.auto_switch { if let Err(err) = self.theme_mode.set_auto_switch(config, false) {
_ = config.set::<bool>("is_dark", enabled); tracing::error!(?err, "Error setting auto switch");
}
if let Err(err) = self.theme_mode.set_is_dark(config, enabled) {
tracing::error!(?err, "Error setting dark mode");
} }
} }
self.reload_theme_mode(); Command::none()
let theme_builder = self.theme_builder.clone();
Command::perform(async {}, |()| {
crate::Message::SetTheme(cosmic::theme::Theme::custom(Arc::new(
// TODO set the values of the theme builder
theme_builder.build(),
)))
})
} }
Message::Autoswitch(enabled) => { Message::Autoswitch(enabled) => {
self.theme_mode.auto_switch = enabled; self.theme_mode.auto_switch = enabled;
@ -576,18 +570,7 @@ impl Page {
.icon_themes .icon_themes
.iter() .iter()
.position(|theme| theme == &self.tk.icon_theme); .position(|theme| theme == &self.tk.icon_theme);
Command::none()
let theme_builder = self.theme_builder.clone();
cosmic::command::future(async {
crate::Message::SetTheme(cosmic::theme::Theme::custom(Arc::new(
// TODO set the values of the theme builder
theme_builder.build(),
)))
})
// Load the current theme builders and mode
// Set the theme for the application to match the current mode instead of the system theme?
} }
Message::Left => Command::perform(async {}, |()| { Message::Left => Command::perform(async {}, |()| {
app::Message::SetTheme(cosmic::theme::system_preference()) app::Message::SetTheme(cosmic::theme::system_preference())
@ -650,10 +633,7 @@ impl Page {
} }
self.reload_theme_mode(); self.reload_theme_mode();
Command::none()
Command::perform(async {}, |()| {
crate::Message::SetTheme(cosmic::theme::Theme::custom(Arc::new(new_theme)))
})
} }
Message::StartImport => Command::perform( Message::StartImport => Command::perform(
async { async {
@ -795,9 +775,7 @@ impl Page {
} }
self.reload_theme_mode(); self.reload_theme_mode();
Command::perform(async {}, |()| { Command::none()
crate::Message::SetTheme(cosmic::theme::Theme::custom(Arc::new(new_theme)))
})
} }
Message::UseDefaultWindowHint(v) => { Message::UseDefaultWindowHint(v) => {
self.no_custom_window_hint = v; self.no_custom_window_hint = v;
@ -881,15 +859,6 @@ impl Page {
} else { } else {
tracing::error!("Failed to get the theme config."); tracing::error!("Failed to get the theme config.");
} }
let theme_builder = self.theme_builder.clone();
ret = Command::batch(vec![
ret,
Command::perform(async {}, |()| {
crate::Message::SetTheme(cosmic::theme::Theme::custom(Arc::new(
theme_builder.build(),
)))
}),
]);
} }
self.can_reset = if self.theme_mode.is_dark { self.can_reset = if self.theme_mode.is_dark {
@ -1571,7 +1540,7 @@ async fn fetch_icon_themes() -> Message {
/// Set the preferred icon theme for GNOME/GTK applications. /// Set the preferred icon theme for GNOME/GTK applications.
async fn set_gnome_icon_theme(theme: String) { async fn set_gnome_icon_theme(theme: String) {
let _res = tokio::process::Command::new("gsettings") let _res = tokio::process::Command::new("gsettings")
.args(&[ .args([
"set", "set",
"org.gnome.desktop.interface", "org.gnome.desktop.interface",
"icon-theme", "icon-theme",