metacity r3585 - in trunk: . src/core
- From: kamstrup svn gnome org
- To: svn-commits-list gnome org
- Subject: metacity r3585 - in trunk: . src/core
- Date: Thu, 21 Feb 2008 10:00:11 +0000 (GMT)
Author: kamstrup
Date: Thu Feb 21 10:00:10 2008
New Revision: 3585
URL: http://svn.gnome.org/viewvc/metacity?rev=3585&view=rev
Log:
Respect requested position on _NET_MOVERESIZE_WINDOW. Closes #448183
Modified:
trunk/ChangeLog
trunk/src/core/constraints.c
Modified: trunk/src/core/constraints.c
==============================================================================
--- trunk/src/core/constraints.c (original)
+++ trunk/src/core/constraints.c Thu Feb 21 10:00:10 2008
@@ -852,8 +852,17 @@
if (new_height < window->size_hints.min_height)
new_height += ((window->size_hints.min_height - new_height)/hi + 1)*hi;
+ /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
+ * See bug 448183
+ */
+ MetaRectangle *start_rect;
+ if (info->action_type == ACTION_MOVE_AND_RESIZE)
+ start_rect = &info->current;
+ else
+ start_rect = &info->orig;
+
/* Resize to the new size */
- meta_rectangle_resize_with_gravity (&info->orig,
+ meta_rectangle_resize_with_gravity (start_rect,
&info->current,
info->resize_gravity,
new_width,
@@ -898,7 +907,17 @@
/*** Enforce constraint ***/
new_width = CLAMP (info->current.width, min_size.width, max_size.width);
new_height = CLAMP (info->current.height, min_size.height, max_size.height);
- meta_rectangle_resize_with_gravity (&info->orig,
+
+ /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
+ * See bug 448183
+ */
+ MetaRectangle *start_rect;
+ if (info->action_type == ACTION_MOVE_AND_RESIZE)
+ start_rect = &info->current;
+ else
+ start_rect = &info->orig;
+
+ meta_rectangle_resize_with_gravity (start_rect,
&info->current,
info->resize_gravity,
new_width,
@@ -1022,7 +1041,16 @@
break;
}
- meta_rectangle_resize_with_gravity (&info->orig,
+ /* Figure out what original rect to pass to meta_rectangle_resize_with_gravity
+ * See bug 448183
+ */
+ MetaRectangle *start_rect;
+ if (info->action_type == ACTION_MOVE_AND_RESIZE)
+ start_rect = &info->current;
+ else
+ start_rect = &info->orig;
+
+ meta_rectangle_resize_with_gravity (start_rect,
&info->current,
info->resize_gravity,
new_width,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]