Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_main.c
Log Message:
max size respecting yo
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_main.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- edje_main.c 24 Apr 2005 09:13:26 -0000 1.58
+++ edje_main.c 22 Aug 2005 05:32:22 -0000 1.59
@@ -396,6 +396,7 @@
{
Evas_Coord x, y, w, h;
Evas_Coord minw, minh;
+ Evas_Coord maxw, maxh;
int hdir, vdir;
evas_object_geometry_get(de->edje, &x, &y, &w, &h);
@@ -407,10 +408,14 @@
h += 30;
minw = 20 + de->minw;
minh = 30 + de->minh;
+ maxw = 20 + de->maxw;
+ maxh = 30 + de->maxh;
+
if (hdir > 0)
{
w += ev->cur.canvas.x - ev->prev.canvas.x;
if (w < minw) w = minw;
+ else if (w > maxw) w = maxw;
}
else
{
@@ -421,11 +426,17 @@
x += w - minw;
w = minw;
}
+ if (w > maxw)
+ {
+ x -= w - maxw;
+ w = maxw;
+ }
}
if (vdir > 0)
{
h += ev->cur.canvas.y - ev->prev.canvas.y;
if (h < minh) h = minh;
+ if (h > maxh) h = maxh;
}
else
{
@@ -436,6 +447,11 @@
y += h - minh;
h = minh;
}
+ if (h > maxh)
+ {
+ y -= h - maxh;
+ h = maxh;
+ }
}
evas_object_move(de->edje, x + 10, y + 20);
evas_object_resize(de->edje, w - 20, h - 30);
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
