Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/iconbar
Dir : e17/apps/iconbar/src
Modified Files:
icon_editor.c main.c
Log Message:
Patch from Takis to update to new ewl api.
(plus a bit more)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/icon_editor.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- icon_editor.c 22 Apr 2004 13:25:58 -0000 1.2
+++ icon_editor.c 14 Aug 2004 16:50:42 -0000 1.3
@@ -296,9 +296,9 @@
evas_object_image_data_update_add(im_obj, 0, 0, im_w, im_h);
evas_object_image_fill_set(im_obj, 0, 0, im_w, im_h);
printf("wxh: %d x %d\n", im_w, im_h);
- ewl_object_request_size(EWL_OBJECT(editor->icon_image), im_w, im_h);
- ewl_object_set_maximum_size(EWL_OBJECT(editor->icon_image), im_w, im_h);
- ewl_object_set_minimum_size(EWL_OBJECT(editor->icon_image), im_w, im_h);
+ ewl_object_size_request(EWL_OBJECT(editor->icon_image), im_w, im_h);
+ ewl_object_maximum_size_set(EWL_OBJECT(editor->icon_image), im_w, im_h);
+ ewl_object_minimum_size_set(EWL_OBJECT(editor->icon_image), im_w, im_h);
}
@@ -329,7 +329,7 @@
/* image */
editor->icon_image = ewl_image_new("test.png", NULL);
ewl_container_append_child(EWL_CONTAINER(editor->top_hbox), editor->icon_image);
- ewl_object_set_padding(EWL_OBJECT(editor->icon_image), 5, 5, 5, 5);
+ ewl_object_padding_set(EWL_OBJECT(editor->icon_image), 5, 5, 5, 5);
ewl_widget_show(editor->icon_image);
ewl_callback_append(editor->icon_image, EWL_CALLBACK_REALIZE,
_editor_realize, NULL);
@@ -372,18 +372,18 @@
/* cancel and save buttons */
editor->cancel_but = ewl_button_new("Cancel");
- ewl_object_set_fill_policy(EWL_OBJECT(editor->cancel_but), EWL_FLAG_FILL_NONE);
- ewl_object_set_padding(EWL_OBJECT(editor->cancel_but), 5, 5, 5, 5);
- ewl_object_set_alignment(EWL_OBJECT(editor->cancel_but), EWL_FLAG_ALIGN_RIGHT);
+ ewl_object_fill_policy_set(EWL_OBJECT(editor->cancel_but), EWL_FLAG_FILL_NONE);
+ ewl_object_padding_set(EWL_OBJECT(editor->cancel_but), 5, 5, 5, 5);
+ ewl_object_alignment_set(EWL_OBJECT(editor->cancel_but), EWL_FLAG_ALIGN_RIGHT);
ewl_container_append_child(EWL_CONTAINER(editor->bot_hbox), editor->cancel_but);
ewl_widget_show(editor->cancel_but);
ewl_callback_append(editor->cancel_but, EWL_CALLBACK_CLICKED,
_editor_button_cb, NULL);
editor->ok_but = ewl_button_new("Save and Close");
- ewl_object_set_fill_policy(EWL_OBJECT(editor->ok_but), EWL_FLAG_FILL_NONE);
- ewl_object_set_padding(EWL_OBJECT(editor->ok_but), 5, 5, 5, 5);
- ewl_object_set_alignment(EWL_OBJECT(editor->ok_but), EWL_FLAG_ALIGN_RIGHT);
+ ewl_object_fill_policy_set(EWL_OBJECT(editor->ok_but), EWL_FLAG_FILL_NONE);
+ ewl_object_padding_set(EWL_OBJECT(editor->ok_but), 5, 5, 5, 5);
+ ewl_object_alignment_set(EWL_OBJECT(editor->ok_but), EWL_FLAG_ALIGN_RIGHT);
ewl_container_append_child(EWL_CONTAINER(editor->bot_hbox), editor->ok_but);
ewl_widget_show(editor->ok_but);
ewl_callback_append(editor->ok_but, EWL_CALLBACK_CLICKED,
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/iconbar/src/main.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- main.c 8 May 2004 15:04:19 -0000 1.28
+++ main.c 14 Aug 2004 16:50:42 -0000 1.29
@@ -190,16 +190,25 @@
{
static double last = 0.0;
Evas_Object *o = NULL, *edje = NULL;
+ Evas_List *l = NULL;
if((o = evas_object_name_find(ecore_evas_get(ee), "iconbar")))
{
+ Iconbar *ib = evas_object_smart_data_get(o);
if((edje = iconbar_gui_get(o)))
{
if(ecore_time_get() - last > 0.05)
{
edje_object_signal_emit(edje, "window,leave", "");
last = ecore_time_get();
- }
+
+ /* tell the icons too */
+ for (l = e_container_elements_get(ib->cont); l; l = l->next)
+ {
+ Evas_Object *obj = l->data;
+ edje_object_signal_emit(obj, "window,leave", "");
+ }
+ }
}
}
}
@@ -208,15 +217,24 @@
{
static double last = 0.0;
Evas_Object *o = NULL, *edje = NULL;
+ Evas_List *l = NULL;
if((o = evas_object_name_find(ecore_evas_get(ee), "iconbar")))
{
+ Iconbar *ib = evas_object_smart_data_get(o);
if((edje = iconbar_gui_get(o)))
{
if(ecore_time_get() - last > 0.05)
{
edje_object_signal_emit(edje, "window,enter", "");
last = ecore_time_get();
+
+ /* tell the icons too */
+ for (l = e_container_elements_get(ib->cont); l; l = l->next)
+ {
+ Evas_Object *obj = l->data;
+ edje_object_signal_emit(obj, "window,enter", "");
+ }
}
}
}
-------------------------------------------------------
SF.Net email is sponsored by Shop4tech.com-Lowest price on Blank Media
100pk Sonic DVD-R 4x for only $29 -100pk Sonic DVD+R for only $33
Save 50% off Retail on Ink & Toner - Free Shipping and Free Gift.
http://www.shop4tech.com/z/Inkjet_Cartridges/9_108_r285
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
