mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/xdg-popup.c: choose output depending on xdg-positioner

Browse source 
wlr_popup->current.geometry.{x,y} are usually zero on initial commit, so
xdg-popups were always unconstrained against the output which contains
the top-left of the parent toplevel.

This commit changes xdg-popups to be unconstrained against the output
which contains the top-left of preliminary popup geometry designated by
xdg-positioner given as an argument of "get_popup" or "reposition"
requests.
This commit is contained in:
tokyo4j 2024-07-21 02:33:51 +09:00 • committed by Consolatis
parent 1765bf8cc2
commit e15bde328d
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/xdg-popup.c
View file

@ -27,10 +27,15 @@ popup_unconstrain(struct xdg_popup *popup)
{
struct view *view = popup->parent_view;
struct server *server = view->server;
struct wlr_box *popup_box = &popup->wlr_popup->current.geometry;
int parent_lx, parent_ly;
struct wlr_scene_tree *parent_tree = popup->wlr_popup->parent->data;
wlr_scene_node_coords(&parent_tree->node, &parent_lx, &parent_ly);
struct wlr_box *popup_box = &popup->wlr_popup->scheduled.geometry;
struct output *output = output_nearest_to(server,
view->current.x + popup_box->x,
view->current.y + popup_box->y);
parent_lx + popup_box->x,
parent_ly + popup_box->y);
struct wlr_box usable = output_usable_area_in_layout_coords(output);
struct wlr_box output_toplevel_box = {
@ -116,7 +121,7 @@ xdg_popup_create(struct view *view, struct wlr_xdg_popup *wlr_popup)
* 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
* provide the proper parent scene node of the xdg popup. To enable
* this, we always set the user data field of xdg_surfaces to the
* this, we always set the user data field of wlr_surfaces to the
* corresponding scene node.
*
* xdg-popups live in server->xdg_popup_tree so that they can be