summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-06-09 16:33:29 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:32 +0300
commit2b3e6991a264d61195e9b18e82f5f71bcf91e086 (patch)
tree7635ae11f78454b49a3145e48d3b919c67ef511e
parent51d902d4aee0c52e8f54a79148eeae936eb203b1 (diff)
elm_radio, elm_slider: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_radio.c4
-rw-r--r--src/lib/elm_slider.c19
2 files changed, 13 insertions, 10 deletions
diff --git a/src/lib/elm_radio.c b/src/lib/elm_radio.c
index efa57cbde..715b5a852 100644
--- a/src/lib/elm_radio.c
+++ b/src/lib/elm_radio.c
@@ -109,7 +109,9 @@ _activate(Evas_Object *obj)
109 109
110 if (_elm_config->access_mode) 110 if (_elm_config->access_mode)
111 _elm_access_say(E_("State: On")); 111 _elm_access_say(E_("State: On"));
112 evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); 112 eo_do(obj, eo_event_callback_call
113 (ELM_RADIO_EVENT_CHANGED, NULL));
114
113 } 115 }
114} 116}
115 117
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 8ace028cf..5d8eafce4 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -63,7 +63,7 @@ _delay_change(void *data)
63 ELM_SLIDER_DATA_GET(data, sd); 63 ELM_SLIDER_DATA_GET(data, sd);
64 64
65 sd->delay = NULL; 65 sd->delay = NULL;
66 evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, NULL); 66 eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_DELAY_CHANGED, NULL));
67 67
68 return ECORE_CALLBACK_CANCEL; 68 return ECORE_CALLBACK_CANCEL;
69} 69}
@@ -94,7 +94,7 @@ _val_fetch(Evas_Object *obj, Eina_Bool user_event)
94 sd->val = val; 94 sd->val = val;
95 if (user_event) 95 if (user_event)
96 { 96 {
97 evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); 97 eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_CHANGED, NULL));
98 elm_interface_atspi_accessible_value_changed_signal_emit(obj); 98 elm_interface_atspi_accessible_value_changed_signal_emit(obj);
99 ecore_timer_del(sd->delay); 99 ecore_timer_del(sd->delay);
100 sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj); 100 sd->delay = ecore_timer_add(SLIDER_DELAY_CHANGED_INTERVAL, _delay_change, obj);
@@ -241,7 +241,7 @@ _drag_start(void *data,
241 const char *source EINA_UNUSED) 241 const char *source EINA_UNUSED)
242{ 242{
243 _slider_update(data, EINA_TRUE); 243 _slider_update(data, EINA_TRUE);
244 evas_object_smart_callback_call(data, SIG_DRAG_START, NULL); 244 eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL));
245 elm_widget_scroll_freeze_push(data); 245 elm_widget_scroll_freeze_push(data);
246} 246}
247 247
@@ -252,7 +252,7 @@ _drag_stop(void *data,
252 const char *source EINA_UNUSED) 252 const char *source EINA_UNUSED)
253{ 253{
254 _slider_update(data, EINA_TRUE); 254 _slider_update(data, EINA_TRUE);
255 evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL); 255 eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
256 elm_widget_scroll_freeze_pop(data); 256 elm_widget_scroll_freeze_pop(data);
257} 257}
258 258
@@ -645,7 +645,7 @@ _spacer_down_cb(void *data,
645 (wd->resize_obj, "elm.dragable.slider", 645 (wd->resize_obj, "elm.dragable.slider",
646 button_x, button_y); 646 button_x, button_y);
647 _slider_update(data, EINA_TRUE); 647 _slider_update(data, EINA_TRUE);
648 evas_object_smart_callback_call(data, SIG_DRAG_START, NULL); 648 eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL));
649 elm_layout_signal_emit(data, "elm,state,indicator,show", "elm"); 649 elm_layout_signal_emit(data, "elm,state,indicator,show", "elm");
650} 650}
651 651
@@ -682,7 +682,8 @@ _spacer_move_cb(void *data,
682 { 682 {
683 if (sd->spacer_down) sd->spacer_down = EINA_FALSE; 683 if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
684 _slider_update(data, EINA_TRUE); 684 _slider_update(data, EINA_TRUE);
685 evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL); 685 eo_do(data, eo_event_callback_call
686 (ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
686 if (sd->frozen) 687 if (sd->frozen)
687 { 688 {
688 elm_widget_scroll_freeze_pop(data); 689 elm_widget_scroll_freeze_pop(data);
@@ -725,7 +726,7 @@ _spacer_up_cb(void *data,
725 if (sd->spacer_down) sd->spacer_down = EINA_FALSE; 726 if (sd->spacer_down) sd->spacer_down = EINA_FALSE;
726 727
727 _slider_update(data, EINA_TRUE); 728 _slider_update(data, EINA_TRUE);
728 evas_object_smart_callback_call(data, SIG_DRAG_STOP, NULL); 729 eo_do(data, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
729 730
730 if (sd->frozen) 731 if (sd->frozen)
731 { 732 {
@@ -1236,12 +1237,12 @@ _elm_slider_elm_interface_atspi_value_value_and_text_set(Eo *obj, Elm_Slider_Dat
1236 if (sd->val_min > value) return EINA_FALSE; 1237 if (sd->val_min > value) return EINA_FALSE;
1237 if (sd->val_max < value) return EINA_FALSE; 1238 if (sd->val_max < value) return EINA_FALSE;
1238 1239
1239 evas_object_smart_callback_call(obj, SIG_DRAG_START, NULL); 1240 eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_START, NULL));
1240 sd->val = value; 1241 sd->val = value;
1241 _visuals_refresh(obj); 1242 _visuals_refresh(obj);
1242 sd->val = oldval; 1243 sd->val = oldval;
1243 _slider_update(obj, EINA_TRUE); 1244 _slider_update(obj, EINA_TRUE);
1244 evas_object_smart_callback_call(obj, SIG_DRAG_STOP, NULL); 1245 eo_do(obj, eo_event_callback_call(ELM_SLIDER_EVENT_SLIDER_DRAG_STOP, NULL));
1245 1246
1246 return EINA_TRUE; 1247 return EINA_TRUE;
1247} 1248}