enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

efl_ui_slider : remove all the legacy checking 

Summary:
Legacy checking is not needed because elm_slider
was separated from efl_ui_slider.

@ref T7893

Reviewers: Jaehyun_Cho, bu5hm4n, zmike

Reviewed By: Jaehyun_Cho

Subscribers: YOhoho, cedric, #reviewers, #committers

Tags: #efl

Maniphest Tasks: T7893

Differential Revision: https://phab.enlightenment.org/D9670
This commit is contained in:
WooHyun Jung 2019-08-21 19:14:56 +09:00 committed by Jaehyun Cho
parent 78f5efbd67
commit 1cbcbbdfa6
2 changed files with 38 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/lib/elementary/efl_ui_slider.c
View File

@ -65,10 +65,6 @@ _efl_ui_slider_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Data *sd, Eina_Bool us
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable.slider"),
&posx, &posy);
else
efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"),
&posx, &posy);
if (_is_horizontal(sd->dir)) pos = posx;
@ -119,10 +115,6 @@ _efl_ui_slider_val_set(Evas_Object *obj, Efl_Ui_Slider_Data *sd)
pos = 1.0 - pos;
}
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable.slider"),
pos, pos);
else
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
pos, pos);
@ -138,10 +130,6 @@ _efl_ui_slider_down_knob(Evas_Object *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, d
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable.slider"),
button_x, button_y);
else
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
button_x, button_y);
}
@ -151,10 +139,6 @@ _efl_ui_slider_move_knob(Evas_Object *obj, Efl_Ui_Slider_Data *sd EINA_UNUSED, d
{
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable.slider"),
button_x, button_y);
else
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
button_x, button_y);
}
@ -210,7 +194,7 @@ _drag_step(void *data,
static void
_drag_up(void *data,
Evas_Object *obj,
Evas_Object *obj EINA_UNUSED,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
@ -224,10 +208,7 @@ _drag_up(void *data,
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
relative_step = step/(sd->val_max - sd->val_min);
if (elm_widget_is_legacy(obj))
efl_ui_drag_step_move(efl_part(wd->resize_obj, "elm.dragable.slider"),
step, step);
else
efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.dragable.slider"),
relative_step, relative_step);
_slider_update(data, EINA_TRUE);
@ -235,7 +216,7 @@ _drag_up(void *data,
static void
_drag_down(void *data,
Evas_Object *obj,
Evas_Object *obj EINA_UNUSED,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
@ -249,10 +230,7 @@ _drag_down(void *data,
ELM_WIDGET_DATA_GET_OR_RETURN(data, wd);
relative_step = step/(sd->val_max - sd->val_min);
if (elm_widget_is_legacy(obj))
efl_ui_drag_step_move(efl_part(wd->resize_obj, "elm.dragable.slider"),
step, step);
else
efl_ui_drag_step_move(efl_part(wd->resize_obj, "efl.dragable.slider"),
relative_step, relative_step);
_slider_update(data, EINA_TRUE);
@ -443,20 +421,10 @@ _efl_ui_slider_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Slider_Data *sd)
int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
if (elm_widget_is_legacy(obj))
{
if (efl_ui_layout_orientation_is_inverted(sd->dir))
efl_layout_signal_emit(obj, "elm,state,inverted,on", "elm");
else
efl_layout_signal_emit(obj, "elm,state,inverted,off", "elm");
}
else
{
if (efl_ui_layout_orientation_is_inverted(sd->dir))
efl_layout_signal_emit(obj, "efl,state,inverted,on", "efl");
else
efl_layout_signal_emit(obj, "efl,state,inverted,off", "efl");
}
efl_ui_slider_val_set(obj);
@ -668,9 +636,6 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *priv)
priv->spacer = efl_add(EFL_CANVAS_RECTANGLE_CLASS, obj,
efl_gfx_color_set(efl_added, 0, 0, 0, 0));
if (elm_widget_is_legacy(obj))
efl_content_set(efl_part(obj, "elm.swallow.bar"), priv->spacer);
else
efl_content_set(efl_part(obj, "efl.bar"), priv->spacer);
evas_object_event_callback_add
@ -754,8 +719,6 @@ _efl_ui_slider_efl_ui_range_display_range_limits_get(const Eo *obj EINA_UNUSED,
EOLIAN static void
_efl_ui_slider_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Slider_Data *sd, double val)
{
if (!elm_widget_is_legacy(obj))
{
if (val < sd->val_min)
{
@ -767,7 +730,6 @@ _efl_ui_slider_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Slider_Data
ERR("Error, value is greater than maximum");
return;
}
}
if (EINA_DBL_EQ(val, sd->val)) return;
sd->val = val;

52
src/lib/elementary/efl_ui_slider_interval.c
View File

@ -39,19 +39,11 @@ _efl_ui_slider_interval_val_fetch(Evas_Object *obj, Efl_Ui_Slider_Interval_Data
EFL_UI_SLIDER_DATA_GET(obj, sd);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable.slider"),
&posx, &posy);
else
efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"),
&posx, &posy);
if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos = posx;
else pos = posy;
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable2.slider"),
&posx2, &posy2);
else
efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable2.slider"),
&posx2, &posy2);
if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE)) pos2 = posx2;
@ -124,20 +116,10 @@ _efl_ui_slider_interval_val_set(Evas_Object *obj, Efl_Ui_Slider_Interval_Data *p
else if (pos2 > 1.0)
pos2 = 1.0;
if (elm_widget_is_legacy(obj))
{
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable.slider"),
pos, pos);
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable2.slider"),
pos2, pos2);
}
else
{
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
pos, pos);
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
pos2, pos2);
}
// emit accessibility event also if value was changed by API
if (_elm_config->atspi_mode)
@ -156,20 +138,10 @@ _efl_ui_slider_interval_down_knob(Evas_Object *obj, Efl_Ui_Slider_Interval_Data
pd->intvl_flag = 0;
if (elm_widget_is_legacy(obj))
{
efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable.slider"),
&posx, &posy);
efl_ui_drag_value_get(efl_part(wd->resize_obj, "elm.dragable2.slider"),
&posx2, &posy2);
}
else
{
efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable.slider"),
&posx, &posy);
efl_ui_drag_value_get(efl_part(wd->resize_obj, "efl.dragable2.slider"),
&posx2, &posy2);
}
if (efl_ui_layout_orientation_is_horizontal(sd->dir, EINA_TRUE))
{
@ -186,20 +158,12 @@ _efl_ui_slider_interval_down_knob(Evas_Object *obj, Efl_Ui_Slider_Interval_Data
if (diff1 < diff2)
{
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable.slider"),
button_x, button_y);
else
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
button_x, button_y);
pd->intvl_flag = 1;
}
else if (diff1 > diff2)
{
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable2.slider"),
button_x, button_y);
else
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
button_x, button_y);
pd->intvl_flag = 2;
@ -208,20 +172,12 @@ _efl_ui_slider_interval_down_knob(Evas_Object *obj, Efl_Ui_Slider_Interval_Data
{
if (diff3 < 0)
{
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable.slider"),
button_x, button_y);
else
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
button_x, button_y);
pd->intvl_flag = 1;
}
else
{
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable2.slider"),
button_x, button_y);
else
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
button_x, button_y);
pd->intvl_flag = 2;
@ -236,19 +192,11 @@ _efl_ui_slider_interval_move_knob(Evas_Object *obj, Efl_Ui_Slider_Interval_Data
if (pd->intvl_flag == 1)
{
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable.slider"),
button_x, button_y);
else
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable.slider"),
button_x, button_y);
}
else if (pd->intvl_flag == 2)
{
if (elm_widget_is_legacy(obj))
efl_ui_drag_value_set(efl_part(wd->resize_obj, "elm.dragable2.slider"),
button_x, button_y);
else
efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
button_x, button_y);
}