srdusr
aboutsummaryrefslogtreecommitdiffstats
path: root/crates/wayland/src/winit
diff options
context:
space:
mode:
authorsrdusr <[email protected]>2024-08-23 22:23:00 +0200
committersrdusr <[email protected]>2024-08-23 22:23:00 +0200
commit281378656bdf9520e5f89d31864b9b2f822d4e3e (patch)
treebb858d6c79ae8ca2c423cd366c10ded90fa8a97e /crates/wayland/src/winit
parent78da614d67c09e197dffc1cebb1c5ce2357c7128 (diff)
downloadsrdwm-281378656bdf9520e5f89d31864b9b2f822d4e3e.tar.gz
srdwm-281378656bdf9520e5f89d31864b9b2f822d4e3e.zip
Round the bottom border strip's corners to match the top
MISSING.md listed the border frame's bottom/left/right strips as staying square while the top one (and the titlebar above it) rounds -- "unrelated to client content rounding... not attempted." The left/ right strips genuinely can't participate (border_strips' geometry has them span only the height between the top and bottom strips, no corner to round), but the bottom strip is exactly the same shape as the top one and had no reason left to stay square. decoration::render_border_bottom mirrors render_border_top exactly (round_bottom_corners mirrors round_top_corners), cached the same way in a new border_bottom_decorations map, and drawn in both render loops via the same all-or-nothing occlusion check the top strip already uses - pulled out of the left/right strips' per-fragment occlusion splitting into its own dedicated bitmap path, matching top's existing trade-off (cropping a rounded bitmap's source rect per fragment is real extra work for a strip this thin) rather than inventing a new one. One real bug caught before it shipped: round_bottom_corners' corner- centre math (height - r - 1) panics on unsigned underflow whenever the radius clamp lands on the strip's own full height (a real, common case - a 2px-thick test strip hits it immediately). Fixed by computing the centre as a signed offset instead, mirroring how the existing dx/dy distance math already avoids the same class of issue.
Diffstat (limited to 'crates/wayland/src/winit')
-rw-r--r--crates/wayland/src/winit/connect.rs1
-rw-r--r--crates/wayland/src/winit/render.rs36
2 files changed, 25 insertions, 12 deletions
diff --git a/crates/wayland/src/winit/connect.rs b/crates/wayland/src/winit/connect.rs
index 61f6dd1..d771d1f 100644
--- a/crates/wayland/src/winit/connect.rs
+++ b/crates/wayland/src/winit/connect.rs
@@ -149,6 +149,7 @@ impl WaylandPlatform {
dead_layer_surfaces: HashSet::new(),
decorations: HashMap::new(),
border_top_decorations: HashMap::new(),
+ border_bottom_decorations: HashMap::new(),
shadow_buffers: HashMap::new(),
rounded_corners_program,
content_epoch: HashMap::new(),
diff --git a/crates/wayland/src/winit/render.rs b/crates/wayland/src/winit/render.rs
index 902aed4..3ab3354 100644
--- a/crates/wayland/src/winit/render.rs
+++ b/crates/wayland/src/winit/render.rs
@@ -162,17 +162,18 @@ impl WaylandPlatform {
if w.border_width > 0 {
let color = crate::state::effective_border_color(w.border_color, focused == Some(id));
let strips = decoration::border_strips(geom, w.border_width);
- // Strip 0 (top) is rounded to match the titlebar underneath
- // it - see `render_border_top`'s doc comment - so it's a
- // cached bitmap (rebuilt only in `redraw_decoration_buffer`,
- // same as the titlebar itself), not rasterized fresh here
- // every frame; the other three don't touch a rounded corner
- // and stay persistent solid-colour buffers instead - see
- // `elements::border_side_render_element`'s doc comment for
- // why a per-frame rebuild of either was a real, continuous
- // cost, not a cosmetic one. Not fragment-clipped like the
- // other three below - see the matching comment in
- // `udev/render.rs` for why the top strip only gets the cheaper
+ // Strips 0/1 (top/bottom) are rounded on their own two
+ // corners - see `render_border_top`/`render_border_bottom`'s
+ // doc comments - so both are cached bitmaps (rebuilt only in
+ // `redraw_decoration_buffer`, same as the titlebar itself),
+ // not rasterized fresh here every frame; the remaining two
+ // (left/right) never touch a corner and stay persistent
+ // solid-colour buffers instead - see `elements::
+ // border_side_render_element`'s doc comment for why a
+ // per-frame rebuild of either was a real, continuous cost,
+ // not a cosmetic one. Not fragment-clipped like the left/
+ // right strips below - see the matching comment in
+ // `udev/render.rs` for why top/bottom only get the cheaper
// all-or-nothing occlusion check.
if strips[0].width > 0 && strips[0].height > 0 && !strips[0].subtract_all(&occluders).is_empty() {
if let Some(buffer) = self.state.border_top_decorations.get(&id) {
@@ -182,9 +183,20 @@ impl WaylandPlatform {
}
}
}
+ // Same all-or-nothing bitmap treatment as the top strip,
+ // for its own two corners - see `decoration::
+ // render_border_bottom`'s doc comment.
+ if strips[1].width > 0 && strips[1].height > 0 && !strips[1].subtract_all(&occluders).is_empty() {
+ if let Some(buffer) = self.state.border_bottom_decorations.get(&id) {
+ match MemoryRenderBufferRenderElement::from_buffer(renderer, (strips[1].x as f64, strips[1].y as f64), buffer, None, None, None, Kind::Unspecified) {
+ Ok(elem) => custom_elements.push(crate::rounded_corners::WinitElement::Base(crate::elements::OverlayElement::Memory(elem))),
+ Err(e) => log::warn!("failed to import bottom border buffer for window {id}: {e}"),
+ }
+ }
+ }
let pool = self.state.border_side_buffers.entry(id).or_default();
let mut buf_index = 0;
- for strip in &strips[1..] {
+ for strip in &strips[2..] {
if strip.width == 0 || strip.height == 0 {
continue;
}