summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevin J. Pohly <djpohly@gmail.com>2021-12-16 10:59:13 -0600
committerDevin J. Pohly <djpohly@gmail.com>2021-12-16 10:59:13 -0600
commit2315462f9695e9b71ef2a980a1dbd3ce9f4ba702 (patch)
tree1800b599b336dc425c9f7b11598d7ec80ac9cc4d
parentc71a3ac59429ebe2975490bacb388856fec11f9f (diff)
parent05ac42034257bdc2c7d7f8aa59c5086adcd3975c (diff)
Merge commit 'refs/pull/162/head' of github:djpohly/dwl into scenegraph3
-rw-r--r--dwl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dwl.c b/dwl.c
index 10f94f7..58a1bd9 100644
--- a/dwl.c
+++ b/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,7 +922,7 @@ 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;