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: make sizes of invisible SSD extents configurable

Browse source
This commit is contained in:
Andrew J. Hesford 2025-01-17 11:07:07 -05:00
parent fa6e524412
commit 6b9cc5dd64
6 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/config/rcxml.c
View file

@ -1225,6 +1225,8 @@ entry(xmlNode *node, char *nodename, char *content, struct parser_state *state)
set_bool(content, &rc.resize_draw_contents);
} else if (!strcasecmp(nodename, "cornerRange.resize")) {
rc.resize_corner_range = atoi(content);
} else if (!strcasecmp(nodename, "minimumArea.resize")) {
rc.resize_minimum_area = MAX(0, atoi(content));
} else if (!strcasecmp(nodename, "mouseEmulation.tablet")) {
set_bool(content, &rc.tablet.force_mouse_emulation);
} else if (!strcasecmp(nodename, "mapToOutput.tablet")) {
@ -1501,6 +1503,7 @@ rcxml_init(void)
rc.resize_indicator = LAB_RESIZE_INDICATOR_NEVER;
rc.resize_draw_contents = true;
rc.resize_corner_range = -1;
rc.resize_minimum_area = 8;
rc.workspace_config.popuptime = INT_MIN;
rc.workspace_config.min_nr_workspaces = 1;

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

@ -4,6 +4,7 @@
#include <pixman.h>
#include "common/mem.h"
#include "common/scene-helpers.h"
#include "config/rcxml.h"
#include "labwc.h"
#include "ssd-internal.h"
#include "theme.h"
@ -25,7 +26,8 @@ ssd_extents_create(struct ssd *ssd)
struct view *view = ssd->view;
struct theme *theme = view->server->theme;
struct wl_list *part_list = &ssd->extents.parts;
int extended_area = SSD_EXTENDED_AREA;
int border_width = MAX(0, MAX(rc.resize_minimum_area, theme->border_width));
ssd->extents.tree = wlr_scene_tree_create(ssd->tree);
struct wlr_scene_tree *parent = ssd->extents.tree;
@ -34,8 +36,7 @@ ssd_extents_create(struct ssd *ssd)
}
wl_list_init(&ssd->extents.parts);
wlr_scene_node_set_position(&parent->node,
-(theme->border_width + extended_area),
-(ssd->titlebar.height + theme->border_width + extended_area));
-border_width, -(ssd->titlebar.height + border_width));
add_extent(part_list, LAB_SSD_PART_TOP, parent);
add_extent(part_list, LAB_SSD_PART_LEFT, parent);
@ -68,7 +69,8 @@ ssd_extents_update(struct ssd *ssd)
int height = view_effective_height(view, /* use_pending */ false);
int full_height = height + theme->border_width * 2 + ssd->titlebar.height;
int full_width = width + 2 * theme->border_width;
int extended_area = SSD_EXTENDED_AREA;
int border_width = MAX(rc.resize_minimum_area, theme->border_width);
int extended_area = MAX(0, rc.resize_minimum_area - theme->border_width);
struct wlr_box part_box;
struct wlr_box result_box;
@ -78,8 +80,7 @@ ssd_extents_update(struct ssd *ssd)
/* Make sure we update the y offset based on titlebar shown / hidden */
wlr_scene_node_set_position(&ssd->extents.tree->node,
-(theme->border_width + extended_area),
-(ssd->titlebar.height + theme->border_width + extended_area));
-border_width, -(ssd->titlebar.height + border_width));
/*
* Convert all output usable areas that the