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

fix: apply blur enabled to system theme

Browse source
This commit is contained in:
Ashley Wulber 2026-04-21 17:58:24 -04:00 • committed by Ashley Wulber
parent 2d7f66d528
commit bf5ffcc2af
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/app/cosmic.rs
View file

@ -857,6 +857,7 @@ impl<T: Application> Cosmic<T> {
crate::core::AppType::Applet => t.frosted_applets, crate::core::AppType::Applet => t.frosted_applets,
} }
}; };
theme.transparent = new_blur; theme.transparent = new_blur;
let mut guard = THEME.lock().unwrap(); let mut guard = THEME.lock().unwrap();
guard.set_theme(theme.theme_type.clone()); guard.set_theme(theme.theme_type.clone());
@ -866,8 +867,6 @@ impl<T: Application> Cosmic<T> {
let core = self.app.core(); let core = self.app.core();
#[cfg(all(feature = "wayland", target_os = "linux"))] #[cfg(all(feature = "wayland", target_os = "linux"))]
{ {
use crate::widget::wrapper;
let mut cmds = Vec::with_capacity(1 + self.surface_views.len()); let mut cmds = Vec::with_capacity(1 + self.surface_views.len());
let blur = if new_blur { let blur = if new_blur {
iced::window::enable_blur iced::window::enable_blur
@ -1361,7 +1360,6 @@ impl<T: Application> Cosmic<T> {
SurfaceIdWrapper::Popup(_) | SurfaceIdWrapper::LayerSurface(_) SurfaceIdWrapper::Popup(_) | SurfaceIdWrapper::LayerSurface(_)
) )
}); });
let core = self.app.core();
let new_blur = self.blur_enabled && { let new_blur = self.blur_enabled && {
let t = theme.cosmic(); let t = theme.cosmic();
match self.app.core().app_type() { match self.app.core().app_type() {
@ -1370,14 +1368,14 @@ impl<T: Application> Cosmic<T> {
crate::core::AppType::Applet => t.frosted_applets, crate::core::AppType::Applet => t.frosted_applets,
} }
}; };
theme.transparent = new_blur;
let wrapper = self let wrapper = self
.surface_views .surface_views
.get(&id) .get(&id)
.map(|s| s.1) .map(|s| s.1)
.or(self.tracked_surfaces.get(&id).copied()); .or(self.tracked_surfaces.get(&id).copied());
// this will blur untracked windows as if they were the main window // this will blur untracked windows as if they were the main window
let blur_cmd = if core.blur(&theme, wrapper) { let blur_cmd = if self.app.core().blur(&theme, wrapper) {
let blur = if new_blur { let blur = if new_blur {
iced::window::enable_blur iced::window::enable_blur
} else { } else {
@ -1421,20 +1419,21 @@ impl<T: Application> Cosmic<T> {
#[cfg(all(feature = "wayland", target_os = "linux"))] #[cfg(all(feature = "wayland", target_os = "linux"))]
Action::BlurEnabled => { Action::BlurEnabled => {
// TODO do this after blur event confirms support instead of for all wayland windows // TODO do this after blur event confirms support instead of for all wayland windows
let core = self.app.core();
self.blur_enabled = true; self.blur_enabled = true;
let mut t = THEME.lock().unwrap();
let new_blur = self.blur_enabled && { let new_blur = self.blur_enabled && {
let t = core.system_theme.cosmic(); let t = t.cosmic();
match self.app.core().app_type() { match self.app.core().app_type() {
crate::core::AppType::Window => t.frosted_windows, crate::core::AppType::Window => t.frosted_windows,
crate::core::AppType::System => t.frosted_system_interface, crate::core::AppType::System => t.frosted_system_interface,
crate::core::AppType::Applet => t.frosted_applets, crate::core::AppType::Applet => t.frosted_applets,
} }
}; };
let mut t = THEME.lock().unwrap();
t.transparent = matches!(&t.theme_type, ThemeType::System { .. }) && new_blur; t.transparent = new_blur;
self.app.core_mut().system_theme.transparent = new_blur;
{ {
let blur = if new_blur { let blur = if new_blur {
iced::window::enable_blur iced::window::enable_blur
@ -1442,7 +1441,7 @@ impl<T: Application> Cosmic<T> {
iced::window::disable_blur iced::window::disable_blur
}; };
let mut cmds = Vec::with_capacity(1 + self.surface_views.len()); let mut cmds = Vec::with_capacity(1 + self.surface_views.len());
if core.blur(&t, None) { if self.app.core().blur(&t, None) {
cmds.push(blur( cmds.push(blur(
self.app self.app
.core() .core()
@ -1451,12 +1450,12 @@ impl<T: Application> Cosmic<T> {
)); ));
} }
for (id, wrapper, ..) in &self.surface_views { for (id, wrapper, ..) in &self.surface_views {
if core.blur(&t, Some(wrapper.1)) { if self.app.core().blur(&t, Some(wrapper.1)) {
cmds.push(blur(*id)); cmds.push(blur(*id));
} }
} }
for (id, wrapper) in &self.tracked_surfaces { for (id, wrapper) in &self.tracked_surfaces {
if core.blur(&t, Some(*wrapper)) { if self.app.core().blur(&t, Some(*wrapper)) {
cmds.push(blur(*id)); cmds.push(blur(*id));
} }
} }