Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_main.c
Log Message:
fix segv on del! :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- edje_main.c 5 Aug 2003 14:33:35 -0000 1.26
+++ edje_main.c 9 Aug 2003 03:32:21 -0000 1.27
@@ -47,8 +47,9 @@
void test_list_move(Collection *co_head);
void test_list(char *file);
+
+void test_resize(Demo_Edje *de);
void test_setup(char *file, char *name);
-void test_reize(double w, double h);
static Evas_List *edjes = NULL;
static Evas_Object *o_bg = NULL;
@@ -101,7 +102,6 @@
evas_output_viewport_get(evas, NULL, NULL, &w, &h);
bg_resize(w, h);
- test_reize(w, h);
}
static int
@@ -381,23 +381,9 @@
h = minh;
}
}
- evas_object_move(de->left, x, y + 20);
- evas_object_resize(de->left, 10, h - 30);
- evas_object_move(de->right, x + w - 10, y + 20);
- evas_object_resize(de->right, 10, h - 30);
- evas_object_move(de->top, x, y);
- evas_object_resize(de->top, w, 20);
- evas_object_move(de->bottom, x, y + (h - 10));
- evas_object_resize(de->bottom, w, 10);
- evas_object_move(de->title_clip, x + 20, y);
- evas_object_resize(de->title_clip, w - 40, 20);
- evas_object_geometry_get(de->title, NULL, NULL, &tw, &th);
- evas_object_move(de->title, x + ((w - tw) / 2), y + 4 + ((16 - th) / 2));
- evas_object_move(de->image, x, y);
- evas_object_resize(de->image, w, h);
- evas_object_image_fill_set(de->image, 0, 0, w, h);
evas_object_move(de->edje, x + 10, y + 20);
evas_object_resize(de->edje, w - 20, h - 30);
+ test_resize(de);
}
}
@@ -576,6 +562,38 @@
}
void
+test_resize(Demo_Edje *de)
+{
+ double x, y, w, h, tw, th;
+ double minw, minh;
+
+ evas_object_geometry_get(de->edje, &x, &y, &w, &h);
+ x -= 10;
+ y -= 20;
+ w += 20;
+ h += 30;
+ minw = 20 + de->minw;
+ minh = 30 + de->minh;
+ evas_object_move(de->left, x, y + 20);
+ evas_object_resize(de->left, 10, h - 30);
+ evas_object_move(de->right, x + w - 10, y + 20);
+ evas_object_resize(de->right, 10, h - 30);
+ evas_object_move(de->top, x, y);
+ evas_object_resize(de->top, w, 20);
+ evas_object_move(de->bottom, x, y + (h - 10));
+ evas_object_resize(de->bottom, w, 10);
+ evas_object_move(de->title_clip, x + 20, y);
+ evas_object_resize(de->title_clip, w - 40, 20);
+ evas_object_geometry_get(de->title, NULL, NULL, &tw, &th);
+ evas_object_move(de->title, x + ((w - tw) / 2), y + 4 + ((16 - th) / 2));
+ evas_object_move(de->image, x, y);
+ evas_object_resize(de->image, w, h);
+ evas_object_image_fill_set(de->image, 0, 0, w, h);
+ evas_object_move(de->edje, x + 10, y + 20);
+ evas_object_resize(de->edje, w - 20, h - 30);
+}
+
+void
test_setup(char *file, char *name)
{
Evas_Object *o;
@@ -672,6 +690,7 @@
evas_object_resize(o, w, h);
de->edje = o;
+ test_resize(de);
// printf("%s\n", edje_object_data_get(o, "My Data"));
// printf("%s\n", edje_object_data_get(o, "The Key"));
@@ -682,13 +701,6 @@
edje_object_part_swallow(de->edje, "swallow", o);
evas_object_show(o);
*/
-}
-
-void
-test_reize(double w, double h)
-{
-// evas_object_move(o_edje, 10, 10);
-// evas_object_resize(o_edje, w - 20, h - 20);
}
int
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100003ave/direct;at.aspnet_072303_01/01
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs