spinner: Adjusted to Eo2.

This commit is contained in:
Tom Hacohen 2014-04-03 16:55:07 +01:00
parent 849b770160
commit 416568b1f5
1 changed files with 4 additions and 5 deletions

View File

@ -177,14 +177,13 @@ _drag_cb(void *data,
{
double pos = 0.0, delta;
Evas_Object *obj = data;
Eina_Bool ret = EINA_FALSE;
ELM_SPINNER_DATA_GET(obj, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (sd->entry_visible) return;
eo_do((Eo *)wd->resize_obj,
edje_obj_part_drag_value_get("elm.dragable.slider", &pos, NULL, &ret));
edje_obj_part_drag_value_get("elm.dragable.slider", &pos, NULL));
delta = pos * sd->step * _elm_config->scale;
/* If we are on rtl mode, change the delta to be negative on such changes */
@ -545,8 +544,8 @@ success:
EOLIAN static Eina_Bool
_elm_spinner_elm_widget_on_focus(Eo *obj, Elm_Spinner_Data *sd)
{
Eina_Bool int_ret;
eo_do_super(obj, MY_CLASS, elm_obj_widget_on_focus(&int_ret));
Eina_Bool int_ret = EINA_FALSE;
eo_do_super(obj, MY_CLASS, int_ret = elm_obj_widget_on_focus());
if (!int_ret) return EINA_FALSE;
if (!elm_widget_focus_get(obj))
@ -855,7 +854,7 @@ _elm_spinner_eo_base_constructor(Eo *obj, Elm_Spinner_Data *_pd EINA_UNUSED)
eo_do_super(obj, MY_CLASS, eo_constructor());
eo_do(obj,
evas_obj_type_set(MY_CLASS_NAME_LEGACY),
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks, NULL));
evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
}
EOLIAN static void