mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-13 13:30:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

xdg-shell: fix popup on wrong output

Browse source
This commit is contained in:
Johan Malm 2024-10-06 19:51:59 +01:00 • committed by Hiroaki Yamamoto
parent 5b3f90ed72
commit be18050479
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/xdg-popup.c
View file

@ -7,6 +7,7 @@
* - keeping non-layer-shell xdg-popups outside the layers.c code * - keeping non-layer-shell xdg-popups outside the layers.c code
*/ */
#include "common/macros.h"
#include "common/mem.h" #include "common/mem.h"
#include "labwc.h" #include "labwc.h"
#include "node.h" #include "node.h"
@ -33,11 +34,18 @@ popup_unconstrain(struct xdg_popup *popup)
struct wlr_scene_tree *parent_tree = popup->wlr_popup->parent->data; struct wlr_scene_tree *parent_tree = popup->wlr_popup->parent->data;
wlr_scene_node_coords(&parent_tree->node, &parent_lx, &parent_ly); wlr_scene_node_coords(&parent_tree->node, &parent_lx, &parent_ly);
/* Get usable area to constrain by */ /*
* Get usable area to constrain by
*
* The scheduled top-left corner (x, y) of the popup is sometimes less
* than zero, typically with Qt apps. We therefore clamp it to avoid for
* example the 'File' menu of a maximized window to end up on an another
* output.
*/
struct wlr_box *popup_box = &popup->wlr_popup->scheduled.geometry; struct wlr_box *popup_box = &popup->wlr_popup->scheduled.geometry;
struct output *output = output_nearest_to(server, struct output *output = output_nearest_to(server,
parent_lx + popup_box->x, parent_lx + MAX(popup_box->x, 0),
parent_ly + popup_box->y); parent_ly + MAX(popup_box->y, 0));
struct wlr_box usable = output_usable_area_in_layout_coords(output); struct wlr_box usable = output_usable_area_in_layout_coords(output);
/* Get offset of toplevel window from its surface */ /* Get offset of toplevel window from its surface */