diff options
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell.h | 2 | ||||
| -rw-r--r-- | types/xdg_shell/wlr_xdg_popup.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index 03d7c92b..d017a2ae 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -99,7 +99,7 @@ struct wlr_xdg_popup { struct wl_list link; struct wl_resource *resource; - bool committed; + bool sent_initial_configure; struct wlr_surface *parent; struct wlr_seat *seat; diff --git a/types/xdg_shell/wlr_xdg_popup.c b/types/xdg_shell/wlr_xdg_popup.c index e6bdb8aa..d9c59881 100644 --- a/types/xdg_shell/wlr_xdg_popup.c +++ b/types/xdg_shell/wlr_xdg_popup.c @@ -245,9 +245,9 @@ void handle_xdg_popup_committed(struct wlr_xdg_popup *popup) { return; } - if (!popup->committed) { + if (!popup->sent_initial_configure) { wlr_xdg_surface_schedule_configure(popup->base); - popup->committed = true; + popup->sent_initial_configure = true; return; } @@ -274,7 +274,7 @@ static void xdg_popup_handle_grab(struct wl_client *client, struct wlr_seat_client *seat_client = wlr_seat_client_from_resource(seat_resource); - if (popup->committed) { + if (popup->sent_initial_configure) { wl_resource_post_error(popup->resource, XDG_POPUP_ERROR_INVALID_GRAB, "xdg_popup is already mapped"); @@ -450,7 +450,7 @@ void unmap_xdg_popup(struct wlr_xdg_popup *popup) { popup->seat = NULL; } - popup->committed = false; + popup->sent_initial_configure = false; } void destroy_xdg_popup(struct wlr_xdg_popup *popup) { |