Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
edje_calc.c edje_private.h
Log Message:
textblock max size option in
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_calc.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- edje_calc.c 19 Oct 2007 19:31:42 -0000 1.113
+++ edje_calc.c 19 Jan 2008 01:00:13 -0000 1.114
@@ -613,6 +613,30 @@
}
}
}
+ if ((chosen_desc->text.max_x) || (chosen_desc->text.max_y))
+ {
+ int mw = 0, mh = 0;
+
+ tw = th = 0;
+ if (!chosen_desc->text.max_x)
+ {
+ evas_object_resize(ep->object, params->w, params->h);
+ evas_object_textblock_size_formatted_get(ep->object, &tw,
&th);
+ }
+ else
+ evas_object_textblock_size_native_get(ep->object, &tw, &th);
+ evas_object_textblock_style_insets_get(ep->object, &ins_l, &ins_r,
&ins_t, &ins_b);
+ mw = ins_l + tw + ins_r;
+ mh = ins_t + th + ins_b;
+ if (chosen_desc->text.max_x)
+ {
+ if (mw > maxw) maxw = mw;
+ }
+ if (chosen_desc->text.max_y)
+ {
+ if (mh > maxw) maxh = mh;
+ }
+ }
}
else if ((chosen_desc) && (ep->part->type == EDJE_PART_TYPE_TEXT))
{
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_private.h,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- edje_private.h 18 Jan 2008 06:34:04 -0000 1.136
+++ edje_private.h 19 Jan 2008 01:00:14 -0000 1.137
@@ -11,7 +11,6 @@
#include <Embryo.h>
#include <math.h>
-#include <fnmatch.h>
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
