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

re-fix slider to work again with def theme.

This commit is contained in:
Carsten Haitzler 2013-07-26 16:26:17 +09:00
parent a5d5d0ec14
commit c7facc4739
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,13 +136,13 @@ _units_set(Evas_Object *obj)
} }
else else
{ {
elm_layout_text_set(obj, "elm.units", NULL);
if (sd->units_show) if (sd->units_show)
{ {
elm_layout_signal_emit(obj, "elm,state,units,hidden", "elm"); elm_layout_signal_emit(obj, "elm,state,units,hidden", "elm");
sd->units_show = EINA_FALSE; sd->units_show = EINA_FALSE;
} }
} }
if (sd->units_format_free) sd->units_format_free(buf); if (sd->units_format_free) sd->units_format_free(buf);
} }
else if (sd->units) else if (sd->units)
@ -978,8 +978,23 @@ _elm_slider_unit_format_set(Eo *obj, void *_pd, va_list *list)
{ {
const char *units = va_arg(*list, const char *); const char *units = va_arg(*list, const char *);
Elm_Slider_Smart_Data *sd = _pd; Elm_Slider_Smart_Data *sd = _pd;
Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS);
eina_stringshare_replace(&sd->units, units); eina_stringshare_replace(&sd->units, units);
if (units)
{
elm_layout_signal_emit(obj, "elm,state,units,visible", "elm");
edje_object_message_signal_process(wd->resize_obj);
if (sd->popup)
edje_object_signal_emit(sd->popup, "elm,state,units,visible", "elm");
}
else
{
elm_layout_signal_emit(obj, "elm,state,units,hidden", "elm");
edje_object_message_signal_process(wd->resize_obj);
if (sd->popup)
edje_object_signal_emit(sd->popup, "elm,state,units,hidden", "elm");
}
evas_object_smart_changed(obj); evas_object_smart_changed(obj);
} }