xdg-shell: remove view->padding

With the wlroots scene-graph API, the padding variable is no longer
needed for windows with Client Side Decoration (CSD).
This commit is contained in:
Johan Malm 2022-04-20 17:00:43 +01:00 committed by Johan Malm
parent 286b2146c3
commit b27955050f
4 changed files with 14 additions and 54 deletions

View file

@ -42,12 +42,6 @@ handle_commit(struct wl_listener *listener, void *data)
view->w = size.width;
view->h = size.height;
/* padding changes with maximize/unmaximize */
view->padding.top = size.y;
view->padding.bottom = size.y;
view->padding.left = size.x;
view->padding.right = size.x;
uint32_t serial = view->pending_move_resize.configure_serial;
if (serial > 0 && serial >= view->xdg_surface->current.configure_serial) {
if (view->pending_move_resize.update_x) {
@ -211,17 +205,6 @@ xdg_toplevel_view_close(struct view *view)
wlr_xdg_toplevel_send_close(view->xdg_surface->toplevel);
}
static void
update_padding(struct view *view)
{
struct wlr_box padding;
wlr_xdg_surface_get_geometry(view->xdg_surface, &padding);
view->padding.top = padding.y;
view->padding.bottom = padding.y;
view->padding.left = padding.x;
view->padding.right = padding.x;
}
static void
xdg_toplevel_view_maximize(struct view *view, bool maximized)
{
@ -287,8 +270,8 @@ position_xdg_toplevel_view(struct view *view)
view->x = center_x - view->xdg_surface->current.geometry.width / 2;
view->y = center_y - view->xdg_surface->current.geometry.height / 2;
}
view->x += view->margin.left - view->padding.left;
view->y += view->margin.top - view->padding.top;
view->x += view->margin.left;
view->y += view->margin.top;
}
static const char *
@ -323,7 +306,6 @@ xdg_toplevel_view_map(struct view *view)
ssd_create(view);
}
update_padding(view);
if (!view->fullscreen && requested->fullscreen) {
view_set_fullscreen(view, true,
requested->fullscreen_output);