mirror of
https://github.com/hyprwm/wlroots-hyprland.git
synced 2024-11-22 12:55:58 +01:00
layer-shell: check the configured flag earlier
This commit is contained in:
parent
ffa8e3ec81
commit
e1c2671725
1 changed files with 8 additions and 8 deletions
|
@ -307,6 +307,13 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (wlr_surface_has_buffer(surface->surface) && !surface->configured) {
|
||||||
|
wl_resource_post_error(surface->resource,
|
||||||
|
ZWLR_LAYER_SHELL_V1_ERROR_ALREADY_CONSTRUCTED,
|
||||||
|
"layer_surface has never been configured");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT |
|
||||||
ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT;
|
||||||
if (surface->pending.desired_width == 0 &&
|
if (surface->pending.desired_width == 0 &&
|
||||||
|
@ -330,13 +337,6 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
|
||||||
surface->current = surface->pending;
|
surface->current = surface->pending;
|
||||||
surface->pending.committed = 0;
|
surface->pending.committed = 0;
|
||||||
|
|
||||||
if (wlr_surface_has_buffer(surface->surface) && !surface->configured) {
|
|
||||||
wl_resource_post_error(surface->resource,
|
|
||||||
ZWLR_LAYER_SHELL_V1_ERROR_ALREADY_CONSTRUCTED,
|
|
||||||
"layer_surface has never been configured");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!surface->added) {
|
if (!surface->added) {
|
||||||
surface->added = true;
|
surface->added = true;
|
||||||
wl_signal_emit_mutable(&surface->shell->events.new_surface, surface);
|
wl_signal_emit_mutable(&surface->shell->events.new_surface, surface);
|
||||||
|
@ -345,7 +345,7 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (surface->configured && wlr_surface_has_buffer(wlr_surface)) {
|
if (wlr_surface_has_buffer(wlr_surface)) {
|
||||||
wlr_surface_map(wlr_surface);
|
wlr_surface_map(wlr_surface);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue