E CVS: apps/e sebastid

[<enl...@li...>]

Enlightenment CVS committal

Author  : sebastid
Project : e17
Module  : apps/e

Dir     : e17/apps/e/src/bin


Modified Files:
	e_border.c 


Log Message:
Now both resize limit and resize resist should work.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- e_border.c	10 Feb 2005 13:33:07 -0000	1.92
+++ e_border.c	10 Feb 2005 13:53:00 -0000	1.93
@@ -2748,7 +2748,6 @@
 
    tw = bd->w;
    th = bd->h;
-   _e_border_resize_limit(bd, &w, &h);
 
    if ((bd->resize_mode == RESIZE_TL) ||
        (bd->resize_mode == RESIZE_L) ||
@@ -2766,6 +2765,18 @@
 	 &new_x, &new_y, &new_w, &new_h);
    evas_list_free(skiplist);
 
+   w = new_w;
+   h = new_h;
+   _e_border_resize_limit(bd, &new_w, &new_h);
+   if ((bd->resize_mode == RESIZE_TL) ||
+       (bd->resize_mode == RESIZE_L) ||
+       (bd->resize_mode == RESIZE_BL))
+     new_x += (w - new_w);
+   if ((bd->resize_mode == RESIZE_TL) ||
+       (bd->resize_mode == RESIZE_T) ||
+       (bd->resize_mode == RESIZE_TR))
+     new_y += (h - new_h);
+
    e_border_move_resize(bd, new_x, new_y, new_w, new_h);
 }