toby/dwl
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'wlroots-next' into HEAD

Browse source
This commit is contained in:
Leonardo Hernandez Hernandez 2021-10-26 21:24:35 -05:00
commit 05ac420342
Failed to generate hash of commit
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dwl.c
View file

@ -781,7 +781,7 @@ commitnotify(struct wl_listener *listener, void *data)
Client *c = wl_container_of(listener, c, commit); Client *c = wl_container_of(listener, c, commit);
/* mark a pending resize as completed */ /* 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; c->resize = 0;
} }
@ -922,17 +922,17 @@ createlayersurface(struct wl_listener *listener, void *data)
m = wlr_layer_surface->output->data; m = wlr_layer_surface->output->data;
layersurface->scene = wlr_scene_subsurface_tree_create( layersurface->scene = wlr_scene_subsurface_tree_create(
layers[wlr_layer_surface->client_pending.layer], layers[wlr_layer_surface->pending.layer],
wlr_layer_surface->surface); wlr_layer_surface->surface);
layersurface->scene->data = layersurface; 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); &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 // so that we can easily arrange it
old_state = wlr_layer_surface->current; 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); arrangelayers(m);
wlr_layer_surface->current = old_state; wlr_layer_surface->current = old_state;
} }