Merge branch 'wlroots-next' into HEAD
This commit is contained in:
commit
05ac420342
10
dwl.c
10
dwl.c
@ -781,7 +781,7 @@ commitnotify(struct wl_listener *listener, void *data)
|
||||
Client *c = wl_container_of(listener, c, commit);
|
||||
|
||||
/* mark a pending resize as completed */
|
||||
if (c->resize && c->resize <= c->surface.xdg->configure_serial)
|
||||
if (c->resize && c->resize <= c->surface.xdg->current.configure_serial)
|
||||
c->resize = 0;
|
||||
}
|
||||
|
||||
@ -922,17 +922,17 @@ createlayersurface(struct wl_listener *listener, void *data)
|
||||
m = wlr_layer_surface->output->data;
|
||||
|
||||
layersurface->scene = wlr_scene_subsurface_tree_create(
|
||||
layers[wlr_layer_surface->client_pending.layer],
|
||||
layers[wlr_layer_surface->pending.layer],
|
||||
wlr_layer_surface->surface);
|
||||
layersurface->scene->data = layersurface;
|
||||
|
||||
wl_list_insert(&m->layers[wlr_layer_surface->client_pending.layer],
|
||||
wl_list_insert(&m->layers[wlr_layer_surface->pending.layer],
|
||||
&layersurface->link);
|
||||
|
||||
// Temporarily set the layer's current state to client_pending
|
||||
// Temporarily set the layer's current state to pending
|
||||
// so that we can easily arrange it
|
||||
old_state = wlr_layer_surface->current;
|
||||
wlr_layer_surface->current = wlr_layer_surface->client_pending;
|
||||
wlr_layer_surface->current = wlr_layer_surface->pending;
|
||||
arrangelayers(m);
|
||||
wlr_layer_surface->current = old_state;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user