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

fix: blur only after blur event

Browse source
This commit is contained in:
Ashley Wulber 2026-04-17 13:42:51 -04:00
parent 3ca50dd7f6
commit 01ab456610
3 changed files with 27 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
iced

@ -1 +1 @@
Subproject commit 4f6d52fce72749bb4421afe8d108f561c0bf77d2 Subproject commit 0a093b3ab0d5ad1b3ad6b457c1715880276e0ce1

2
src/app/action.rs
View file

@ -64,6 +64,8 @@ pub enum Action {
Unfocus(iced::window::Id), Unfocus(iced::window::Id),
/// Windowing system initialized /// Windowing system initialized
WindowingSystemInitialized, WindowingSystemInitialized,
/// Blur support enabled
BlurEnabled,
/// Updates the window maximized state /// Updates the window maximized state
WindowMaximized(iced::window::Id, bool), WindowMaximized(iced::window::Id, bool),
/// Updates the tracked window geometry. /// Updates the tracked window geometry.

56
src/app/cosmic.rs
View file

@ -95,6 +95,7 @@ pub struct Cosmic<App: Application> {
>, >,
pub tracked_windows: HashSet<window::Id>, pub tracked_windows: HashSet<window::Id>,
pub opened_surfaces: HashMap<window::Id, u32>, pub opened_surfaces: HashMap<window::Id, u32>,
blur_enabled: bool,
} }
impl<T: Application> Cosmic<T> impl<T: Application> Cosmic<T>
@ -461,6 +462,9 @@ where
)) => { )) => {
return Some(Action::WindowState(id, s)); return Some(Action::WindowState(id, s));
} }
wayland::Event::BlurEnabled => {
return Some(Action::BlurEnabled);
}
_ => (), _ => (),
} }
} }
@ -756,7 +760,7 @@ impl<T: Application> Cosmic<T> {
} }
} }
let new_blur = WINDOWING_SYSTEM.get() == Some(&WindowingSystem::Wayland) && { 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() {
crate::core::AppType::Window => t.frosted_windows, crate::core::AppType::Window => t.frosted_windows,
@ -798,7 +802,7 @@ impl<T: Application> Cosmic<T> {
return iced::Task::none(); return iced::Task::none();
} }
// update transparent // update transparent
let new_blur = WINDOWING_SYSTEM.get() == Some(&WindowingSystem::Wayland) && { 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() {
crate::core::AppType::Window => t.frosted_windows, crate::core::AppType::Window => t.frosted_windows,
@ -839,7 +843,6 @@ impl<T: Application> Cosmic<T> {
#[cfg(all(feature = "wayland", target_os = "linux"))] #[cfg(all(feature = "wayland", target_os = "linux"))]
if self.app.core().sync_window_border_radii_to_theme() { if self.app.core().sync_window_border_radii_to_theme() {
use iced_runtime::platform_specific::wayland::CornerRadius;
use iced_winit::platform_specific::commands::corner_radius::corner_radius; use iced_winit::platform_specific::commands::corner_radius::corner_radius;
let t = cosmic_theme.cosmic(); let t = cosmic_theme.cosmic();
@ -923,7 +926,7 @@ impl<T: Application> Cosmic<T> {
} else { } else {
new_theme new_theme
}; };
let new_blur = WINDOWING_SYSTEM.get() == Some(&WindowingSystem::Wayland) && { let new_blur = self.blur_enabled && {
let t = new_theme.cosmic(); let t = new_theme.cosmic();
match core.app_type() { match core.app_type() {
crate::core::AppType::Window => t.frosted_windows, crate::core::AppType::Window => t.frosted_windows,
@ -945,8 +948,6 @@ impl<T: Application> Cosmic<T> {
if self.app.core().sync_window_border_radii_to_theme() { if self.app.core().sync_window_border_radii_to_theme() {
use iced_winit::platform_specific::commands::corner_radius::corner_radius; use iced_winit::platform_specific::commands::corner_radius::corner_radius;
let t = cosmic_theme.cosmic();
let rounded = !self.app.core().window.sharp_corners; let rounded = !self.app.core().window.sharp_corners;
let cur_rad = let cur_rad =
self.app.core().app_type.corners(&cosmic_theme, rounded); self.app.core().app_type.corners(&cosmic_theme, rounded);
@ -1008,7 +1009,7 @@ impl<T: Application> Cosmic<T> {
#[allow(clippy::used_underscore_binding)] #[allow(clippy::used_underscore_binding)]
_token, _token,
), ),
) );
} }
#[cfg(not(all(feature = "wayland", target_os = "linux")))] #[cfg(not(all(feature = "wayland", target_os = "linux")))]
@ -1091,15 +1092,14 @@ impl<T: Application> Cosmic<T> {
crate::theme::system_light() crate::theme::system_light()
}; };
if let ThemeType::System { .. } = new_theme.theme_type { if let ThemeType::System { .. } = new_theme.theme_type {
let new_blur = WINDOWING_SYSTEM.get() == Some(&WindowingSystem::Wayland) let new_blur = self.blur_enabled && {
&& { let t = new_theme.cosmic();
let t = new_theme.cosmic(); match core.app_type() {
match 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, }
} };
};
new_theme.transparent = new_blur; new_theme.transparent = new_blur;
} }
core.system_theme = new_theme.clone(); core.system_theme = new_theme.clone();
@ -1229,22 +1229,14 @@ impl<T: Application> Cosmic<T> {
Action::Opened(id) => { Action::Opened(id) => {
#[cfg(all(feature = "wayland", target_os = "linux"))] #[cfg(all(feature = "wayland", target_os = "linux"))]
if self.app.core().sync_window_border_radii_to_theme() { if self.app.core().sync_window_border_radii_to_theme() {
use iced_runtime::platform_specific::wayland::CornerRadius;
use iced_winit::platform_specific::commands::corner_radius::corner_radius; use iced_winit::platform_specific::commands::corner_radius::corner_radius;
let mut theme = THEME.lock().unwrap(); let mut theme = THEME.lock().unwrap();
let t = theme.cosmic();
let radii = t.radius_s().map(|x| if x < 4.0 { x } else { x + 4.0 });
let cur_rad = CornerRadius {
top_left: radii[0].round() as u32,
top_right: radii[1].round() as u32,
bottom_right: radii[2].round() as u32,
bottom_left: radii[3].round() as u32,
};
// TODO do we need per window sharp corners? // TODO do we need per window sharp corners?
let rounded = !self.app.core().window.sharp_corners; let rounded = !self.app.core().window.sharp_corners;
let core = self.app.core(); let core = self.app.core();
let new_blur = WINDOWING_SYSTEM.get() == Some(&WindowingSystem::Wayland) && { 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() {
crate::core::AppType::Window => t.frosted_windows, crate::core::AppType::Window => t.frosted_windows,
@ -1260,9 +1252,7 @@ impl<T: Application> Cosmic<T> {
iced::window::disable_blur iced::window::disable_blur
}; };
let mut cmds = Vec::with_capacity(1 + self.tracked_windows.len()); let mut cmds = Vec::with_capacity(1 + self.tracked_windows.len());
if !self.tracked_windows.contains(&id) { cmds.push(blur(id));
cmds.push(blur(id));
}
Task::batch(cmds) Task::batch(cmds)
} else { } else {
@ -1283,7 +1273,6 @@ impl<T: Application> Cosmic<T> {
} else { } else {
Task::none() Task::none()
}; };
let t = theme.cosmic();
return Task::batch([ return Task::batch([
blur_cmd, blur_cmd,
corner_task, corner_task,
@ -1292,10 +1281,11 @@ impl<T: Application> Cosmic<T> {
} }
return iced_runtime::window::run_with_handle(id, init_windowing_system); return iced_runtime::window::run_with_handle(id, init_windowing_system);
} }
Action::WindowingSystemInitialized => { 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(); let core = self.app.core();
let new_blur = WINDOWING_SYSTEM.get() == Some(&WindowingSystem::Wayland) && { self.blur_enabled = true;
let new_blur = self.blur_enabled && {
let t = core.system_theme.cosmic(); let t = core.system_theme.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,
@ -1323,6 +1313,7 @@ impl<T: Application> Cosmic<T> {
return Task::batch(cmds); return Task::batch(cmds);
} }
} }
_ => (),
} }
iced::Task::none() iced::Task::none()
@ -1337,6 +1328,7 @@ impl<App: Application> Cosmic<App> {
surface_views: HashMap::new(), surface_views: HashMap::new(),
tracked_windows: HashSet::new(), tracked_windows: HashSet::new(),
opened_surfaces: HashMap::new(), opened_surfaces: HashMap::new(),
blur_enabled: false,
} }
} }