mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-02-27 01:40:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/xdg-popup.c: delay popup unconstrain until after first commit

Browse source 
Fixes: #1372
This commit is contained in:
Consolatis 2024-02-24 23:16:55 +01:00 • committed by Johan Malm
parent 598ab9bcff
commit ccbc75571a
1 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/xdg-popup.c
View file

@ -16,15 +16,17 @@ struct xdg_popup {
struct view *parent_view; struct view *parent_view;
struct wlr_xdg_popup *wlr_popup; struct wlr_xdg_popup *wlr_popup;
struct wl_listener commit;
struct wl_listener destroy; struct wl_listener destroy;
struct wl_listener new_popup; struct wl_listener new_popup;
}; };
static void static void
popup_unconstrain(struct view *view, struct wlr_xdg_popup *popup) popup_unconstrain(struct xdg_popup *popup)
{ {
struct view *view = popup->parent_view;
struct server *server = view->server; struct server *server = view->server;
struct wlr_box *popup_box = &popup->current.geometry; struct wlr_box *popup_box = &popup->wlr_popup->current.geometry;
struct wlr_output_layout *output_layout = server->output_layout; struct wlr_output_layout *output_layout = server->output_layout;
struct wlr_output *wlr_output = wlr_output_layout_output_at( struct wlr_output *wlr_output = wlr_output_layout_output_at(
output_layout, view->current.x + popup_box->x, output_layout, view->current.x + popup_box->x,
@ -39,7 +41,7 @@ popup_unconstrain(struct view *view, struct wlr_xdg_popup *popup)
.width = output_box.width, .width = output_box.width,
.height = output_box.height, .height = output_box.height,
}; };
wlr_xdg_popup_unconstrain_from_box(popup, &output_toplevel_box); wlr_xdg_popup_unconstrain_from_box(popup->wlr_popup, &output_toplevel_box);
} }
static void static void
@ -48,9 +50,28 @@ handle_xdg_popup_destroy(struct wl_listener *listener, void *data)
struct xdg_popup *popup = wl_container_of(listener, popup, destroy); struct xdg_popup *popup = wl_container_of(listener, popup, destroy);
wl_list_remove(&popup->destroy.link); wl_list_remove(&popup->destroy.link);
wl_list_remove(&popup->new_popup.link); wl_list_remove(&popup->new_popup.link);
/* Usually already removed unless there was no commit at all */
if (popup->commit.notify) {
wl_list_remove(&popup->commit.link);
}
free(popup); free(popup);
} }
static void
handle_xdg_popup_commit(struct wl_listener *listener, void *data)
{
struct xdg_popup *popup = wl_container_of(listener, popup, commit);
if (popup->wlr_popup->base->initial_commit) {
popup_unconstrain(popup);
/* Prevent getting called over and over again */
wl_list_remove(&popup->commit.link);
popup->commit.notify = NULL;
}
}
static void static void
popup_handle_new_xdg_popup(struct wl_listener *listener, void *data) popup_handle_new_xdg_popup(struct wl_listener *listener, void *data)
{ {
@ -75,9 +96,13 @@ xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup)
popup->destroy.notify = handle_xdg_popup_destroy; popup->destroy.notify = handle_xdg_popup_destroy;
wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy); wl_signal_add(&wlr_popup->base->events.destroy, &popup->destroy);
popup->new_popup.notify = popup_handle_new_xdg_popup; popup->new_popup.notify = popup_handle_new_xdg_popup;
wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup); wl_signal_add(&wlr_popup->base->events.new_popup, &popup->new_popup);
popup->commit.notify = handle_xdg_popup_commit;
wl_signal_add(&wlr_popup->base->surface->events.commit, &popup->commit);
/* /*
* We must add xdg popups to the scene graph so they get rendered. The * We must add xdg popups to the scene graph so they get rendered. The
* wlroots scene graph provides a helper for this, but to use it we must * wlroots scene graph provides a helper for this, but to use it we must
@ -100,6 +125,4 @@ xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup)
wlr_scene_xdg_surface_create(parent_tree, wlr_popup->base); wlr_scene_xdg_surface_create(parent_tree, wlr_popup->base);
node_descriptor_create(wlr_popup->base->surface->data, node_descriptor_create(wlr_popup->base->surface->data,
LAB_NODE_DESC_XDG_POPUP, view); LAB_NODE_DESC_XDG_POPUP, view);
popup_unconstrain(view, wlr_popup);
} }