summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2002-10-20 15:22:40 +0000
committerHavoc Pennington <hp@src.gnome.org>2002-10-20 15:22:40 +0000
commit95e5a13131e5e9ad8232a97707e42ec058a690d3 (patch)
treea33c5e57f7e9c9e1d63f0b8817026607a87dd510
parentc1a88f5457bafb99034a07a8857bd6f847a5eb2e (diff)
downloadmetacity-95e5a13131e5e9ad8232a97707e42ec058a690d3.tar.gz
check above->mapped before deciding if it overlaps the window being
2002-10-20 Havoc Pennington <hp@pobox.com> * src/keybindings.c (handle_raise_or_lower): check above->mapped before deciding if it overlaps the window being raiselowered, fix from Stephane Chauveau
-rw-r--r--ChangeLog6
-rw-r--r--src/keybindings.c21
2 files changed, 18 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 76ef978f..fca4dcb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-20 Havoc Pennington <hp@pobox.com>
+
+ * src/keybindings.c (handle_raise_or_lower): check above->mapped
+ before deciding if it overlaps the window being raiselowered,
+ fix from Stephane Chauveau
+
2002-10-19 Jeremy Katz <katzj@redhat.com>
* configure.in: make Xrandr check less noisy
diff --git a/src/keybindings.c b/src/keybindings.c
index badc1520..6b08296e 100644
--- a/src/keybindings.c
+++ b/src/keybindings.c
@@ -2711,15 +2711,18 @@ handle_raise_or_lower (MetaDisplay *display,
{
MetaRectangle tmp, win_rect, above_rect;
- meta_window_get_outer_rect (window, &win_rect);
- meta_window_get_outer_rect (above, &above_rect);
-
- /* Check if obscured */
- if (meta_rectangle_intersect (&win_rect, &above_rect, &tmp))
- {
- meta_window_raise (window);
- return;
- }
+ if (above->mapped)
+ {
+ meta_window_get_outer_rect (window, &win_rect);
+ meta_window_get_outer_rect (above, &above_rect);
+
+ /* Check if obscured */
+ if (meta_rectangle_intersect (&win_rect, &above_rect, &tmp))
+ {
+ meta_window_raise (window);
+ return;
+ }
+ }
above = meta_stack_get_above (window->screen->stack, above, TRUE);
}