fix: config watcher hash & blur
This commit is contained in:
parent
dc11d6a11f
commit
8cb10bf6e2
2 changed files with 11 additions and 9 deletions
|
|
@ -67,6 +67,8 @@ struct Wrapper(
|
||||||
impl std::hash::Hash for Wrapper {
|
impl std::hash::Hash for Wrapper {
|
||||||
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
|
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
|
||||||
self.0.hash(state);
|
self.0.hash(state);
|
||||||
|
self.2.hash(state);
|
||||||
|
self.3.hash(state);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -941,7 +941,7 @@ impl<T: Application> Cosmic<T> {
|
||||||
}
|
}
|
||||||
|
|
||||||
Action::SystemThemeChange(keys, mut theme) => {
|
Action::SystemThemeChange(keys, mut theme) => {
|
||||||
let cur_is_dark = THEME.lock().unwrap().theme_type.is_dark();
|
let cur_is_dark = self.app.core().system_theme_mode.is_dark;
|
||||||
// Ignore updates if the current theme mode does not match.
|
// Ignore updates if the current theme mode does not match.
|
||||||
if cur_is_dark != theme.cosmic().is_dark {
|
if cur_is_dark != theme.cosmic().is_dark {
|
||||||
return iced::Task::none();
|
return iced::Task::none();
|
||||||
|
|
@ -1026,14 +1026,14 @@ impl<T: Application> Cosmic<T> {
|
||||||
} else {
|
} else {
|
||||||
iced::window::disable_blur
|
iced::window::disable_blur
|
||||||
};
|
};
|
||||||
if self.app.core().blur(&cosmic_theme, None) {
|
|
||||||
cmds.push(blur(
|
cmds.push(blur(
|
||||||
self.app
|
self.app
|
||||||
.core()
|
.core()
|
||||||
.main_window_id()
|
.main_window_id()
|
||||||
.unwrap_or(window::Id::RESERVED),
|
.unwrap_or(window::Id::RESERVED),
|
||||||
));
|
));
|
||||||
}
|
|
||||||
for (id, wrapper, ..) in &self.surface_views {
|
for (id, wrapper, ..) in &self.surface_views {
|
||||||
let overriden = wrapper.2(&self.app);
|
let overriden = wrapper.2(&self.app);
|
||||||
if self.app.core().blur(&cosmic_theme, Some(wrapper.1))
|
if self.app.core().blur(&cosmic_theme, Some(wrapper.1))
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue