mirror of
https://codeberg.org/dwl/dwl.git
synced 2025-10-27 10:14:14 +00:00
Merge remote-tracking branch 'djpohly/wlroots-next' into input-protocol
This commit is contained in:
commit
40ae52067f
8
dwl.c
8
dwl.c
@ -633,7 +633,7 @@ arrangelayer(Monitor *m, struct wl_list *list, struct wlr_box *usable_area, int
|
|||||||
box.y -= state->margin.bottom;
|
box.y -= state->margin.bottom;
|
||||||
}
|
}
|
||||||
if (box.width < 0 || box.height < 0) {
|
if (box.width < 0 || box.height < 0) {
|
||||||
wlr_layer_surface_v1_close(wlr_layer_surface);
|
wlr_layer_surface_v1_destroy(wlr_layer_surface);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
layersurface->geo = box;
|
layersurface->geo = box;
|
||||||
@ -1014,13 +1014,13 @@ createlayersurface(struct wl_listener *listener, void *data)
|
|||||||
wlr_layer_surface->data = layersurface;
|
wlr_layer_surface->data = layersurface;
|
||||||
|
|
||||||
m = wlr_layer_surface->output->data;
|
m = wlr_layer_surface->output->data;
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user