seoz pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8ee3931cfd0a667465a5268ea1be83ba7dc37381
commit 8ee3931cfd0a667465a5268ea1be83ba7dc37381
Author: Daniel Juyung Seo <seojuyu...@gmail.com>
Date: Sat Nov 29 23:28:14 2014 +0900
slider: Clean up of the previous slider patch.
- This is a first clean up of 65240b5327e5ab1eb8f77835b4729444fe1f02df
- Fix wrong version for since tag.
- Fix indentation and remove trailing whitespaces.
- Make the code more readable.
- Remove a unused variable.
---
src/lib/elm_config.h | 6 +++---
src/lib/elm_slider.c | 21 +++++++++------------
src/lib/elm_widget_slider.h | 3 ---
3 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h
index 7da1f58..58bf21b 100644
--- a/src/lib/elm_config.h
+++ b/src/lib/elm_config.h
@@ -597,7 +597,7 @@ EAPI void
elm_config_focus_autoscroll_mode_set(Elm_Focus_Autoscroll_Mode
/**
* Slider's indicator visiblity mode.
*
- * @since 1.12
+ * @since 1.13
* @ingroup Slider
*/
@@ -617,7 +617,7 @@ typedef enum
* viewport.
*
* @ingroup Slider
- * @since 1.12
+ * @since 1.13
*/
EAPI void
elm_config_slider_indicator_visible_mode_set(Elm_Slider_Indicator_Visible_Mode
mode);
@@ -630,7 +630,7 @@ EAPI void
elm_config_slider_indicator_visible_mode_set(Elm_Slider_Indicator_Visi
* ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE if any of the above is set by
user.
*
* @ingroup Slider
- * @since 1.12
+ * @since 1.13
*/
EAPI Elm_Slider_Indicator_Visible_Mode
elm_config_slider_indicator_visible_mode_get(void);
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 6d11d23..d68e9f1 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -308,7 +308,8 @@ _popup_show(void *data,
const char *source EINA_UNUSED)
{
ELM_SLIDER_DATA_GET(data, sd);
- if (sd->popup && _elm_config->slider_indicator_visible_mode !=
ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE)
+ if (sd->popup &&
+ (_elm_config->slider_indicator_visible_mode !=
ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE))
{
evas_object_raise(sd->popup);
evas_object_show(sd->popup);
@@ -329,14 +330,12 @@ _popup_hide(void *data,
if (!sd->popup_visible || !sd->popup) return;
if (_elm_config->slider_indicator_visible_mode ==
ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS) return;
+ if ((_elm_config->slider_indicator_visible_mode ==
ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS) &&
+ elm_widget_focus_get(data))
+ return;
- if (!((elm_widget_focus_get(data)) &&
- (_elm_config->slider_indicator_visible_mode ==
ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS)))
- {
- // XXX: for compat
- edje_object_signal_emit(sd->popup, "popup,hide", "elm");
- edje_object_signal_emit(sd->popup, "elm,popup,hide", "elm");
- }
+ edje_object_signal_emit(sd->popup, "popup,hide", "elm"); // XXX: for compat
+ edje_object_signal_emit(sd->popup, "elm,popup,hide", "elm");
}
static void
@@ -828,13 +827,11 @@ _access_state_cb(void *data EINA_UNUSED, Evas_Object *obj)
}
static void
-_on_show(void *data EINA_UNUSED,
- Evas *e EINA_UNUSED,
- Evas_Object *obj,
+_on_show(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
if (_elm_config->slider_indicator_visible_mode ==
ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS)
- _popup_show(obj, NULL, NULL, NULL);
+ _popup_show(obj, NULL, NULL, NULL);
}
EOLIAN static void
diff --git a/src/lib/elm_widget_slider.h b/src/lib/elm_widget_slider.h
index 731ee95..33b8f5c 100644
--- a/src/lib/elm_widget_slider.h
+++ b/src/lib/elm_widget_slider.h
@@ -48,9 +48,6 @@ struct _Elm_Slider_Data
Eina_Bool spacer_down : 1;
Eina_Bool frozen : 1;
Eina_Bool units_show : 1;
- /* this flag is to set the visiblity of slider indicator
- if this flag is set then the indicator always show */
- Eina_Bool always_popup_show : 1;
Eina_Bool popup_visible : 1;
};
--
