chore: remove the gaurd against large paddings
This commit is contained in:
parent
e8caf335b3
commit
057e7b72cc
2 changed files with 3 additions and 11 deletions
|
|
@ -899,8 +899,7 @@ where
|
||||||
let geometry = geometry.to_local(output).as_logical();
|
let geometry = geometry.to_local(output).as_logical();
|
||||||
|
|
||||||
let padded = with_states(layer.wl_surface(), |states| {
|
let padded = with_states(layer.wl_surface(), |states| {
|
||||||
surface_padding(states, geometry.size)
|
surface_padding(states).and_then(|padding| pad_rect(geometry, &padding))
|
||||||
.and_then(|padding| pad_rect(geometry, &padding))
|
|
||||||
})
|
})
|
||||||
.unwrap_or(geometry);
|
.unwrap_or(geometry);
|
||||||
let radii = with_states(layer.wl_surface(), |states| {
|
let radii = with_states(layer.wl_surface(), |states| {
|
||||||
|
|
|
||||||
|
|
@ -45,18 +45,11 @@ pub fn surface_corners(states: &SurfaceData, size: Size<i32, Logical>) -> Option
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn surface_padding(states: &SurfaceData, size: Size<i32, Logical>) -> Option<[i32; 4]> {
|
pub fn surface_padding(states: &SurfaceData) -> Option<[i32; 4]> {
|
||||||
let mut guard = states.cached_state.get::<CacheablePadding>();
|
let mut guard = states.cached_state.get::<CacheablePadding>();
|
||||||
|
|
||||||
let padding = guard.current().0?;
|
let padding = guard.current().0?;
|
||||||
|
Some([padding.top, padding.right, padding.bottom, padding.left])
|
||||||
// guard against padding being too large
|
|
||||||
Some([
|
|
||||||
padding.top.min(size.h / 2),
|
|
||||||
padding.right.min(size.w / 2),
|
|
||||||
padding.bottom.min(size.h / 2),
|
|
||||||
padding.left.min(size.w / 2),
|
|
||||||
])
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn pad_rect(
|
pub fn pad_rect(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue