libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Knock another item off the TODO. Theme now emits ecdb,clicked for taking action, and ecdb,activate for focusing.

Browse Source
This commit is contained in:
Jaime Thomas
2009-04-19 18:31:20 +00:00
parent 8d47250ad9
commit 62607be1c9
13 changed files with 203 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
experimental/ecdb/trunk/src/ecdb_widgets.c
View File

@ -52,7 +52,7 @@ ecdb_widget_add(Evas_Object *parent, const char *name)
return NULL;
}
edje_object_signal_callback_add(o, "mouse,down,*", "*",
edje_object_signal_callback_add(o, "ecdb,activate", "*",
_mouse_down_edje, NULL);
if (name)
@ -68,13 +68,6 @@ ecdb_widget_add(Evas_Object *parent, const char *name)
/************************** BUTTON ******************************************/
void
_button_click_cb_call(void *data, Evas_Object *obj, const char *emission,
const char *source)
{
evas_object_smart_callback_call(obj, "clicked", NULL);
}
Evas_Object *
ecdb_button_add(Evas_Object *parent, const char *name)
{
@ -88,8 +81,6 @@ ecdb_button_add(Evas_Object *parent, const char *name)
}
edje_object_file_set(b, em->theme_path, "ecdb/button");
edje_object_signal_callback_add(b, "clicked", "ecdb", _button_click_cb_call,
b);
return b;
}
@ -139,13 +130,6 @@ ecdb_button_label_get(Evas_Object *b)
}
/************************* COMBO ITEM ****************************************/
void
_combo_item_click_cb_call(void *data, Evas_Object *obj, const char *emission,
const char *source)
{
evas_object_smart_callback_call(obj, "clicked", NULL);
}
Evas_Object *
ecdb_combo_item_add(Evas_Object *parent, const char *name)
{
@ -158,8 +142,6 @@ ecdb_combo_item_add(Evas_Object *parent, const char *name)
return NULL;
}
edje_object_file_set(ci, em->theme_path, "ecdb/combo_item");
edje_object_signal_callback_add(ci, "clicked", "ecdb",
_combo_item_click_cb_call, ci);
return ci;
}
@ -510,7 +492,6 @@ _entry_click_cb_call(void *data, Evas_Object *obj, const char *emission,
const char *source)
{
evas_object_focus_set(obj, 1);
evas_object_smart_callback_call(obj, "clicked", NULL);
}
Evas_Object *
@ -641,7 +622,8 @@ _combo_hide(void *data, Evas *e, Evas_Object *obj, void *event_info)
}
static void
_combo_clicked(void *data, Evas_Object *obj, void *event_info)
_combo_clicked(void *data, Evas_Object *obj, const char *emission __UNUSED__,
const char *source __UNUSED__)
{
Combo_Data *cd;
Evas_Object *swallow, *header;
@ -685,12 +667,6 @@ _combo_clicked(void *data, Evas_Object *obj, void *event_info)
ecdb_combo_collapse(data);
}
static void
_combo_item_hide(void *data, Evas_Object *obj, void *event_info)
{
edje_object_signal_emit(obj, "ecdb,focus,out", "ecdb");
}
static void
_combo_moveable_click_cb(void *data, Evas_Object *obj, const char *emission,
const char *source)
@ -715,7 +691,6 @@ _combo_click_cb(void *data, Evas_Object *obj, const char *emission,
ecdb_combo_expand(c);
else
ecdb_combo_collapse(c);
evas_object_smart_callback_call(c, "clicked", NULL);
}
Evas_Object *
@ -736,7 +711,7 @@ ecdb_combo_add(Evas_Object *parent, const char *name)
c);
evas_object_event_callback_add(parent, EVAS_CALLBACK_HIDE, _combo_hide, c);
evas_object_event_callback_add(c, EVAS_CALLBACK_DEL, _combo_del, c);
edje_object_signal_callback_add(c, "ecdb,combo,clicked", "ecdb",
edje_object_signal_callback_add(c, "ecdb,clicked", "ecdb",
_combo_click_cb, c);
cd = calloc(1, sizeof(Combo_Data));
@ -811,8 +786,8 @@ ecdb_combo_append(Evas_Object *c, Evas_Object *o)
}
cd->count++;
edje_object_part_box_append(cd->popup, "ecdb.box", o);
evas_object_smart_callback_add(o, "clicked", _combo_clicked, c);
evas_object_smart_callback_add(o, "hidden", _combo_item_hide, c);
edje_object_signal_callback_add(o, "ecdb,clicked", "ecdb",
_combo_clicked, c);
}
void
@ -943,7 +918,7 @@ ecdb_combo_collapse(Evas_Object *c)
}
while ((eina_iterator_next(it, (void **)&o)))
evas_object_smart_callback_call(o, "hidden", c);
edje_object_signal_emit(o, "ecdb,focus,out", "ecdb");
eina_iterator_free(it);
cd->expanded = 0;
@ -1133,10 +1108,14 @@ _config_inwin_del(void *data, Evas *e, Evas_Object *obj, void *event_info)
iwd = data;
if (!evas_object_event_callback_del(iwd->parent, EVAS_CALLBACK_HIDE,
_config_inwin_hide))
{
EINA_ERROR_PWARN("EVAS_CALLBACK_HIDE callback removal failure!\n");
}
if (!evas_object_event_callback_del(iwd->parent, EVAS_CALLBACK_RESIZE,
_config_inwin_resize))
{
EINA_ERROR_PWARN("EVAS_CALLBACK_RESIZE callback removal failure!\n");
}
FREE(iwd);
}