diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/legacy/elementary/src/lib/elm_actionslider.c index 2655656b45..8de577bcc4 100644 --- a/legacy/elementary/src/lib/elm_actionslider.c +++ b/legacy/elementary/src/lib/elm_actionslider.c @@ -20,7 +20,7 @@ typedef struct _Widget_Data Widget_Data; struct _Widget_Data { - Evas_Object *ms; // actionslider + Evas_Object *as; // actionslider Evas_Object *drag_button_base; Elm_Actionslider_Pos magnet_position, enabled_position; const char *text_left, *text_right, *text_center; @@ -67,7 +67,7 @@ _sizing_eval(Evas_Object *obj) minw = -1; minh = -1; elm_coords_finger_size_adjust(3, &minw, 1, &minh); - edje_object_size_min_restricted_calc(wd->ms, &minw, &minh, minw, minh); + edje_object_size_min_restricted_calc(wd->as, &minw, &minh, minw, minh); evas_object_size_hint_min_set(obj, minw, minh); evas_object_size_hint_max_set(obj, -1, -1); } @@ -77,18 +77,18 @@ _theme_hook(Evas_Object *obj) { Widget_Data *wd = elm_widget_data_get(obj); if (!wd) return; - if (!edje_object_part_swallow_get(wd->ms, "elm.drag_button_base")) - edje_object_part_unswallow(wd->ms, wd->drag_button_base); + if (!edje_object_part_swallow_get(wd->as, "elm.drag_button_base")) + edje_object_part_unswallow(wd->as, wd->drag_button_base); - _elm_theme_object_set(obj, wd->ms, "actionslider", + _elm_theme_object_set(obj, wd->as, "actionslider", "base", elm_widget_style_get(obj)); _elm_theme_object_set(obj, wd->drag_button_base, "actionslider", "drag_button", elm_widget_style_get(obj)); - edje_object_part_swallow(wd->ms, "elm.drag_button_base", wd->drag_button_base); - edje_object_part_text_set(wd->ms, "elm.text.left", wd->text_left); - edje_object_part_text_set(wd->ms, "elm.text.right", wd->text_right); - edje_object_part_text_set(wd->ms, "elm.text.center", wd->text_center); - edje_object_message_signal_process(wd->ms); + edje_object_part_swallow(wd->as, "elm.drag_button_base", wd->drag_button_base); + edje_object_part_text_set(wd->as, "elm.text.left", wd->text_left); + edje_object_part_text_set(wd->as, "elm.text.right", wd->text_right); + edje_object_part_text_set(wd->as, "elm.text.center", wd->text_center); + edje_object_message_signal_process(wd->as); _sizing_eval(obj); } @@ -109,7 +109,7 @@ _drag_button_move_cb(void *data, Evas_Object *o __UNUSED__, const char *emission if (!wd) return; if (!wd->mouse_down) return; - edje_object_part_drag_value_get(wd->ms, "elm.drag_button_base", &pos, NULL); + edje_object_part_drag_value_get(wd->as, "elm.drag_button_base", &pos, NULL); if (pos == 0.0) evas_object_smart_callback_call(as, SIG_CHANGED, (void *)"left"); else if (pos == 1.0) @@ -127,7 +127,7 @@ _button_animation(void *data) Eina_Bool flag_finish_animation = EINA_FALSE; if (!wd) return EINA_FALSE; - edje_object_part_drag_value_get(wd->ms, + edje_object_part_drag_value_get(wd->as, "elm.drag_button_base", &cur_position, NULL); if ((wd->final_position == 0.0) || (wd->final_position == 0.5 && cur_position >= wd->final_position)) @@ -149,7 +149,7 @@ _button_animation(void *data) flag_finish_animation = EINA_TRUE; } } - edje_object_part_drag_value_set(wd->ms, + edje_object_part_drag_value_set(wd->as, "elm.drag_button_base", new_position, 0.5); if (flag_finish_animation) { @@ -179,7 +179,7 @@ _drag_button_up_cb(void *data, Evas_Object *o __UNUSED__, const char *emission _ wd->mouse_down = EINA_FALSE; - edje_object_part_drag_value_get(wd->ms, "elm.drag_button_base", + edje_object_part_drag_value_get(wd->as, "elm.drag_button_base", &position, NULL); if (position == 0.0 && (wd->enabled_position & ELM_ACTIONSLIDER_LEFT)) @@ -282,21 +282,21 @@ elm_actionslider_add(Evas_Object *parent) wd->mouse_down = EINA_FALSE; wd->enabled_position = ELM_ACTIONSLIDER_ALL; - wd->ms = edje_object_add(e); - _elm_theme_object_set(obj, wd->ms, "actionslider", "base", "default"); - elm_widget_resize_object_set(obj, wd->ms); + wd->as = edje_object_add(e); + _elm_theme_object_set(obj, wd->as, "actionslider", "base", "default"); + elm_widget_resize_object_set(obj, wd->as); wd->drag_button_base = evas_object_rectangle_add(e); evas_object_color_set(wd->drag_button_base, 0, 0, 0, 0); - edje_object_part_swallow(wd->ms, "elm.drag_button_base", wd->drag_button_base); + edje_object_part_swallow(wd->as, "elm.drag_button_base", wd->drag_button_base); - edje_object_signal_callback_add(wd->ms, + edje_object_signal_callback_add(wd->as, "elm.drag_button,mouse,up", "", _drag_button_up_cb, obj); - edje_object_signal_callback_add(wd->ms, + edje_object_signal_callback_add(wd->as, "elm.drag_button,mouse,down", "", _drag_button_down_cb, obj); - edje_object_signal_callback_add(wd->ms, + edje_object_signal_callback_add(wd->as, "elm.drag_button,mouse,move", "", _drag_button_move_cb, obj); @@ -322,7 +322,7 @@ elm_actionslider_indicator_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos) if (!wd) return; if (pos == ELM_ACTIONSLIDER_CENTER) position = 0.5; else if (pos == ELM_ACTIONSLIDER_RIGHT) position = 1.0; - edje_object_part_drag_value_set(wd->ms, "elm.drag_button_base", position, 0.5); + edje_object_part_drag_value_set(wd->as, "elm.drag_button_base", position, 0.5); } /** @@ -341,7 +341,7 @@ elm_actionslider_indicator_pos_get(const Evas_Object *obj) double position; if (!wd) return ELM_ACTIONSLIDER_NONE; - edje_object_part_drag_value_get(wd->ms, "elm.drag_button_base", &position, NULL); + edje_object_part_drag_value_get(wd->as, "elm.drag_button_base", &position, NULL); if (position < 0.3) return ELM_ACTIONSLIDER_LEFT; else if (position < 0.7) @@ -444,11 +444,11 @@ elm_actionslider_labels_set(Evas_Object *obj, const char *left_label, const char if (!wd) return; eina_stringshare_replace(&wd->text_left, left_label); - edje_object_part_text_set(wd->ms, "elm.text.left", left_label); + edje_object_part_text_set(wd->as, "elm.text.left", left_label); eina_stringshare_replace(&wd->text_center, center_label); - edje_object_part_text_set(wd->ms, "elm.text.center", center_label); + edje_object_part_text_set(wd->as, "elm.text.center", center_label); eina_stringshare_replace(&wd->text_right, right_label); - edje_object_part_text_set(wd->ms, "elm.text.right", right_label); + edje_object_part_text_set(wd->as, "elm.text.right", right_label); } /**