mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-06 13:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ssd: allow ssd to be smaller than minimal size by hiding buttons

Browse source 
This fixes the ugly look of SSD for tiny windows (e.g. "xterm -geometry
1x1") due to the early return in `ssd_update_geometry()`. Now SSDs are
rendered correctly for those windows by hiding some buttons when the
window width is smaller than the total width of buttons. Additionally for
windows smaller than (button width)*2, the corners are un-rounded so a
small titlebar can be rendered with a scene-rect.
This commit is contained in:
tokyo4j 2024-08-25 16:33:41 +09:00 • committed by Andrew J. Hesford
parent b34f2c9d85
commit 1be69dc28b
6 changed files with 184 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/ssd/ssd.c
View file

@ -181,9 +181,9 @@ ssd_create(struct view *view, bool active)
ssd_extents_create(ssd);
/*
* We need to create the borders after the titlebar because it sets
* ssd->state.was_tiled_not_maximized which ssd_border_create()
* reacts to. TODO: Set the state here instead so the order does
* not matter anymore.
* ssd->state.squared which ssd_border_create() reacts to.
* TODO: Set the state here instead so the order does not matter
* anymore.
*/
ssd_titlebar_create(ssd);
ssd_border_create(ssd);
@ -227,33 +227,19 @@ ssd_update_geometry(struct ssd *ssd)
struct wlr_box cached = ssd->state.geometry;
struct wlr_box current = view->current;
int min_view_width = rc.theme->window_button_width * (
wl_list_length(&rc.title_buttons_left) + wl_list_length(&rc.title_buttons_right));
int eff_width = current.width;
int eff_height = view_effective_height(view, /* use_pending */ false);
if (eff_width > 0 && eff_width < min_view_width) {
/*
* Prevent negative values in calculations like
* `width - theme->window_button_width
* * (wl_list_length(&rc.title_buttons_left)
* + wl_list_length(&rc.title_buttons_right))`
*/
wlr_log(WLR_ERROR,
"view width is smaller than its minimal value");
return;
}
bool update_area = eff_width != cached.width || eff_height != cached.height;
bool update_extents = update_area
|| current.x != cached.x || current.y != cached.y;
bool maximized = view->maximized == VIEW_AXIS_BOTH;
bool tiled_not_maximized = view_is_tiled(view) && !maximized;
bool squared = ssd_should_be_squared(ssd);
bool state_changed = ssd->state.was_maximized != maximized
|| ssd->state.was_shaded != view->shaded
|| ssd->state.was_tiled_not_maximized != tiled_not_maximized
|| ssd->state.was_squared != squared
|| ssd->state.was_omnipresent != view->visible_on_all_workspaces;
if (update_extents) {