summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Adams <robadams@ucla.edu>2003-03-30 10:52:07 +0000
committerRob Adams <readams@src.gnome.org>2003-03-30 10:52:07 +0000
commit72a7f57e5d69ca1d28e0aa6e05be794f7d635b38 (patch)
tree40dca4a45af548b14b0bffc7c1b7fe597ef2a0fc
parent0fee2ac49921804c375df643eab28cb6777f50f4 (diff)
downloadmetacity-72a7f57e5d69ca1d28e0aa6e05be794f7d635b38.tar.gz
When passing frame geometry to meta_window_constrain, send null if no
2003-03-30 Rob Adams <robadams@ucla.edu> * src/window.c (meta_window_move_resize_internal): When passing frame geometry to meta_window_constrain, send null if no frame. Possible fix for #109039.
-rw-r--r--ChangeLog6
-rw-r--r--src/window.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 35dcda05..f4c0d4d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-30 Rob Adams <robadams@ucla.edu>
+
+ * src/window.c (meta_window_move_resize_internal): When passing
+ frame geometry to meta_window_constrain, send null if no frame.
+ Possible fix for #109039.
+
2003-03-29 Havoc Pennington <hp@pobox.com>
* src/wm-tester/test-gravity.c (main): add --noframes option for
diff --git a/src/window.c b/src/window.c
index 72f59743..94ddb295 100644
--- a/src/window.c
+++ b/src/window.c
@@ -2253,7 +2253,7 @@ meta_window_move_resize_internal (MetaWindow *window,
&x_delta, &y_delta);
meta_window_constrain (window,
- &fgeom,
+ window->frame ? &fgeom : NULL,
&old_rect,
root_x_nw - old_rect.x,
root_y_nw - old_rect.y,