dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Daniel Juyung Seo 2014-11-29 23:28:14 +09:00
parent 122403ea44
commit b8e4341c78
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/src/lib/elm_config.h
View File

@ -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);

21
legacy/elementary/src/lib/elm_slider.c
View File

@ -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

3
legacy/elementary/src/lib/elm_widget_slider.h
View File

@ -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;
};