diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2014-09-18 15:42:09 -0400 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2014-09-19 15:41:22 -0400 |
| commit | 89ffcee7ca78d1b60d4a78fd52b225ddd65db8ab (patch) | |
| tree | 0280116b6d3ff7203963934f7f7db55518a02539 | |
| parent | 1250afef7b1d0061dba7a55589b12909459ab191 (diff) | |
| download | mutter-89ffcee7ca78d1b60d4a78fd52b225ddd65db8ab.tar.gz | |
Fix computation of window positions for StaticGravity
When adjust_for_gravity() was simplified (01b6445708), the correct
handling of StaticGravity dropped out - fix adjust_for_gravity() to do
nothing in that case.
https://bugzilla.gnome.org/show_bug.cgi?id=736719
| -rw-r--r-- | src/x11/window-x11.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c index 282ecd25d..53c04d5f7 100644 --- a/src/x11/window-x11.c +++ b/src/x11/window-x11.c @@ -270,6 +270,17 @@ adjust_for_gravity (MetaWindow *window, int frame_width, frame_height; MetaFrameBorders borders; + /* We're computing position to pass to window_move, which is + * the position of the client window (StaticGravity basically) + * + * (see WM spec description of gravity computation, but note that + * their formulas assume we're honoring the border width, rather + * than compensating for having turned it off) + */ + + if (gravity == StaticGravity) + return; + if (coords_assume_border) bw = priv->border_width; else @@ -282,14 +293,6 @@ adjust_for_gravity (MetaWindow *window, frame_width = child_x + rect->width + borders.visible.right; frame_height = child_y + rect->height + borders.visible.bottom; - /* We're computing position to pass to window_move, which is - * the position of the client window (StaticGravity basically) - * - * (see WM spec description of gravity computation, but note that - * their formulas assume we're honoring the border width, rather - * than compensating for having turned it off) - */ - /* Calculate the the reference point, which is the corner of the * outer window specified by the gravity. So, NorthEastGravity * would have the reference point as the top-right corner of the |