From 1c175642d073689ca11b9252411ea5f8446007d0 Mon Sep 17 00:00:00 2001 From: srdusr <99972264+srdusr@users.noreply.github.com> Date: Thu, 30 May 2024 16:10:00 +0200 Subject: Fix decoration drift during animated transitions; checkpoint IPC/global-menu/output-management work Border/titlebar decoration was built from Window.geometry (the animation's final target) in both wayland backends' render loops, while sync_geometry already draws a window's actual content at window_anims' interpolated rect during any maximize/fullscreen/open-slide tween. Border and content read two different rectangles for the whole transition, so the border visibly detached from the window it was outlining - reported as "borders aren't flush." Both udev.rs and winit.rs now read the same animated rect for titlebar placement, border-strip placement, and the occlusion test against later windows in stacking order. Verified: cargo build --workspace, cargo clippy (0 new warnings), cargo test -p srdwm-core (111/111). Also checkpoints substantial protocol/IPC work from prior sessions that had accumulated uncommitted: gtk-shell1 support (gtk_shell.rs, the vendored gtk-shell.xml, xwayland.rs's X11-side mirror) backing the global app menu; zwlr_foreign_toplevel_manager_v1 (foreign_toplevel.rs) broadcasting distinct maximized/minimized/fullscreen/activated state per window; output_management (ext-output-management + layer-shell exclusive-zone reservation tracking); workspace.rs and context_menu.rs; a Unix-socket IPC crate (platform/src/ ipc.rs) and a `srd` control-CLI crate (crates/ctl); xkb_config.rs; and a theme module (core/src/theme.rs). A peer session working the AGS shell concurrently verified several of these live against a running srdwm: the global menu rendering a real app's File/Edit menu over gtk-shell1, and foreign-toplevel correctly reporting maximized and fullscreen as independent, non-simultaneous states with the geometry each implies (maximize stops at a reserved top bar and past a dock; fullscreen reaches the true monitor edge). --- crates/core/src/placement.rs | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'crates/core/src/placement.rs') diff --git a/crates/core/src/placement.rs b/crates/core/src/placement.rs index ed9e410..15a5ad5 100644 --- a/crates/core/src/placement.rs +++ b/crates/core/src/placement.rs @@ -21,13 +21,33 @@ pub const MIN_WINDOW_HEIGHT: u32 = 150; pub struct PlacementConfig { pub grid_margin: u32, pub cascade_offset: i32, + /// How close (in logical pixels) a dragged window's edge has to end up + /// to a monitor edge on release before `snap_zone` triggers a + /// half/quarter/maximize. A single edge match with no corner match + /// (e.g. top-only) maximizes the *whole* window - see `snap_zone`'s + /// `(false, false, true, false) => area` arm - so this value directly + /// controls how easy it is to accidentally full-maximize a window while + /// just repositioning it near the top of the screen, not only how + /// generous the corner/half-snap zones are. pub snap_threshold: i32, pub max_grid: u32, } impl Default for PlacementConfig { fn default() -> Self { - Self { grid_margin: 10, cascade_offset: 30, snap_threshold: 50, max_grid: 4 } + // `snap_threshold` was 50, then 20 - both live-tested and reported + // as still snapping from an ordinary "move it near an edge" drag, + // not just a deliberate release-at-the-edge one. `update_drag`'s + // clamp used to also cap a dragged window's reach to the + // exclusive-zone-shrunk usable area rather than the monitor's true + // edge (see `Monitor::full_geometry`), which made this worse than + // the number alone suggests: the window could get within 20px of + // `snap_zone`'s comparison edge well before the cursor was + // anywhere near the real screen edge. 8 keeps snapping reachable + // (a window's own edge, not the cursor, is what's measured) while + // requiring it to actually be at the edge, not just closer to it + // than to the middle of the screen. + Self { grid_margin: 10, cascade_offset: 30, snap_threshold: 8, max_grid: 4 } } } -- cgit v1.2.3