From 19e70a8e1f30839befb450cad6982957571df4b1 Mon Sep 17 00:00:00 2001 From: Amitesh Singh Date: Fri, 17 Nov 2017 11:30:49 +0900 Subject: [PATCH] Efl.Ui.Slider: replace default with on_drag in visible_mode enum. Ref T6376 --- src/lib/elementary/efl_ui.eot | 4 ++-- src/lib/elementary/efl_ui_slider_private.h | 2 +- src/lib/elementary/elm_config.c | 2 +- src/lib/elementary/elm_general.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/elementary/efl_ui.eot b/src/lib/elementary/efl_ui.eot index 4483acc10d..69afcccbf0 100644 --- a/src/lib/elementary/efl_ui.eot +++ b/src/lib/elementary/efl_ui.eot @@ -48,10 +48,10 @@ enum Efl.Ui.Slider.Indicator_Visible_Mode @since 1.13 ]] - default, [[show indicator on mouse down or change in slider value]] + on_drag, [[show indicator on mouse down or change in slider value]] always, [[Always show the indicator.]] on_focus, [[Show the indicator on focus]] - none [[Never show the indicator ]] + none [[Never show the indicator ]] } enum Efl.Ui.Focus.Autoscroll_Mode diff --git a/src/lib/elementary/efl_ui_slider_private.h b/src/lib/elementary/efl_ui_slider_private.h index c5baa83150..8e1a27af83 100644 --- a/src/lib/elementary/efl_ui_slider_private.h +++ b/src/lib/elementary/efl_ui_slider_private.h @@ -33,7 +33,7 @@ struct _Efl_Ui_Slider_Data Ecore_Timer *wheel_indicator_timer; double wheel_indicator_duration; - Elm_Slider_Indicator_Visible_Mode indicator_visible_mode; /**< indicator_visible_mode of the slider. + Efl_Ui_Slider_Indicator_Visible_Mode indicator_visible_mode; /**< indicator_visible_mode of the slider. This indicates when to show an indicator */ Evas_Coord size; diff --git a/src/lib/elementary/elm_config.c b/src/lib/elementary/elm_config.c index 4c312b3107..12837ee407 100644 --- a/src/lib/elementary/elm_config.c +++ b/src/lib/elementary/elm_config.c @@ -4785,7 +4785,7 @@ static const struct { Efl_Ui_Slider_Indicator_Visible_Mode val; const char *str; } _enum_map_slider_indicator_visible_mode[] = { -{ EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT, "default" }, +{ EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_DRAG, "on_drag" }, { EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS, "always" }, { EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS, "on_focus" }, { EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE, "none" }, diff --git a/src/lib/elementary/elm_general.h b/src/lib/elementary/elm_general.h index 45117bc921..5696f3e78a 100644 --- a/src/lib/elementary/elm_general.h +++ b/src/lib/elementary/elm_general.h @@ -348,7 +348,7 @@ typedef Efl_Ui_Softcursor_Mode Elm_Softcursor_Mode; #define ELM_SOFTCURSOR_MODE_OFF EFL_UI_SOFTCURSOR_MODE_OFF typedef Efl_Ui_Slider_Indicator_Visible_Mode Elm_Slider_Indicator_Visible_Mode; -#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT +#define ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_DRAG #define ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS #define ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS #define ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE EFL_UI_SLIDER_INDICATOR_VISIBLE_MODE_NONE