callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wayland: do not clamp anchor values

Browse Source 
Clamping the anchor values as introduced in commit 9a5ffcd to fix bug
777176 breaks menu positioning.

By keeping the anchors rectangle size greater than zero, we end up
deducting some positive value from the original position, so there is no
need to clamp() actually, keeping the values positive is enough and
avoids the issue with menu positioning on the menubar.

An additional benefit is to make the code a lot simpler.

https://bugzilla.gnome.org/show_bug.cgi?id=778009
This commit is contained in:
Olivier Fourdan 2017-02-01 09:41:07 +01:00
parent e338b4589d
commit 7ec16c5c53
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gdk/wayland/gdkwindow-wayland.c
View File

@ -2676,25 +2676,11 @@ sanitize_anchor_rect (GdkWindow *window,
{
gint original_width = rect->width;
gint original_height = rect->height;
GdkWindow *parent = get_popup_parent (window);
rect->width = MAX (1, rect->width);
rect->height = MAX (1, rect->height);
rect->x -= rect->width - original_width;
rect->y -= rect->height - original_height;
/* Make sure the anchor rectangle does not extend outside the window
* geometry of the parent surface.
*/
if (parent)
{
GdkRectangle geometry;
/* The rectangle is relative to the parent window geometry */
gdk_wayland_window_get_window_geometry (parent, &geometry);
rect->x = CLAMP (rect->x, 0, geometry.width);
rect->y = CLAMP (rect->y, 0, geometry.height);
}
rect->x = MAX (rect->x + original_width - rect->width, 0);
rect->y = MAX (rect->y + original_height - rect->height, 0);
}
static void