[EGIT] [core/elementary] master 01/01: naviframe: Fix to work clicked callback of auto pushed button.
jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=4af0ab2fc821b7d1125a0d0f71048fa0536545a0
commit 4af0ab2fc821b7d1125a0d0f71048fa0536545a0
Author: Jaehyun Cho jae_hyun_...@naver.com
Date: Sun Jul 5 17:00:06 2015 +0900
naviframe: Fix to work clicked callback of auto pushed button.
To avoid multiple item pops, the auto pushed button deletes its clicked
callback once it is called.
However, if the auto pushed button is not supposed to be deleted in pop
callback, the clicked callback should be restored.
@fix
---
src/lib/elc_naviframe.c| 17 -
src/lib/elm_widget_naviframe.h | 1 +
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 8fc95ad..7979161 100644
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -113,6 +113,7 @@ _item_title_prev_btn_del_cb(void *data,
Elm_Naviframe_Item_Data *it = data;
it-title_prev_btn = NULL;
+ if (it-auto_pushed_btn) it-auto_pushed_btn = NULL;
elm_object_signal_emit(VIEW(it), elm,state,prev_btn,hide, elm);
}
@@ -606,6 +607,8 @@ _item_title_prev_btn_set(Elm_Naviframe_Item_Data *it,
if (it-title_prev_btn == btn) return;
evas_object_del(it-title_prev_btn);
it-title_prev_btn = btn;
+ if (it-auto_pushed_btn (it-auto_pushed_btn != btn))
+ it-auto_pushed_btn = NULL;
if (!btn) return;
elm_object_part_content_set(VIEW(it), PREV_BTN_PART, btn);
@@ -682,6 +685,7 @@ _item_title_prev_btn_unset(Elm_Naviframe_Item_Data *it)
EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _on_item_back_btn_clicked,
parent));
it-title_prev_btn = NULL;
+ if (it-auto_pushed_btn) it-auto_pushed_btn = NULL;
return content;
}
@@ -1236,6 +1240,7 @@ _item_new(Evas_Object *obj,
ELM_NAVIFRAME_ITEM_DATA_GET(eo_prev_it, prev_it);
const char *prev_title = prev_it-title_label;
prev_btn = _back_btn_new(obj, prev_title);
+it-auto_pushed_btn = prev_btn;
}
if (prev_btn)
@@ -1691,7 +1696,17 @@ _elm_naviframe_item_pop(Eo *obj, Elm_Naviframe_Data *sd)
if (it-delete_me)
eo_do(eo_item, elm_wdg_item_del());
else
- it-popping = EINA_FALSE;
+ {
+ /* To avoid multiple item pops, the auto pushed button
deletes
+ its clicked callback once it is called.
+ Since the item is not popped or deleted here, the deleted
+ callback of the auto pushed button should be restored. */
+ if (it-auto_pushed_btn)
+eo_do(it-auto_pushed_btn, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
+ _on_item_back_btn_clicked, obj));
+ it-popping = EINA_FALSE;
+ }
evas_object_unref(obj);
return NULL;
}
diff --git a/src/lib/elm_widget_naviframe.h b/src/lib/elm_widget_naviframe.h
index 8b2e49b..ef199e7 100644
--- a/src/lib/elm_widget_naviframe.h
+++ b/src/lib/elm_widget_naviframe.h
@@ -51,6 +51,7 @@ struct _Elm_Naviframe_Item_Data
Evas_Object *title_prev_btn;
Evas_Object *title_next_btn;
Evas_Object *title_icon;
+ Evas_Object *auto_pushed_btn;
Evas_Display_Mode dispmode;
Elm_Naviframe_Item_Pop_Cb pop_cb;
void*pop_data;
--
[EGIT] [core/elementary] master 16/24: elm_list, elm_win: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=97e878d818f24f43491241b24dfb2406dd557252
commit 97e878d818f24f43491241b24dfb2406dd557252
Author: Avi Levin avi.le...@samsung.com
Date: Wed May 13 14:34:44 2015 +0300
elm_list, elm_win: porting evas smart callbacks to eo
---
src/lib/elm_list.c | 42 +
src/lib/elm_list.eo | 9 ++-
src/lib/elm_win.c | 78 ++---
src/lib/elm_win.eo | 3 +--
4 files changed, 73 insertions(+), 59 deletions(-)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 596e519..7c9d086 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -607,7 +607,8 @@ static Eina_Bool _key_action_select(Evas_Object *obj, const
char *params EINA_UN
if (eo_it)
{
ELM_LIST_ITEM_DATA_GET(eo_it, it);
-evas_object_smart_callback_call(WIDGET(it), SIG_ACTIVATED, eo_it);
+eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_LIST_EVENT_ACTIVATED, eo_it));
}
return EINA_TRUE;
@@ -1155,8 +1156,8 @@ _elm_list_item_focused(Elm_Object_Item *eo_it)
focus_raise = edje_object_data_get(VIEW(it), focusraise);
if ((focus_raise) (!strcmp(focus_raise, on)))
evas_object_raise(VIEW(it));
- evas_object_smart_callback_call
- (WIDGET(it), SIG_ITEM_FOCUSED, eo_it);
+ eo_do(WIDGET(it), eo_event_callback_call
+ (ELM_LIST_EVENT_ITEM_FOCUSED, eo_it));
if (_elm_config-atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it,
ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
}
@@ -1183,7 +1184,7 @@ _elm_list_item_unfocused(Elm_Object_Item *eo_it)
}
sd-focused_item = NULL;
- evas_object_smart_callback_call(obj, SIG_ITEM_UNFOCUSED, eo_it);
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_ITEM_UNFOCUSED, eo_it));
if (_elm_config-atspi_mode)
elm_interface_atspi_accessible_state_changed_signal_emit(eo_it,
ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
}
@@ -1364,7 +1365,7 @@ _item_highlight(Elm_List_Item_Data *it)
_elm_list_walk(sd);
edje_object_signal_emit(VIEW(it), elm,state,selected, elm);
- evas_object_smart_callback_call(obj, SIG_HIGHLIGHTED, EO_OBJ(it));
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_HIGHLIGHTED, EO_OBJ(it)));
select_raise = edje_object_data_get(VIEW(it), selectraise);
if ((select_raise) (!strcmp(select_raise, on)))
evas_object_raise(VIEW(it));
@@ -1416,7 +1417,7 @@ call:
_elm_list_walk(sd);
if (it-func) it-func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it),
eo_it);
- evas_object_smart_callback_call(obj, SIG_SELECTED, eo_it);
+ eo_do(obj, eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED,
eo_it));
sd-last_selected_item = eo_it;
_elm_list_unwalk(obj, sd);
@@ -1441,7 +1442,8 @@ _item_unhighlight(Elm_List_Item_Data *it)
_elm_list_walk(sd);
edje_object_signal_emit(VIEW(it), elm,state,unselected, elm);
- evas_object_smart_callback_call(obj, SIG_UNHIGHLIGHTED, EO_OBJ(it));
+ eo_do(obj, eo_event_callback_call
+ (ELM_LIST_EVENT_UNHIGHLIGHTED, EO_OBJ(it)));
stacking = edje_object_data_get(VIEW(it), stacking);
select_raise = edje_object_data_get(VIEW(it), selectraise);
if ((select_raise) (!strcmp(select_raise, on)))
@@ -1482,7 +1484,8 @@ _item_unselect(Elm_List_Item_Data *it)
sd-selected = eina_list_remove(sd-selected, EO_OBJ(it));
if (!(it-base-disabled ||
(sd-select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
- evas_object_smart_callback_call(WIDGET(it), SIG_UNSELECTED,
EO_OBJ(it));
+ eo_do(WIDGET(it), eo_event_callback_call
+(EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it)));
}
_elm_list_unwalk(obj, sd);
@@ -1507,28 +1510,28 @@ static void
_edge_left_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_LEFT, NULL));
}
static void
_edge_right_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_RIGHT, NULL));
}
static void
_edge_top_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_TOP, NULL));
}
static void
_edge_bottom_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_LIST_EVENT_EDGE_BOTTOM, NULL));
}
static Eina_Bool
@@ -1545,7 +1548,8 @@ _long_press_cb(void *data)
if (it-base-disabled) goto end;
sd-longpressed = EINA_TRUE;
- evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it));
+ eo_do(WIDGET(it),
[EGIT] [core/elementary] master 04/24: elm_web2: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=41c90235c998a43a35e2ef72e2fd8f947977ebcb
commit 41c90235c998a43a35e2ef72e2fd8f947977ebcb
Author: Avi Levin avi.le...@samsung.com
Date: Thu May 7 14:51:46 2015 +0300
elm_web2: porting evas smart callbacks to eo
---
src/lib/elm_web.eo | 1 +
src/lib/elm_web2.c | 61 +-
2 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/src/lib/elm_web.eo b/src/lib/elm_web.eo
index e0b8863..a9ff918 100644
--- a/src/lib/elm_web.eo
+++ b/src/lib/elm_web.eo
@@ -675,6 +675,7 @@ class Elm.Web (Elm.Widget)
url,changed; [[s]]
focused;
unfocused;
+ windows,close,request;
}
}
diff --git a/src/lib/elm_web2.c b/src/lib/elm_web2.c
index 94e94eb..c37bcd8 100644
--- a/src/lib/elm_web2.c
+++ b/src/lib/elm_web2.c
@@ -78,7 +78,7 @@ _view_smart_window_close(Ewk_View_Smart_Data *sd)
ELM_WEB_CHECK(obj);
- evas_object_smart_callback_call(obj, windows,close,request, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_WEB_EVENT_WINDOWS_CLOSE_REQUEST,
NULL);
}
static void
@@ -194,8 +194,8 @@ _view_smart_popup_menu_show(Ewk_View_Smart_Data *sd,
evas_object_data_set(sd-self, _select_popup, notify);
- evas_object_smart_callback_add
- (notify, block,clicked, _popup_dismiss_cb, menu);
+ eo_do(notify, eo_event_callback_add
+ (ELM_NOTIFY_EVENT_BLOCK_CLICKED, _popup_dismiss_cb, menu));
return EINA_TRUE;
}
@@ -212,19 +212,25 @@ _view_smart_popup_menu_hide(Ewk_View_Smart_Data *sd)
return EINA_TRUE;
}
-static void
-_fullscreen_accept(void *data, Evas_Object *obj EINA_UNUSED, void *ev
EINA_UNUSED)
+static Eina_Bool
+_fullscreen_accept(void *data,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *ewk = data;
evas_object_del(evas_object_data_get(ewk, _fullscreen_permission_popup));
+
+ return EINA_TRUE;
}
-static void
-_fullscreen_deny(void *data, Evas_Object *obj EINA_UNUSED, void *ev
EINA_UNUSED)
+static Eina_Bool
+_fullscreen_deny(void *data,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
Evas_Object *ewk = data;
ewk_view_fullscreen_exit(ewk);
evas_object_del(evas_object_data_get(ewk, _fullscreen_permission_popup));
+
+ return EINA_TRUE;
}
static Eina_Bool
@@ -252,12 +258,14 @@ _view_smart_fullscreen_enter(Ewk_View_Smart_Data *sd,
Ewk_Security_Origin *origi
btn = elm_button_add(popup);
elm_object_text_set(btn, Accept);
elm_object_part_content_set(popup, button1, btn);
- evas_object_smart_callback_add(btn, clicked, _fullscreen_accept,
sd-self);
+ eo_do(btn, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _fullscreen_accept, sd-self));
btn = elm_button_add(popup);
elm_object_text_set(btn, Deny);
elm_object_part_content_set(popup, button2, btn);
- evas_object_smart_callback_add(btn, clicked, _fullscreen_deny, sd-self);
+ eo_do(btn, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _fullscreen_deny, sd-self));
evas_object_data_set(sd-self, _fullscreen_permission_popup, popup);
evas_object_show(popup);
@@ -278,10 +286,9 @@ _view_smart_fullscreen_exit(Ewk_View_Smart_Data *sd)
return EINA_TRUE;
}
-static void
+static Eina_Bool
_bt_close(void *data,
- Evas_Object *obj,
- void *event_info EINA_UNUSED)
+ Eo *obj, const Eo_Event_Description *desc EINA_UNUSED, void *event_info
EINA_UNUSED)
{
Dialog_Data *d = data;
@@ -296,6 +303,8 @@ _bt_close(void *data,
end:
evas_object_del(d-dialog);
free(d);
+
+ return EINA_TRUE;
}
static Dialog_Data *
@@ -311,8 +320,8 @@ _dialog_new(Evas_Object *web, Eina_Bool inwin_mode)
Evas_Object *bg;
d-dialog = elm_win_add(NULL, elm-web-popup, ELM_WIN_DIALOG_BASIC);
-evas_object_smart_callback_add
- (d-dialog, delete,request, _bt_close, d);
+eo_do(d-dialog, eo_event_callback_add
+ (ELM_WIN_EVENT_DELETE_REQUEST, _bt_close, d));
bg = elm_bg_add(d-dialog);
evas_object_size_hint_weight_set
@@ -361,7 +370,8 @@ _dialog_ok_cancel_buttons_add(Dialog_Data *dialog_data)
elm_box_pack_end(bx, bt);
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_smart_callback_add(bt, clicked, _bt_close, dialog_data);
+ eo_do(bt, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _bt_close, dialog_data));
evas_object_show(bt);
dialog_data-bt_ok = bt = elm_button_add(bx);
@@ -369,7 +379,8 @@ _dialog_ok_cancel_buttons_add(Dialog_Data *dialog_data)
elm_box_pack_end(bx, bt);
evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bt,
[EGIT] [core/elementary] master 03/24: elm_radio, elm_slider: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=cd8fd5c9c49a07ff6f5db32e94d4676a0b2d4849
commit cd8fd5c9c49a07ff6f5db32e94d4676a0b2d4849
Author: Avi Levin avi.le...@samsung.com
Date: Tue Jun 9 16:33:29 2015 +0300
elm_radio, elm_slider: porting evas smart callbacks to eo
---
src/lib/elm_radio.c | 4 +++-
src/lib/elm_slider.c | 19 ++-
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index efa57cb..715b5a8 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -109,7 +109,9 @@ _activate(Evas_Object *obj)
if (_elm_config-access_mode)
_elm_access_say(E_(State: On));
-evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
+eo_do(obj, eo_event_callback_call
+ (ELM_RADIO_EVENT_CHANGED, NULL));
+
}
}
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 8ace028..5d8eafc 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -63,7 +63,7 @@ _delay_change(void *data)
ELM_SLIDER_DATA_GET(data, sd);
sd-delay = NULL;
- evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_DELAY_CHANGED, NULL));
return ECORE_CALLBACK_CANCEL;
}
@@ -94,7 +94,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
sd-val = val;
if (user_event)
{
- evas_object_smart_callback_call(obj, SIG_CHANGED, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_CHANGED,
NULL));
elm_interface_atspi_accessible_value_changed_signal_emit(obj);
ecore_timer_del(sd-delay);
sd-delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL,
_delay_change, obj);
@@ -241,7 +241,7 @@ _drag_start(void *data,
const char *source EINA_UNUSED)
{
_slider_update(data, EINA_TRUE);
- evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START,
NULL));
elm_widget_scroll_freeze_push(data);
}
@@ -252,7 +252,7 @@ _drag_stop(void *data,
const char *source EINA_UNUSED)
{
_slider_update(data, EINA_TRUE);
- evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP,
NULL));
elm_widget_scroll_freeze_pop(data);
}
@@ -645,7 +645,7 @@ _spacer_down_cb(void *data,
(wd-resize_obj, elm.dragable.slider,
button_x, button_y);
_slider_update(data, EINA_TRUE);
- evas_object_smart_callback_call(data, SIG_DRAG_START, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START,
NULL));
elm_layout_signal_emit(data, elm,state,indicator,show, elm);
}
@@ -682,7 +682,8 @@ _spacer_move_cb(void *data,
{
if (sd-spacer_down) sd-spacer_down = EINA_FALSE;
_slider_update(data, EINA_TRUE);
- evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
+ eo_do(data, eo_event_callback_call
+ (ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
if (sd-frozen)
{
elm_widget_scroll_freeze_pop(data);
@@ -725,7 +726,7 @@ _spacer_up_cb(void *data,
if (sd-spacer_down) sd-spacer_down = EINA_FALSE;
_slider_update(data, EINA_TRUE);
- evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL);
+ eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP,
NULL));
if (sd-frozen)
{
@@ -1236,12 +1237,12 @@
_elm_slider_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Slider_Dat
if (sd-val_min value) return EINA_FALSE;
if (sd-val_max value) return EINA_FALSE;
- evas_object_smart_callback_call(obj, SIG_DRAG_START, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START,
NULL));
sd-val = value;
_visuals_refresh(obj);
sd-val = oldval;
_slider_update(obj, EINA_TRUE);
- evas_object_smart_callback_call(obj, SIG_DRAG_STOP, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
return EINA_TRUE;
}
--
[EGIT] [core/elementary] master 15/24: elm_menu: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=160b62e5d239aa5d2378de349c1c514b280e83f2
commit 160b62e5d239aa5d2378de349c1c514b280e83f2
Author: Avi Levin avi.le...@samsung.com
Date: Wed May 13 18:15:59 2015 +0300
elm_menu: porting evas smart callbacks to eo
---
src/lib/elm_menu.c | 52 +++-
src/lib/elm_menu.eo | 3 +++
2 files changed, 34 insertions(+), 21 deletions(-)
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index cf5dbf1..ce49793 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -419,14 +419,17 @@ _menu_hide(void *data,
}
}
-static void
+static Eina_Bool
_hover_dismissed_cb(void *data,
-Evas_Object *obj,
+Eo *obj, const Eo_Event_Description *desc EINA_UNUSED,
void *event_info)
{
_menu_hide(data, obj, event_info);
- evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
- evas_object_smart_callback_call(data, SIG_DISMISSED, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+ eo_do(data, eo_event_callback_call(ELM_MENU_EVENT_DISMISSED, NULL));
+
+ return EINA_TRUE;
}
static void
@@ -509,8 +512,9 @@ _menu_item_inactivate_cb(void *data,
if (item-submenu.open) _submenu_hide(item);
}
-static void
-_block_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+static Eina_Bool
+_block_menu(void *_sd,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
const Eina_List *l;
Elm_Object_Item *eo_current;
@@ -524,10 +528,13 @@ _block_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSE
current-blocked = EINA_TRUE;
elm_object_item_disabled_set(eo_current, EINA_TRUE);
}
+
+ return EINA_TRUE;
}
-static void
-_unblock_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+static Eina_Bool
+_unblock_menu(void *_sd,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void
*event_info EINA_UNUSED)
{
const Eina_List *l;
Elm_Object_Item *eo_current;
@@ -539,6 +546,8 @@ _unblock_menu(void *_sd, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNU
elm_object_item_disabled_set(eo_current, !current-was_enabled);
current-blocked = EINA_FALSE;
}
+
+ return EINA_TRUE;
}
EOLIAN static void
@@ -605,8 +614,8 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
{
snprintf(style, sizeof(style), main_menu_submenu/%s,
elm_widget_style_get(WIDGET(item)));
elm_object_style_set(hv, style);
-evas_object_smart_callback_add(hv, dismissed,
- _hover_dismissed_cb, WIDGET(item));
+eo_do(hv, eo_event_callback_add
+ (ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, WIDGET(item)));
}
else
{
@@ -667,8 +676,8 @@ _elm_menu_evas_object_smart_add(Eo *obj, Elm_Menu_Data
*priv)
elm_widget_mirrored_set(priv-hv, EINA_FALSE);
elm_object_style_set(priv-hv, menu/default);
- evas_object_smart_callback_add(priv-hv, dismissed,
- _hover_dismissed_cb, obj);
+ eo_do(priv-hv, eo_event_callback_add
+ (ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj));
priv-bx = elm_box_add(obj);
elm_widget_mirrored_set(priv-bx, EINA_FALSE);
@@ -741,16 +750,17 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
if (menu_bar)
{
- evas_object_smart_callback_add(item-submenu.hv, clicked,
-_hover_dismissed_cb, WIDGET(item));
+ eo_do(item-submenu.hv, eo_event_callback_add
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
+_hover_dismissed_cb, WIDGET(item)));
snprintf(style, sizeof(style), main_menu_submenu//%s,
elm_widget_style_get(obj));
elm_object_style_set(item-submenu.hv, style);
}
else
{
- evas_object_smart_callback_del_full(item-submenu.hv, clicked,
- _hover_dismissed_cb,
- WIDGET(item));
+ eo_do(item-submenu.hv, eo_event_callback_del(
+ EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
+ _hover_dismissed_cb, WIDGET(item)));
snprintf(style, sizeof(style), submenu/%s,
elm_widget_style_get(obj));
elm_object_style_set(item-submenu.hv, style);
}
@@ -786,10 +796,10 @@ _elm_menu_eo_base_constructor(Eo *obj, Elm_Menu_Data *sd)
(sd-hv, ELM_HOVER_AXIS_VERTICAL), sd-bx);
_sizing_eval(obj);
- evas_object_smart_callback_add(obj, elm,action,block_menu,
- _block_menu, sd);
- evas_object_smart_callback_add(obj,
[EGIT] [core/elementary] master 09/24: elm_diskselector: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ea1f362d2f0573034a52236f9bf23b62bf25d3e2
commit ea1f362d2f0573034a52236f9bf23b62bf25d3e2
Author: Avi Levin avi.le...@samsung.com
Date: Thu May 7 18:14:27 2015 +0300
elm_diskselector: porting evas smart callbacks to eo
---
src/lib/elm_diskselector.c | 24 +++-
src/lib/elm_diskselector.eo | 10 +++---
2 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/lib/elm_diskselector.c b/src/lib/elm_diskselector.c
index 8433a88..a367f34 100644
--- a/src/lib/elm_diskselector.c
+++ b/src/lib/elm_diskselector.c
@@ -89,7 +89,8 @@ _item_select(Elm_Diskselector_Item_Data *it)
_selected_item_indicate(sd-selected_item);
if (it-func) it-func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it),
eo_it);
- evas_object_smart_callback_call(WIDGET(it), SIG_SELECTED, eo_it);
+ eo_do(WIDGET(it), eo_event_callback_call
+ (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
}
static int
@@ -610,7 +611,8 @@ _item_click_cb(void *data,
}
if (it-func) it-func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it),
eo_it);
- evas_object_smart_callback_call(WIDGET(it), SIG_CLICKED, eo_it);
+ eo_do(WIDGET(it), eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_it));
}
static char *
@@ -1096,31 +1098,35 @@ _scroll_animate_stop_cb(Evas_Object *obj,
if (!it) return;
_item_select(it);
- evas_object_smart_callback_call(data, SIG_SCROLL_ANIM_STOP, EO_OBJ(it));
+ eo_do(data, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, EO_OBJ(it)));
}
static void
_scroll_animate_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call
- (obj, SIG_SCROLL_ANIM_START, elm_diskselector_selected_item_get(obj));
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START,
+ elm_diskselector_selected_item_get(obj)));
}
static void
_scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call
- (obj, SIG_SCROLL_DRAG_START, elm_diskselector_selected_item_get(obj));
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START,
+ elm_diskselector_selected_item_get(obj)));
}
static void
_scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call
- (obj, SIG_SCROLL_DRAG_STOP, elm_diskselector_selected_item_get(obj));
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP,
+ elm_diskselector_selected_item_get(obj)));
}
static void
diff --git a/src/lib/elm_diskselector.eo b/src/lib/elm_diskselector.eo
index 2a6fb12..9c8ff86 100644
--- a/src/lib/elm_diskselector.eo
+++ b/src/lib/elm_diskselector.eo
@@ -1,5 +1,7 @@
class Elm.Diskselector (Elm.Widget, Elm_Interface_Scrollable,
-Elm_Interface_Atspi_Widget_Action)
+Elm_Interface_Atspi_Widget_Action,
+Evas.Clickable_Interface, Evas.Scrollable_Interface,
+Evas.Selectable_Interface)
{
eo_prefix: elm_obj_diskselector;
methods {
@@ -251,12 +253,6 @@ class Elm.Diskselector (Elm.Widget,
Elm_Interface_Scrollable,
Elm_Interface_Atspi_Widget_Action.elm_actions.get;
}
events {
- selected;
- clicked;
- scroll,anim,start;
- scroll,anim,stop;
- scroll,drag,start;
- scroll,drag,stop;
language,changed;
access,changed;
focused;
--
[EGIT] [core/elementary] master 06/24: elm_hover: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=f142b4655b8ac7d6c19470e2be82c4ea4275e14c
commit f142b4655b8ac7d6c19470e2be82c4ea4275e14c
Author: Avi Levin avi.le...@samsung.com
Date: Thu May 7 17:01:09 2015 +0300
elm_hover: porting evas smart callbacks to eo
---
src/lib/elm_hover.c | 14 --
src/lib/elm_hover.eo | 2 ++
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/lib/elm_hover.c b/src/lib/elm_hover.c
index d568e27..c55905e 100644
--- a/src/lib/elm_hover.c
+++ b/src/lib/elm_hover.c
@@ -243,8 +243,8 @@ _elm_hover_smt_sub_re_eval(Evas_Object *obj)
sd-smt_sub-obj = sub;
if (sd-smt_sub != prev)
- evas_object_smart_callback_call
- (obj, SIG_SMART_LOCATION_CHANGED, (void *)sd-smt_sub-swallow);
+ eo_do(obj, eo_event_callback_call
+ (ELM_HOVER_EVENT_SMART_CHANGED, (void *)sd-smt_sub-swallow));
if (elm_widget_mirrored_get(obj))
{
@@ -517,8 +517,9 @@ _hov_dismiss_cb(void *data,
const char *source EINA_UNUSED)
{
evas_object_hide(data);
- evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
- evas_object_smart_callback_call(data, SIG_DISMISSED, NULL);
+ eo_do(data, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+ eo_do(data, eo_event_callback_call(ELM_HOVER_EVENT_DISMISSED, NULL));
}
EOLIAN static void
@@ -560,8 +561,9 @@ _elm_hover_evas_object_smart_del(Eo *obj, Elm_Hover_Data
*sd)
if (evas_object_visible_get(obj))
{
-evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
-evas_object_smart_callback_call(obj, SIG_DISMISSED, NULL);
+eo_do(obj, eo_event_callback_call
+ (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, NULL));
+eo_do(obj, eo_event_callback_call(ELM_HOVER_EVENT_DISMISSED, NULL));
}
elm_hover_target_set(obj, NULL);
diff --git a/src/lib/elm_hover.eo b/src/lib/elm_hover.eo
index 0e8b210..3e2d040 100644
--- a/src/lib/elm_hover.eo
+++ b/src/lib/elm_hover.eo
@@ -88,6 +88,8 @@ class Elm.Hover (Elm.Layout, Evas.Clickable_Interface)
events {
focused;
unfocused;
+ smart,changed;
+ dismissed;
}
}
--
[EGIT] [core/elementary] master 14/24: elc_fileselector, elc_fileselector_button: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=3c5297bcfc91bb909e06a05ecc4b601fa5cdd5fc
commit 3c5297bcfc91bb909e06a05ecc4b601fa5cdd5fc
Author: Avi Levin avi.le...@samsung.com
Date: Sun May 10 17:49:01 2015 +0300
elc_fileselector, elc_fileselector_button: porting evas smart callbacks to
eo
---
src/lib/elc_fileselector.c | 238 +++--
src/lib/elc_fileselector_button.c | 25 ++--
src/lib/elm_fileselector.eo| 9 +-
src/lib/elm_fileselector_button.eo | 3 +-
4 files changed, 174 insertions(+), 101 deletions(-)
diff --git a/src/lib/elc_fileselector.c b/src/lib/elc_fileselector.c
index 32d3cff..7c5fb7e 100644
--- a/src/lib/elc_fileselector.c
+++ b/src/lib/elc_fileselector.c
@@ -58,8 +58,10 @@ static const Elm_Action key_actions[] = {
{NULL, NULL}
};
-static void _ok(void *data, Evas_Object *obj, void *event_info);
-static void _canc(void *data, Evas_Object *obj, void *event_info);
+static Eina_Bool _ok(void *data,
+ Eo *obj, const Eo_Event_Description *desc, void *event_info);
+static Eina_Bool _canc(void *data,
+ Eo *obj, const Eo_Event_Description *desc, void *event_info);
/* final routine on deletion */
static void
@@ -158,14 +160,14 @@ _elm_fileselector_elm_widget_theme_apply(Eo *obj,
Elm_Fileselector_Data *sd)
static Eina_Bool
_key_action_select(Evas_Object *obj, const char *params EINA_UNUSED)
{
- _ok(obj, NULL, NULL);
+ _ok(obj, NULL, NULL, NULL);
return EINA_TRUE;
}
static Eina_Bool
_key_action_escape(Evas_Object *obj, const char *params EINA_UNUSED)
{
- _canc(obj, NULL, NULL);
+ _canc(obj, NULL, NULL, NULL);
return EINA_TRUE;
}
@@ -546,8 +548,8 @@ _signal_first(Listing_Request *lreq)
EINA_LIST_FREE(sd-paths, path) free(path);
}
- evas_object_smart_callback_call
- (lreq-obj, SIG_DIRECTORY_OPEN, (void *)lreq-path);
+ eo_do(lreq-obj, eo_event_callback_call
+ (ELM_FILESELECTOR_EVENT_DIRECTORY_OPEN, (void *)lreq-path));
if (!lreq-parent_it)
{
@@ -705,45 +707,53 @@ _populate(Evas_Object *obj,
}
-static void
+static Eina_Bool
_on_list_expanded(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
Elm_Object_Item *it = event_info;
const char *path = elm_object_item_data_get(it);
_populate(data, path, it, NULL);
+
+ return EINA_TRUE;
}
-static void
-_on_list_contracted(void *data EINA_UNUSED,
-Evas_Object *obj EINA_UNUSED,
+static Eina_Bool
+_on_list_contracted(void *data EINA_UNUSED,
+Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
Elm_Object_Item *it = event_info;
elm_genlist_item_subitems_clear(it);
+
+ return EINA_TRUE;
}
-static void
-_on_list_expand_req(void *data EINA_UNUSED,
-Evas_Object *obj EINA_UNUSED,
+static Eina_Bool
+_on_list_expand_req(void *data EINA_UNUSED,
+Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
Elm_Object_Item *it = event_info;
elm_genlist_item_expanded_set(it, EINA_TRUE);
+
+ return EINA_TRUE;
}
-static void
-_on_list_contract_req(void *data EINA_UNUSED,
- Evas_Object *obj EINA_UNUSED,
+static Eina_Bool
+_on_list_contract_req(void *data EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
Elm_Object_Item *it = event_info;
elm_genlist_item_expanded_set(it, EINA_FALSE);
+
+ return EINA_TRUE;
}
static Eina_Bool
@@ -787,9 +797,9 @@ _schedule_populate(Evas_Object *fs,
sd-populate_idler = ecore_idler_add(_populate_do, sdata);
}
-static void
+static Eina_Bool
_on_item_activated(void *data,
- Evas_Object *obj EINA_UNUSED,
+ Eo *obj EINA_UNUSED, const Eo_Event_Description *desc
EINA_UNUSED,
void *event_info)
{
//This event_info could be a list or gengrid item
@@ -800,18 +810,21 @@ _on_item_activated(void *data,
ELM_FILESELECTOR_DATA_GET(data, sd);
path = elm_object_item_data_get(it);
- if (!path) return;
+ if (!path) return EINA_TRUE;
is_dir = ecore_file_is_dir(path);
if (!is_dir)
{
-evas_object_smart_callback_call(data, SIG_ACTIVATED, (void *)path);
-return;
+eo_do(data, eo_event_callback_call
+ (ELM_FILESELECTOR_EVENT_ACTIVATED, (void *)path));
+return EINA_TRUE;
}
- if (!sd-double_tap_navigation) return;
+ if (!sd-double_tap_navigation) return EINA_TRUE;
_schedule_populate(data, sd, eina_stringshare_add(path), NULL);
+
+ return EINA_TRUE;
}
static void
@@ -842,9 +855,9 @@
[EGIT] [core/elementary] master 11/24: elm_scroller: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9bdf0e86ee09d790746dc45f49db8e753463e06e
commit 9bdf0e86ee09d790746dc45f49db8e753463e06e
Author: Avi Levin avi.le...@samsung.com
Date: Sun May 10 11:50:37 2015 +0300
elm_scroller: porting evas smart callbacks to eo
---
src/lib/elm_scroller.c | 46 ++
src/lib/elm_scroller.eo | 18 +-
2 files changed, 43 insertions(+), 21 deletions(-)
diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c
index 07ec426..98f103b 100644
--- a/src/lib/elm_scroller.c
+++ b/src/lib/elm_scroller.c
@@ -491,140 +491,146 @@ static void
_edge_left_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_LEFT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_LEFT, NULL));
}
static void
_edge_right_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_RIGHT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_RIGHT, NULL));
}
static void
_edge_top_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_TOP, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_TOP, NULL));
}
static void
_edge_bottom_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_EDGE_BOTTOM, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_EDGE_BOTTOM, NULL));
}
static void
_scroll_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL, NULL));
}
static void
_scroll_left_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_LEFT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_LEFT, NULL));
}
static void
_scroll_right_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_RIGHT, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_RIGHT, NULL));
}
static void
_scroll_up_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_UP, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_UP, NULL));
}
static void
_scroll_down_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_DOWN, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_SCROLL_DOWN, NULL));
}
static void
_scroll_anim_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_START, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_START, NULL));
}
static void
_scroll_anim_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_ANIM_STOP, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_ANIM_STOP, NULL));
}
static void
_scroll_drag_start_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_START, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_START, NULL));
}
static void
_scroll_drag_stop_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_SCROLL_DRAG_STOP, NULL);
+ eo_do(obj, eo_event_callback_call
+ (EVAS_SCROLLABLE_INTERFACE_EVENT_SCROLL_DRAG_STOP, NULL));
}
static void
_vbar_drag_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_VBAR_DRAG, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_VBAR_DRAG, NULL));
}
static void
_vbar_press_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_VBAR_PRESS, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_VBAR_PRESS, NULL));
}
static void
_vbar_unpress_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_VBAR_UNPRESS, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_VBAR_UNPRESS, NULL));
}
static void
_hbar_drag_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
- evas_object_smart_callback_call(obj, SIG_HBAR_DRAG, NULL);
+ eo_do(obj, eo_event_callback_call(ELM_SCROLLER_EVENT_HBAR_DRAG, NULL));
}
static void
_hbar_press_cb(Evas_Object *obj,
void *data EINA_UNUSED)
{
-
[EGIT] [core/elementary] master 12/24: elm_panes: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=2b65a7ddce9d03a9bb09080de961f9863c685d35
commit 2b65a7ddce9d03a9bb09080de961f9863c685d35
Author: Avi Levin avi.le...@samsung.com
Date: Sun May 10 11:57:14 2015 +0300
elm_panes: porting evas smart callbacks to eo
---
src/lib/elm_panes.c | 8
src/lib/elm_panes.eo | 4 +---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c
index 716f233..335fe95 100644
--- a/src/lib/elm_panes.c
+++ b/src/lib/elm_panes.c
@@ -137,7 +137,7 @@ _on_clicked(void *data,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
- evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+ eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
NULL));
}
static void
@@ -157,7 +157,7 @@ _on_pressed(void *data,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
- evas_object_smart_callback_call(data, SIG_PRESS, NULL);
+ eo_do(data, eo_event_callback_call(ELM_PANES_EVENT_PRESS, NULL));
}
static void
@@ -167,11 +167,11 @@ _on_unpressed(void *data,
const char *source EINA_UNUSED)
{
ELM_PANES_DATA_GET(data, sd);
- evas_object_smart_callback_call(data, SIG_UNPRESS, NULL);
+ eo_do(data, eo_event_callback_call(ELM_PANES_EVENT_UNPRESS, NULL));
if (sd-double_clicked)
{
-evas_object_smart_callback_call(data, SIG_DOUBLE_CLICKED, NULL);
+eo_do(data,
eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED_DOUBLE, NULL));
sd-double_clicked = EINA_FALSE;
}
}
diff --git a/src/lib/elm_panes.eo b/src/lib/elm_panes.eo
index ffab1ef..3a9b833 100644
--- a/src/lib/elm_panes.eo
+++ b/src/lib/elm_panes.eo
@@ -1,4 +1,4 @@
-class Elm.Panes (Elm.Layout)
+class Elm.Panes (Elm.Layout, Evas.Clickable_Interface)
{
eo_prefix: elm_obj_panes;
methods {
@@ -276,10 +276,8 @@ class Elm.Panes (Elm.Layout)
Elm.Layout.content_aliases.get;
}
events {
- clicked;
press;
unpress;
- clicked,double;
}
}
--
[EGIT] [core/elementary] master 17/24: elm_slideshow, elm_plug: porting evas smart callbacks to eo
jackdanielz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8ac8bb54f477eb153b4e37eb630273e0bfea77ec
commit 8ac8bb54f477eb153b4e37eb630273e0bfea77ec
Author: Avi Levin avi.le...@samsung.com
Date: Wed May 13 14:47:09 2015 +0300
elm_slideshow, elm_plug: porting evas smart callbacks to eo
---
src/lib/elm_plug.c | 6 +++---
src/lib/elm_plug.eo | 3 +--
src/lib/elm_slideshow.c | 12
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/lib/elm_plug.c b/src/lib/elm_plug.c
index d7f4448..c3c31aa 100644
--- a/src/lib/elm_plug.c
+++ b/src/lib/elm_plug.c
@@ -42,7 +42,7 @@ _elm_plug_disconnected(Ecore_Evas *ee)
{
Evas_Object *plug = ecore_evas_data_get(ee, PLUG_KEY);
EINA_SAFETY_ON_NULL_RETURN(plug);
- evas_object_smart_callback_call(plug, SIG_IMAGE_DELETED, NULL);
+ eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_DELETED, NULL));
/* TODO: was a typo. Deprecated, remove in future releases: */
evas_object_smart_callback_call(plug, image.deleted, NULL);
}
@@ -55,7 +55,7 @@ _elm_plug_resized(Ecore_Evas *ee)
EINA_SAFETY_ON_NULL_RETURN(plug);
ecore_evas_geometry_get(ee, NULL, NULL, (size.w), (size.h));
- evas_object_smart_callback_call(plug, SIG_IMAGE_RESIZED, size);
+ eo_do(plug, eo_event_callback_call(ELM_PLUG_EVENT_IMAGE_RESIZED, size));
}
EOLIAN static Eina_Bool
@@ -103,7 +103,7 @@ _on_mouse_up(void *data,
if (ev-button != 1) return;
if (ev-event_flags EVAS_EVENT_FLAG_ON_HOLD) return;
- evas_object_smart_callback_call(data, SIG_CLICKED, NULL);
+ eo_do(data, eo_event_callback_call(EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED,
NULL));
}
EOLIAN static void
diff --git a/src/lib/elm_plug.eo b/src/lib/elm_plug.eo
index 9b41e68..b89be97 100644
--- a/src/lib/elm_plug.eo
+++ b/src/lib/elm_plug.eo
@@ -1,4 +1,4 @@
-class Elm.Plug (Elm.Widget)
+class Elm.Plug (Elm.Widget, Evas.Clickable_Interface)
{
eo_prefix: elm_obj_plug;
data: null;
@@ -45,7 +45,6 @@ class Elm.Plug (Elm.Widget)
Elm.Widget.on_focus;
}
events {
- clicked;
image,deleted;
image,resized; [[ii]]
}
diff --git a/src/lib/elm_slideshow.c b/src/lib/elm_slideshow.c
index 87542c0..7d9c454 100644
--- a/src/lib/elm_slideshow.c
+++ b/src/lib/elm_slideshow.c
@@ -271,7 +271,8 @@ _on_slideshow_end(void *data,
elm_layout_signal_emit(data, anim,end, slideshow);
if (emission != NULL)
- evas_object_smart_callback_call(data, SIG_TRANSITION_END,
EO_OBJ(sd-current));
+ eo_do(data, eo_event_callback_call
+ (ELM_SLIDESHOW_EVENT_TRANSITION_END, EO_OBJ(sd-current)));
}
static Eina_Bool
@@ -480,7 +481,8 @@ _elm_slideshow_item_show(Eo *eo_item EINA_UNUSED,
Elm_Slideshow_Item_Data *item)
sd-previous = sd-current;
sd-current = next;
- evas_object_smart_callback_call(WIDGET(item), SIG_CHANGED,
EO_OBJ(sd-current));
+ eo_do(WIDGET(item), eo_event_callback_call
+ (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd-current)));
}
EOLIAN static void
@@ -517,7 +519,8 @@ _elm_slideshow_next(Eo *obj, Elm_Slideshow_Data *sd)
sd-previous = sd-current;
sd-current = next;
- evas_object_smart_callback_call(obj, SIG_CHANGED, EO_OBJ(sd-current));
+ eo_do(obj, eo_event_callback_call
+ (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd-current)));
}
EOLIAN static void
@@ -554,7 +557,8 @@ _elm_slideshow_previous(Eo *obj, Elm_Slideshow_Data *sd)
sd-previous = sd-current;
sd-current = prev;
- evas_object_smart_callback_call(obj, SIG_CHANGED, EO_OBJ(sd-current));
+ eo_do(obj, eo_event_callback_call
+ (ELM_SLIDESHOW_EVENT_CHANGED, EO_OBJ(sd-current)));
}
EOLIAN static const Eina_List*
--
[EGIT] [core/efl] master 01/01: evas gl - dont crash if gl image internal im is null
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=ecc17e621eb752a85b8da3c58c6dacef973213a3 commit ecc17e621eb752a85b8da3c58c6dacef973213a3 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Sun Jul 5 18:01:06 2015 +0900 evas gl - dont crash if gl image internal im is null new crash i saw today --- src/modules/evas/engines/gl_generic/evas_engine.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c b/src/modules/evas/engines/gl_generic/evas_engine.c index ef55214..b4da74e 100644 --- a/src/modules/evas/engines/gl_generic/evas_engine.c +++ b/src/modules/evas/engines/gl_generic/evas_engine.c @@ -1967,6 +1967,8 @@ eng_pixel_alpha_get(void *image, int x, int y, DATA8 *alpha, int src_region_x, i } evas_gl_common_image_alloc_ensure(im); + if (!im-im) return EINA_FALSE; + src_w = im-im-cache_entry.w; src_h = im-im-cache_entry.h; if ((src_w == 0) || (src_h == 0)) --
[EGIT] [core/efl] master 01/01: Evas.Image: Fix legacy EAPI name
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=45cef3e0a5c7be5f9e527eecdd40e59c79cc4b68
commit 45cef3e0a5c7be5f9e527eecdd40e59c79cc4b68
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Mon Jul 6 14:22:45 2015 +0900
Evas.Image: Fix legacy EAPI name
Thanks @kuuko for the report. Sorry for the breakage of Python apps.
---
src/lib/evas/canvas/evas_object_image.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_object_image.c
b/src/lib/evas/canvas/evas_object_image.c
index aee6260..a346e21 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -1601,7 +1601,7 @@ _evas_image_efl_image_smooth_scale_get(Eo *eo_obj
EINA_UNUSED, Evas_Image_Data *
/* deprecated */
EAPI void
-_evas_image_reload(Eo *eo_obj)
+evas_object_image_reload(Eo *eo_obj)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj,
EVAS_OBJECT_CLASS);
Evas_Image_Data *o;
--
