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

view: add 'struct border margin'

Browse source 
Simplify various view interfaces as a result
This commit is contained in:
Johan Malm 2020-09-15 20:41:01 +01:00
parent 5a77c84fc8
commit 090e78b85a
9 changed files with 91 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/xwayland.c
View file

@ -55,12 +55,10 @@ static void _close(struct view *view)
wlr_xwayland_surface_close(view->xwayland_surface);
}
static bool want_ssd(struct view *view)
static bool want_deco(struct view *view)
{
if (view->xwayland_surface->decorations !=
WLR_XWAYLAND_SURFACE_DECORATIONS_ALL)
return false;
return true;
return view->xwayland_surface->decorations ==
WLR_XWAYLAND_SURFACE_DECORATIONS_ALL;
}
static void map(struct view *view)
@ -68,12 +66,20 @@ static void map(struct view *view)
view->mapped = true;
view->x = view->xwayland_surface->x;
view->y = view->xwayland_surface->y;
view->w = view->xwayland_surface->width;
view->h = view->xwayland_surface->height;
view->surface = view->xwayland_surface->surface;
if (!view->been_mapped) {
view->show_server_side_deco = want_ssd(view);
view_init_position(view);
}
view->been_mapped = true;
view->show_server_side_deco = want_deco(view);
view->margin = deco_max_extents(view);
/* ensure we're inside screen */
view->x += view->margin.left;
view->y += view->margin.top;
struct wlr_box box = {
.x = view->x, .y = view->y, .width = view->w, .height = view->h
};
view->impl->configure(view, box);
/* Add commit here, as xwayland map/unmap can change the wlr_surface */
wl_signal_add(&view->xwayland_surface->surface->events.commit,