aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_slider_interval.c
diff options
context:
space:
mode:
authorWooHyun Jung <wh0705.jung@samsung.com>2019-08-21 19:14:56 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2019-08-21 19:14:57 +0900
commit1cbcbbdfa6bed3daea3b92ef00bb0caf70a03fb8 (patch)
treed584b10a6c2cb58e29a177d41492510341086fab /src/lib/elementary/efl_ui_slider_interval.c
parentefl_ui_animation_view: add document of Efl.Ui.Animation_View_State enum (diff)
downloadefl-1cbcbbdfa6bed3daea3b92ef00bb0caf70a03fb8.tar.gz
efl_ui_slider : remove all the legacy checking
Summary: Legacy checking is not needed because elm_slider was separated from efl_ui_slider. @ref https://phab.enlightenment.org/T7893 Reviewers: Jaehyun_Cho, bu5hm4n, zmike Reviewed By: Jaehyun_Cho Subscribers: YOhoho, cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: https://phab.enlightenment.org/T7893 Differential Revision: https://phab.enlightenment.org/D9670
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_ui_slider_interval.c84
1 files changed, 16 insertions, 68 deletions
diff --git a/src/lib/elementary/efl_ui_slider_interval.c b/src/lib/elementary/efl_ui_slider_interval.c
index 731bbe997f..a61d923464 100644
--- a/src/lib/elementary/efl_ui_slider_interval.c
+++ b/src/lib/elementary/efl_ui_slider_interval.c
@@ -39,20 +39,12 @@ _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"),
+ 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"),
+ 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;
else pos2 = posy2;
@@ -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);
- }
+ 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);
- }
+ 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,21 +158,13 @@ _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"),
+ 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"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
button_x, button_y);
pd->intvl_flag = 2;
}
@@ -208,21 +172,13 @@ _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"),
+ 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"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
button_x, button_y);
pd->intvl_flag = 2;
}
@@ -236,20 +192,12 @@ _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"),
+ 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"),
+ efl_ui_drag_value_set(efl_part(wd->resize_obj, "efl.dragable2.slider"),
button_x, button_y);
}
}