nordic-dev.net/wlroots
2
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2024-11-22 15:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

xdg-shell: rename wlr_xdg_popup.committed to sent_initial_configure

Browse Source 
We made a similar change to wlr_xdg_toplevel.
This commit is contained in:
Simon Ser 2023-01-31 16:16:54 +01:00
parent df0c926a7a
commit 0f24d27e0b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_xdg_shell.h
View File

@ -99,7 +99,7 @@ struct wlr_xdg_popup {
struct wl_list link; struct wl_list link;
struct wl_resource *resource; struct wl_resource *resource;
bool committed; bool sent_initial_configure;
struct wlr_surface *parent; struct wlr_surface *parent;
struct wlr_seat *seat; struct wlr_seat *seat;

8
types/xdg_shell/wlr_xdg_popup.c
View File

@ -245,9 +245,9 @@ void handle_xdg_popup_committed(struct wlr_xdg_popup *popup) {
return; return;
} }
if (!popup->committed) { if (!popup->sent_initial_configure) {
wlr_xdg_surface_schedule_configure(popup->base); wlr_xdg_surface_schedule_configure(popup->base);
popup->committed = true; popup->sent_initial_configure = true;
return; return;
} }
@ -274,7 +274,7 @@ static void xdg_popup_handle_grab(struct wl_client *client,
struct wlr_seat_client *seat_client = struct wlr_seat_client *seat_client =
wlr_seat_client_from_resource(seat_resource); wlr_seat_client_from_resource(seat_resource);
if (popup->committed) { if (popup->sent_initial_configure) {
wl_resource_post_error(popup->resource, wl_resource_post_error(popup->resource,
XDG_POPUP_ERROR_INVALID_GRAB, XDG_POPUP_ERROR_INVALID_GRAB,
"xdg_popup is already mapped"); "xdg_popup is already mapped");
@ -450,7 +450,7 @@ void unmap_xdg_popup(struct wlr_xdg_popup *popup) {
popup->seat = NULL; popup->seat = NULL;
} }
popup->committed = false; popup->sent_initial_configure = false;
} }
void destroy_xdg_popup(struct wlr_xdg_popup *popup) { void destroy_xdg_popup(struct wlr_xdg_popup *popup) {