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: improve positioning of new xdg-toplevel views

Browse source 
Top/left align topmost parent.
Center-align children relative to parent.
This commit is contained in:
Johan Malm 2021-03-20 14:30:45 +00:00
parent 8898693160
commit 04d2ae39a9
1 changed files with 40 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/xdg.c
View file

@ -203,6 +203,43 @@ istopmost(struct view *view)
return view->xdg_surface->toplevel->parent == NULL; return view->xdg_surface->toplevel->parent == NULL;
} }
static struct view *
parent_of(struct view *view)
{
struct view *p;
wl_list_for_each (p, &view->server->views, link) {
if (p->xdg_surface == view->xdg_surface->toplevel->parent) {
return p;
}
}
return NULL;
}
static void
position_xdg_toplevel_view(struct view *view)
{
if (istopmost(view)) {
/*
* For topmost xdg-toplevel, we just top/left align for the
* time being
*/
view->x = view->y = 0;
} else {
/*
* If child-toplevel-views, we center-align relative to their
* parents
*/
struct view *parent = parent_of(view);
assert(parent);
int center_x = parent->x + parent->w / 2;
int center_y = parent->y + parent->h / 2;
view->x = center_x - view->xdg_surface->geometry.width / 2;
view->y = center_y - view->xdg_surface->geometry.height / 2;
}
view->x += view->margin.left - view->padding.left;
view->y += view->margin.top - view->padding.top;
}
static void static void
xdg_toplevel_view_map(struct view *view) xdg_toplevel_view_map(struct view *view)
{ {
@ -214,17 +251,13 @@ xdg_toplevel_view_map(struct view *view)
* and keep code simple * and keep code simple
*/ */
view_maximize(view, false); view_maximize(view, false);
view->server_side_deco = has_ssd(view); view->server_side_deco = has_ssd(view);
/* align to edge of screen */
if (view->server_side_deco) { if (view->server_side_deco) {
view->margin = deco_thickness(view); view->margin = deco_thickness(view);
view->x += view->margin.left;
view->y += view->margin.top;
} else {
update_padding(view);
view->x -= view->padding.left;
view->y -= view->padding.top;
} }
update_padding(view);
position_xdg_toplevel_view(view);
} }
view->been_mapped = true; view->been_mapped = true;