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

refactor(corner-radius): cleanup & add pre commit hooks

Browse source
This commit is contained in:
Ashley Wulber 2025-09-26 12:12:04 -04:00 • committed by Victoria Brekenfeld
parent 819887e298
commit 2e3bb2d80e
2 changed files with 109 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/wayland/handlers/corner_radius.rs
View file

@ -1,11 +1,7 @@
use cosmic_protocols::corner_radius::v1::server::cosmic_corner_radius_toplevel_v1;
use smithay::reexports::wayland_protocols::xdg::shell::server::xdg_toplevel;
use smithay::reexports::wayland_server::Resource;
use smithay::wayland::compositor::{add_pre_commit_hook, with_states};
use smithay::wayland::shell::xdg::{SurfaceCachedState, ToplevelSurface};
use crate::wayland::protocols::corner_radius::{
delegate_corner_radius, CacheableCorners, CornerRadiusData, CornerRadiusHandler,
delegate_corner_radius, CornerRadiusData, CornerRadiusHandler,
CornerRadiusState,
};
@ -16,13 +12,6 @@ impl CornerRadiusHandler for State {
&mut self.common.corner_radius_state
}
fn toplevel_from_resource(
&mut self,
toplevel: &xdg_toplevel::XdgToplevel,
) -> Option<ToplevelSurface> {
self.common.xdg_shell_state.get_toplevel(toplevel)
}
fn set_corner_radius(
&mut self,
_: &cosmic_corner_radius_toplevel_v1::CosmicCornerRadiusToplevelV1,
@ -42,45 +31,6 @@ impl CornerRadiusHandler for State {
tracing::warn!("Failed to force redraw for corner radius reset.");
}
}
fn add_corners(
&mut self,
toplevel: &xdg_toplevel::XdgToplevel,
toplevel_obj: cosmic_corner_radius_toplevel_v1::CosmicCornerRadiusToplevelV1,
) {
if let Some(surface) = self.toplevel_from_resource(&toplevel) {
add_pre_commit_hook::<Self, _>(surface.wl_surface(), move |_, _dh, surface| {
let corner_radii_too_big = with_states(surface, |surface_data| {
let corners = surface_data
.cached_state
.get::<CacheableCorners>()
.pending()
.clone();
surface_data
.cached_state
.get::<SurfaceCachedState>()
.pending()
.geometry
.zip(corners.0.as_ref())
.is_some_and(|(geo, corners)| {
let half_min_dim =
u8::try_from(geo.size.w.min(geo.size.h) / 2).unwrap_or(u8::MAX);
corners.top_right > half_min_dim
|| corners.top_left > half_min_dim
|| corners.bottom_right > half_min_dim
|| corners.bottom_left > half_min_dim
})
});
if corner_radii_too_big {
toplevel_obj.post_error(
cosmic_corner_radius_toplevel_v1::Error::RadiusTooLarge as u32,
format!("{toplevel_obj:?} corner radius too large"),
);
}
});
}
}
}
fn force_redraw(state: &mut State, data: &CornerRadiusData) -> Option<()> {