mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-03 09:01:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg: Use view_center() for parent-relative centering

Browse source 
- Add optional struct wlr_box* ref argument to view_center()
- Perform margin adjustment within view_center()
- Expose view_output() to fetch parent's output
This commit is contained in:
John Lindgren 2023-02-19 12:42:21 -05:00
parent 612c296d52
commit 74bc16910a
4 changed files with 26 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/xdg.c
View file

@ -273,12 +273,12 @@ lookup_view_by_xdg_toplevel(struct server *server,
static void
position_xdg_toplevel_view(struct view *view)
{
struct wlr_xdg_surface *xdg_surface = xdg_surface_from_view(view);
struct wlr_xdg_toplevel *parent_xdg_toplevel =
xdg_toplevel_from_view(view)->parent;
if (!parent_xdg_toplevel) {
view_center(view, output_from_cursor_coords(view->server));
view_center(view, output_from_cursor_coords(view->server),
NULL);
} else {
/*
* If child-toplevel-views, we center-align relative to their
@ -287,17 +287,8 @@ position_xdg_toplevel_view(struct view *view)
struct view *parent = lookup_view_by_xdg_toplevel(
view->server, parent_xdg_toplevel);
assert(parent);
int center_x = parent->current.x + parent->current.width / 2;
int center_y = parent->current.y + parent->current.height / 2;
view->current.x = center_x
- xdg_surface->current.geometry.width / 2;
view->current.y = center_y
- xdg_surface->current.geometry.height / 2;
view_center(view, view_output(parent), &parent->pending);
}
struct border margin = ssd_get_margin(view->ssd);
view->current.x += margin.left;
view->current.y += margin.top;
}
static const char *