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

ssd: use view->pending for size calculations

Browse source 
...to avoid the titlebar being out-of-sync with the view size.

Fixes: #1194 (not confirmed yet)
This commit is contained in:
Johan Malm 2023-10-21 15:23:44 +01:00
parent 048d22d473
commit 3b927899ab
4 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/ssd/ssd.c
View file

@ -62,10 +62,10 @@ ssd_max_extents(struct view *view)
assert(view); assert(view);
struct border border = ssd_thickness(view); struct border border = ssd_thickness(view);
return (struct wlr_box){ return (struct wlr_box){
.x = view->current.x - border.left, .x = view->pending.x - border.left,
.y = view->current.y - border.top, .y = view->pending.y - border.top,
.width = view->current.width + border.left + border.right, .width = view->pending.width + border.left + border.right,
.height = view->current.height + border.top + border.bottom, .height = view->pending.height + border.top + border.bottom,
}; };
} }
@ -191,7 +191,7 @@ ssd_create(struct view *view, bool active)
ssd->margin = ssd_thickness(view); ssd->margin = ssd_thickness(view);
ssd_set_active(ssd, active); ssd_set_active(ssd, active);
ssd_enable_keybind_inhibit_indicator(ssd, view->inhibits_keybinds); ssd_enable_keybind_inhibit_indicator(ssd, view->inhibits_keybinds);
ssd->state.geometry = view->current; ssd->state.geometry = view->pending;
return ssd; return ssd;
} }
@ -219,12 +219,12 @@ ssd_update_geometry(struct ssd *ssd)
} }
struct wlr_box cached = ssd->state.geometry; struct wlr_box cached = ssd->state.geometry;
struct wlr_box current = ssd->view->current; struct wlr_box pending = ssd->view->pending;
if (current.width == cached.width && current.height == cached.height) { if (pending.width == cached.width && pending.height == cached.height) {
if (current.x != cached.x || current.y != cached.y) { if (pending.x != cached.x || pending.y != cached.y) {
/* Dynamically resize extents based on position and usable_area */ /* Dynamically resize extents based on position and usable_area */
ssd_extents_update(ssd); ssd_extents_update(ssd);
ssd->state.geometry = current; ssd->state.geometry = pending;
} }
if (ssd->state.squared_corners != ssd->view->maximized) { if (ssd->state.squared_corners != ssd->view->maximized) {
ssd_border_update(ssd); ssd_border_update(ssd);
@ -235,7 +235,7 @@ ssd_update_geometry(struct ssd *ssd)
ssd_extents_update(ssd); ssd_extents_update(ssd);
ssd_border_update(ssd); ssd_border_update(ssd);
ssd_titlebar_update(ssd); ssd_titlebar_update(ssd);
ssd->state.geometry = current; ssd->state.geometry = pending;
} }
void void

8
src/ssd/ssd_border.c
View file

@ -19,8 +19,8 @@ ssd_border_create(struct ssd *ssd)
struct view *view = ssd->view; struct view *view = ssd->view;
struct theme *theme = view->server->theme; struct theme *theme = view->server->theme;
int width = view->current.width; int width = view->pending.width;
int height = view->current.height; int height = view->pending.height;
int full_width = width + 2 * theme->border_width; int full_width = width + 2 * theme->border_width;
float *color; float *color;
@ -81,8 +81,8 @@ ssd_border_update(struct ssd *ssd)
struct theme *theme = view->server->theme; struct theme *theme = view->server->theme;
int width = view->current.width; int width = view->pending.width;
int height = view->current.height; int height = view->pending.height;
int full_width = width + 2 * theme->border_width; int full_width = width + 2 * theme->border_width;
struct ssd_part *part; struct ssd_part *part;

4
src/ssd/ssd_extents.c
View file

@ -108,8 +108,8 @@ ssd_extents_update(struct ssd *ssd)
struct theme *theme = view->server->theme; struct theme *theme = view->server->theme;
int width = view->current.width; int width = view->pending.width;
int height = view->current.height; int height = view->pending.height;
int full_height = height + theme->border_width * 2 + ssd->titlebar.height; int full_height = height + theme->border_width * 2 + ssd->titlebar.height;
int full_width = width + 2 * theme->border_width; int full_width = width + 2 * theme->border_width;
int extended_area = SSD_EXTENDED_AREA; int extended_area = SSD_EXTENDED_AREA;

8
src/ssd/ssd_titlebar.c
View file

@ -24,7 +24,7 @@ ssd_titlebar_create(struct ssd *ssd)
{ {
struct view *view = ssd->view; struct view *view = ssd->view;
struct theme *theme = view->server->theme; struct theme *theme = view->server->theme;
int width = view->current.width; int width = view->pending.width;
float *color; float *color;
struct wlr_scene_tree *parent; struct wlr_scene_tree *parent;
@ -130,7 +130,7 @@ void
ssd_titlebar_update(struct ssd *ssd) ssd_titlebar_update(struct ssd *ssd)
{ {
struct view *view = ssd->view; struct view *view = ssd->view;
int width = view->current.width; int width = view->pending.width;
struct theme *theme = view->server->theme; struct theme *theme = view->server->theme;
if (view->maximized != ssd->state.squared_corners) { if (view->maximized != ssd->state.squared_corners) {
@ -218,7 +218,7 @@ ssd_update_title_positions(struct ssd *ssd)
{ {
struct view *view = ssd->view; struct view *view = ssd->view;
struct theme *theme = view->server->theme; struct theme *theme = view->server->theme;
int width = view->current.width; int width = view->pending.width;
int title_bg_width = width - SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT; int title_bg_width = width - SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT;
int x, y; int x, y;
@ -286,7 +286,7 @@ ssd_update_title(struct ssd *ssd)
struct ssd_part *part; struct ssd_part *part;
struct ssd_sub_tree *subtree; struct ssd_sub_tree *subtree;
struct ssd_state_title_width *dstate; struct ssd_state_title_width *dstate;
int title_bg_width = view->current.width int title_bg_width = view->pending.width
- SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT; - SSD_BUTTON_WIDTH * SSD_BUTTON_COUNT;
FOR_EACH_STATE(ssd, subtree) { FOR_EACH_STATE(ssd, subtree) {