summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Adams <readams@readams.net>2003-10-07 02:08:45 +0000
committerRob Adams <readams@src.gnome.org>2003-10-07 02:08:45 +0000
commit6d7d586f3cc59d4339e3230b9a81e0078753ade5 (patch)
treef56411f8b77ac70bed085955e1fc2b8709cb12be
parent481accd6bd0c89722d9d162313d46b3e190a2886 (diff)
downloadmetacity-6d7d586f3cc59d4339e3230b9a81e0078753ade5.tar.gz
disable onscreen resize constraints for right, left, and bottom, sinceGNOME_2_4_BRANCHPOINT
2003-10-06 Rob Adams <readams@readams.net> * src/constraints.c (constraint_onscreen_*_func): disable onscreen resize constraints for right, left, and bottom, since there is no way to violate onscreen constraints by resizing in these directions and the code to implement the constraints made some incorrect assumptions. Fix for #120701, #120756, #123165, #123631, #123838.
-rw-r--r--ChangeLog9
-rw-r--r--src/constraints.c52
2 files changed, 21 insertions, 40 deletions
diff --git a/ChangeLog b/ChangeLog
index c9a6c8cd..e5033c86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-06 Rob Adams <readams@readams.net>
+
+ * src/constraints.c (constraint_onscreen_*_func): disable onscreen
+ resize constraints for right, left, and bottom, since there is no
+ way to violate onscreen constraints by resizing in these
+ directions and the code to implement the constraints made some
+ incorrect assumptions. Fix for #120701, #120756, #123165,
+ #123631, #123838.
+
2003-10-06 Žygimantas Beručka <uid0@tuxfamily.org>
* configure.in: Added "lt" to ALL_LINGUAS
diff --git a/src/constraints.c b/src/constraints.c
index 416986de..06bddb51 100644
--- a/src/constraints.c
+++ b/src/constraints.c
@@ -559,16 +559,9 @@ constraint_onscreen_bottom_func (MetaWindow *window,
const MetaRectangle *orig,
int *y_delta)
{
- int max_dy;
- int bottommost_y;
-
- get_outermost_onscreen_positions (window, info, orig, 0, *y_delta,
- NULL, NULL, NULL, &bottommost_y);
-
- max_dy = bottommost_y - orig->y;
-
- if (*y_delta > max_dy)
- *y_delta = max_dy;
+ /* no way to resize off the bottom so that constraints are
+ violated */
+ return;
}
static void
@@ -595,16 +588,9 @@ constraint_onscreen_left_func (MetaWindow *window,
const MetaRectangle *orig,
int *x_delta)
{
- int min_dx;
- int leftmost_x;
-
- get_outermost_onscreen_positions (window, info, orig, *x_delta, 0,
- &leftmost_x, NULL, NULL, NULL);
-
- min_dx = leftmost_x - orig->x;
-
- if (*x_delta < min_dx)
- *x_delta = min_dx;
+ /* no way to resize off the sides so that constraints are violated
+ */
+ return;
}
static void
@@ -613,16 +599,9 @@ constraint_onscreen_right_func (MetaWindow *window,
const MetaRectangle *orig,
int *x_delta)
{
- int max_dx;
- int rightmost_x;
-
- get_outermost_onscreen_positions (window, info, orig, *x_delta, 0,
- NULL, &rightmost_x, NULL, NULL);
-
- max_dx = rightmost_x - orig->x;
-
- if (*x_delta > max_dx)
- *x_delta = max_dx;
+ /* no way to resize off the sides so that constraints are violated
+ */
+ return;
}
static void
@@ -631,16 +610,9 @@ constraint_onscreen_hcenter_func (MetaWindow *window,
const MetaRectangle *orig,
int *x_delta)
{
- int max_dx;
- int leftmost_x;
-
- get_outermost_onscreen_positions (window, info, orig, *x_delta, 0,
- &leftmost_x, NULL, NULL, NULL);
-
- max_dx = orig->x - leftmost_x;
-
- if (*x_delta > max_dx)
- *x_delta = max_dx;
+ /* no way to resize off the sides so that constraints are violated
+ */
+ return;
}
static void