mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-28 01:40:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ssd: also add spacing between innermost button and title

Browse source 
Currently, left-aligned title text gets pushed right up to the window
icon with no spacing at all, which looks bad IMO.
This commit is contained in:
John Lindgren 2024-09-30 12:27:19 -04:00 • committed by Johan Malm
parent 014d07651f
commit ce0ce2aae7
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/ssd/ssd-titlebar.c
View file

@ -272,11 +272,12 @@ update_visible_buttons(struct ssd *ssd)
/* /*
* The corner-left button is lastly removed as it's usually a window * The corner-left button is lastly removed as it's usually a window
* menu button (or an app icon button in the future). * menu button (or an app icon button in the future).
*
* There is spacing to the inside of each button, including between the
* innermost buttons and the window title. See also get_title_offsets().
*/ */
while (width < while (width < ((button_width + button_spacing)
((button_width * (button_count_left + button_count_right)) + * (button_count_left + button_count_right))) {
(MAX((button_count_right - 1), 0) * button_spacing) +
(MAX((button_count_left - 1), 0) * button_spacing))) {
if (button_count_left > button_count_right) { if (button_count_left > button_count_right) {
button_count_left--; button_count_left--;
} else { } else {
@ -486,15 +487,13 @@ get_title_offsets(struct ssd *ssd, int *offset_left, int *offset_right)
wl_list_for_each(b, &rc.title_buttons_left, link) { wl_list_for_each(b, &rc.title_buttons_left, link) {
struct ssd_part *part = ssd_get_part(&subtree->parts, b->type); struct ssd_part *part = ssd_get_part(&subtree->parts, b->type);
if (part->node->enabled) { if (part->node->enabled) {
*offset_left += *offset_left > padding_width ? button_spacing : 0; *offset_left += button_width + button_spacing;
*offset_left += button_width;
} }
} }
wl_list_for_each_reverse(b, &rc.title_buttons_right, link) { wl_list_for_each_reverse(b, &rc.title_buttons_right, link) {
struct ssd_part *part = ssd_get_part(&subtree->parts, b->type); struct ssd_part *part = ssd_get_part(&subtree->parts, b->type);
if (part->node->enabled) { if (part->node->enabled) {
*offset_right += *offset_right > padding_width ? button_spacing : 0; *offset_right += button_width + button_spacing;
*offset_right += button_width;
} }
} }
} }