Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_handlers.c edje_main.c
Log Message:
min.max size properties now per edje collection can be specified in the edje
.edc file and can be accessed. the min_size_get has become a min_size_calc
since it does actually calculate it.
also swallowed edjes will be queried for their own min/max size and that will
be used to further limit the part that swallows. also you can attach
properties to any old evas object so it will have min/max size properties
(maybe one day this can go into evas itself?). also swallowed objects if
deleted before the parent edje will "unswallow" themselves properly :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- edje_cc_handlers.c 7 Jul 2003 07:55:18 -0000 1.16
+++ edje_cc_handlers.c 20 Jul 2003 12:37:49 -0000 1.17
@@ -9,6 +9,8 @@
static void ob_collections_group(void);
static void st_collections_group_name(void);
+static void st_collections_group_min(void);
+static void st_collections_group_max(void);
static void ob_collections_group_parts(void);
@@ -74,6 +76,8 @@
{
{"images.image", st_images_image},
{"collections.group.name", st_collections_group_name},
+ {"collections.group.min", st_collections_group_min},
+ {"collections.group.max", st_collections_group_max},
{"collections.group.parts.part.name", st_collections_group_parts_part_name},
{"collections.group.parts.part.type", st_collections_group_parts_part_type},
{"collections.group.parts.part.effect", st_collections_group_parts_part_effect},
@@ -131,6 +135,8 @@
{"collections", ob_collections},
{"collections.group", ob_collections_group},
{"collections.group.name", NULL},
+ {"collections.group.min", NULL},
+ {"collections.group.max", NULL},
{"collections.group.parts", ob_collections_group_parts},
{"collections.group.parts.part", ob_collections_group_parts_part},
{"collections.group.parts.part.name", NULL},
@@ -292,6 +298,26 @@
de = evas_list_data(evas_list_last(edje_file->collection_dir->entries));
de->entry = parse_str(0);
+}
+
+static void
+st_collections_group_min(void)
+{
+ Edje_Part_Collection *pc;
+
+ pc = evas_list_data(evas_list_last(edje_collections));
+ pc->prop.min.w = parse_int_range(0, 0, 0x7fffffff);
+ pc->prop.min.h = parse_int_range(1, 0, 0x7fffffff);
+}
+
+static void
+st_collections_group_max(void)
+{
+ Edje_Part_Collection *pc;
+
+ pc = evas_list_data(evas_list_last(edje_collections));
+ pc->prop.max.w = parse_int_range(0, 0, 0x7fffffff);
+ pc->prop.max.h = parse_int_range(1, 0, 0x7fffffff);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_main.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- edje_main.c 20 Jul 2003 02:08:47 -0000 1.19
+++ edje_main.c 20 Jul 2003 12:37:49 -0000 1.20
@@ -331,10 +331,8 @@
y -= 20;
w += 20;
h += 30;
-// minw = 20 + de->minw;
-// minh = 30 + de->minh;
- minw = 20;
- minh = 30;
+ minw = 20 + de->minw;
+ minh = 30 + de->minh;
if (hdir > 0)
{
w += ev->cur.canvas.x - ev->prev.canvas.x;
-------------------------------------------------------
This SF.net email is sponsored by: VM Ware
With VMware you can run multiple operating systems on a single machine.
WITHOUT REBOOTING! Mix Linux / Windows / Novell virtual machines at the
same time. Free trial click here: http://www.vmware.com/wl/offer/345/0
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
