mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't set view->w and view->h when mapping xdg views

Browse source 
these should only be set on commit. doing so before then confuses
code that expects these fields to be in sync with the scene tree,
such as `handle_commit`.

these were only being set so that `view_center` could read them to
compute a centered position, so instead we can simply forward the
values directly to `view_compute_centered_position` and `view_move`.
This commit is contained in:
bi4k8 2022-12-17 20:47:46 +00:00 • committed by Consolatis
parent 3dec9cf40c
commit 1b30edc778
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/view.h
View file

@ -159,6 +159,9 @@ void view_reload_ssd(struct view *view);
void view_impl_map(struct view *view);
void view_adjust_size(struct view *view, int *w, int *h);
bool view_compute_centered_position(struct view *view, int w, int h,
int *x, int *y);
void view_on_output_destroy(struct view *view);
void view_destroy(struct view *view);

2
src/view.c
View file

@ -267,7 +267,7 @@ view_output(struct view *view)
return output_from_wlr_output(view->server, wlr_output);
}
static bool
bool
view_compute_centered_position(struct view *view, int w, int h, int *x, int *y)
{
struct output *output = view_output(view);

17
src/xdg.c
View file

@ -285,10 +285,19 @@ position_xdg_toplevel_view(struct view *view)
output_usable_area_from_cursor_coords(view->server);
view->x = box.x;
view->y = box.y;
view->w = xdg_surface->current.geometry.width;
view->h = xdg_surface->current.geometry.height;
if (view->w && view->h) {
view_center(view);
/* Center the view without touching its w and h fields. This means we
* can't simply set w/h and call view_center(). w and h fields should
* only be modified at commit, or they will not be in sync with the
* scene tree
*/
int w = xdg_surface->current.geometry.width;
int h = xdg_surface->current.geometry.height;
if (w && h) {
int x, y;
if (view_compute_centered_position(view, w, h, &x, &y)) {
view_move(view, x, y);
}
}
} else {
/*