mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-04-11 08:21:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ssd: allow ssd to be smaller than minimal size

Browse source 
With 2603dbf labwc refused to update ssd geometry when its geometry is
smaller than minimal size in order to prevent passing negative values in
wlr_scene_rect_set_size(), but it made ssd for small windows like
workrave ugly. So this commit fixes the negative values for each call to
wlr_scene_rect_set_size() individually rather than just early-return in
ssd_update_geometry().
This commit is contained in:
tokyo4j 2024-07-01 20:45:29 +09:00
parent b8c3e064e7
commit 69ef285ebd
5 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ssd/ssd-border.c
View file

@ -114,6 +114,7 @@ ssd_border_update(struct ssd *ssd)
int top_width = ssd->titlebar.height <= 0 || ssd->state.was_tiled_not_maximized int top_width = ssd->titlebar.height <= 0 || ssd->state.was_tiled_not_maximized
? full_width ? full_width
: width - 2 * SSD_BUTTON_WIDTH; : width - 2 * SSD_BUTTON_WIDTH;
top_width = MAX(0, top_width);
int top_x = ssd->titlebar.height <= 0 || ssd->state.was_tiled_not_maximized int top_x = ssd->titlebar.height <= 0 || ssd->state.was_tiled_not_maximized
? 0 ? 0
: theme->border_width + SSD_BUTTON_WIDTH; : theme->border_width + SSD_BUTTON_WIDTH;

3
src/ssd/ssd-extents.c
View file

@ -113,6 +113,9 @@ ssd_extents_update(struct ssd *ssd)
int side_width = full_width + extended_area * 2 - corner_size * 2; int side_width = full_width + extended_area * 2 - corner_size * 2;
int side_height = full_height + extended_area * 2 - corner_size * 2; int side_height = full_height + extended_area * 2 - corner_size * 2;
side_width = MAX(0, side_width);
side_height = MAX(0, side_height);
struct wlr_box part_box; struct wlr_box part_box;
struct wlr_box result_box; struct wlr_box result_box;
struct ssd_part *part; struct ssd_part *part;

8
src/ssd/ssd-shadow.c
View file

@ -131,7 +131,7 @@ set_shadow_part_geometry(struct ssd_part *part, int width, int height,
y = -titlebar_height + inset; y = -titlebar_height + inset;
wlr_scene_node_set_position(part->node, x, y); wlr_scene_node_set_position(part->node, x, y);
wlr_scene_buffer_set_dest_size( wlr_scene_buffer_set_dest_size(
scene_buf, visible_shadow_width, height - 2 * inset); scene_buf, visible_shadow_width, MAX(0, height - 2 * inset));
wlr_scene_node_set_enabled(part->node, show_sides); wlr_scene_node_set_enabled(part->node, show_sides);
break; break;
case LAB_SSD_PART_BOTTOM: case LAB_SSD_PART_BOTTOM:
@ -139,7 +139,7 @@ set_shadow_part_geometry(struct ssd_part *part, int width, int height,
y = -titlebar_height + height; y = -titlebar_height + height;
wlr_scene_node_set_position(part->node, x, y); wlr_scene_node_set_position(part->node, x, y);
wlr_scene_buffer_set_dest_size( wlr_scene_buffer_set_dest_size(
scene_buf, width - 2 * inset, visible_shadow_width); scene_buf, MAX(0, width - 2 * inset), visible_shadow_width);
wlr_scene_node_set_enabled(part->node, show_topbottom); wlr_scene_node_set_enabled(part->node, show_topbottom);
break; break;
case LAB_SSD_PART_LEFT: case LAB_SSD_PART_LEFT:
@ -147,7 +147,7 @@ set_shadow_part_geometry(struct ssd_part *part, int width, int height,
y = -titlebar_height + inset; y = -titlebar_height + inset;
wlr_scene_node_set_position(part->node, x, y); wlr_scene_node_set_position(part->node, x, y);
wlr_scene_buffer_set_dest_size( wlr_scene_buffer_set_dest_size(
scene_buf, visible_shadow_width, height - 2 * inset); scene_buf, visible_shadow_width, MAX(0, height - 2 * inset));
wlr_scene_node_set_enabled(part->node, show_sides); wlr_scene_node_set_enabled(part->node, show_sides);
break; break;
case LAB_SSD_PART_TOP: case LAB_SSD_PART_TOP:
@ -155,7 +155,7 @@ set_shadow_part_geometry(struct ssd_part *part, int width, int height,
y = -titlebar_height - visible_shadow_width; y = -titlebar_height - visible_shadow_width;
wlr_scene_node_set_position(part->node, x, y); wlr_scene_node_set_position(part->node, x, y);
wlr_scene_buffer_set_dest_size( wlr_scene_buffer_set_dest_size(
scene_buf, width - 2 * inset, visible_shadow_width); scene_buf, MAX(0, width - 2 * inset), visible_shadow_width);
wlr_scene_node_set_enabled(part->node, show_topbottom); wlr_scene_node_set_enabled(part->node, show_topbottom);
break; break;
default: default:

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

@ -218,7 +218,8 @@ ssd_titlebar_update(struct ssd *ssd)
case LAB_SSD_PART_TITLEBAR: case LAB_SSD_PART_TITLEBAR:
wlr_scene_rect_set_size( wlr_scene_rect_set_size(
wlr_scene_rect_from_node(part->node), wlr_scene_rect_from_node(part->node),
width - SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT, MAX(0, width -
SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT),
theme->title_height); theme->title_height);
continue; continue;
case LAB_SSD_BUTTON_ICONIFY: case LAB_SSD_BUTTON_ICONIFY:

10
src/ssd/ssd.c
View file

@ -230,16 +230,6 @@ ssd_update_geometry(struct ssd *ssd)
int eff_width = current.width; int eff_width = current.width;
int eff_height = view_effective_height(ssd->view, /* use_pending */ false); int eff_height = view_effective_height(ssd->view, /* use_pending */ false);
if (eff_width > 0 && eff_width < LAB_MIN_VIEW_WIDTH) {
/*
* Prevent negative values in calculations like
* `width - SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT`
*/
wlr_log(WLR_ERROR,
"view width is smaller than its minimal value");
return;
}
if (eff_width == cached.width && eff_height == cached.height) { if (eff_width == cached.width && eff_height == cached.height) {
if (current.x != cached.x || current.y != cached.y) { if (current.x != cached.x || current.y != cached.y) {
/* Dynamically resize extents based on position and usable_area */ /* Dynamically resize extents based on position and usable_area */