thx!
------------------------------------
-Regards, Hermet-
-----Original Message-----
From: "Carsten Haitzler - Enlightenment Git"<[email protected]>
To: <[email protected]>;
Cc:
Sent: 2013-07-26 (금) 16:26:32
Subject: [EGIT] [core/elementary] master 01/01: re-fix slider to work again
with def theme.
raster pushed a commit to branch master.
commit 57ae6209c85320a2b502734875bc13252426d7df
Author: Carsten Haitzler (Rasterman) <raster>@rasterman.com>
Date: Fri Jul 26 16:26:17 2013 +0900
re-fix slider to work again with def theme.
---
src/lib/elm_slider.c 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c
index 4134c7a..097f0f2 100644
--- a/src/lib/elm_slider.c
+++ b/src/lib/elm_slider.c
@@ -136,13 +136,13 @@ _units_set(Evas_Object *obj)
}
else
{
+ elm_layout_text_set(obj, "elm.units", NULL);
if (sd->units_show)
{
elm_layout_signal_emit(obj, "elm,state,units,hidden", "elm");
sd->units_show = EINA_FALSE;
}
}
-
if (sd->units_format_free) sd->units_format_free(buf);
}
else if (sd->units)
@@ -497,7 +497,7 @@ _elm_slider_smart_theme(Eo *obj, void *_pd, va_list *list)
if (sd->popup)
edje_object_scale_set(sd->popup, elm_widget_scale_get(obj) *
elm_config_scale_get());
-
+
if (sd->horizontal)
evas_object_size_hint_min_set
(sd->spacer, (double)sd->size * elm_widget_scale_get(obj) *
@@ -978,8 +978,23 @@ _elm_slider_unit_format_set(Eo *obj, void *_pd, va_list
*list)
{
const char *units = va_arg(*list, const char *);
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);
+ 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);
}
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
