From d7ae1e3d7e5214aa743412c7d5fb88096151e6ac Mon Sep 17 00:00:00 2001 From: Tiago Rezende Campos Falcao Date: Thu, 1 Apr 2010 14:22:41 +0000 Subject: [PATCH] Just some fixes to show changes like horizontal and inverted in editje.By Fidencio MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Author: Fabiano Fidêncio SVN revision: 47648 --- src/edje_externals/elm_slider.c | 32 +++++++++++++++++++++++++------- src/lib/Elementary.h.in | 2 +- src/lib/elm_slider.c | 2 +- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/src/edje_externals/elm_slider.c b/src/edje_externals/elm_slider.c index 76d62c0..d7423f3 100644 --- a/src/edje_externals/elm_slider.c +++ b/src/edje_externals/elm_slider.c @@ -46,7 +46,7 @@ external_slider_state_set(void *data __UNUSED__, Evas_Object *obj, const void *f if (p->value_exists) elm_slider_value_set(obj, p->value); if (p->inverted_exists) - elm_slider_inverted_set(obj, p->inverted);; + elm_slider_inverted_set(obj, p->inverted); if (p->horizontal_exists) elm_slider_horizontal_set(obj, p->horizontal); if (p->indicator) @@ -260,17 +260,35 @@ external_slider_params_parse(void *data __UNUSED__, Evas_Object *obj __UNUSED__, EINA_LIST_FOREACH(params, l, param) { if (!strcmp(param->name, "span")) - mem->span = param->i; + { + mem->span = param->i; + mem->span_exists = EINA_TRUE; + } else if (!strcmp(param->name, "min")) - mem->min = param->d; + { + mem->min = param->d; + mem->min_exists = EINA_TRUE; + } else if (!strcmp(param->name, "max")) - mem->max = param->d; + { + mem->max = param->d; + mem->max_exists = EINA_TRUE; + } else if (!strcmp(param->name, "value")) - mem->value = param->d; + { + mem->value = param->d; + mem->value_exists = EINA_TRUE; + } else if (!strcmp(param->name, "inverted")) - mem->inverted = param->i; + { + mem->inverted = param->i; + mem->inverted_exists = EINA_TRUE; + } else if (!strcmp(param->name, "horizontal")) - mem->horizontal = param->i; + { + mem->horizontal = param->i; + mem->horizontal_exists = EINA_TRUE; + } else if (!strcmp(param->name, "unit format")) mem->unit = eina_stringshare_add(param->s); else if (!strcmp(param->name, "indicator format")) diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index 2af8ed2..c0373b6 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -877,7 +877,7 @@ extern "C" { EAPI void elm_slider_icon_set(Evas_Object *obj, Evas_Object *icon); EAPI Evas_Object *elm_slider_icon_get(const Evas_Object *obj); EAPI void elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size); - EAPI int elm_slider_span_size_get(const Evas_Object *obj); + EAPI Evas_Coord elm_slider_span_size_get(const Evas_Object *obj); EAPI void elm_slider_unit_format_set(Evas_Object *obj, const char *format); EAPI const char *elm_slider_unit_format_get(const Evas_Object *obj); EAPI void elm_slider_indicator_format_set(Evas_Object *obj, const char *indicator); diff --git a/src/lib/elm_slider.c b/src/lib/elm_slider.c index f88df28..c6d07da 100644 --- a/src/lib/elm_slider.c +++ b/src/lib/elm_slider.c @@ -485,7 +485,7 @@ elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size) * * @ingroup Slider */ -EAPI int +EAPI Evas_Coord elm_slider_span_size_get(const Evas_Object *obj) { ELM_CHECK_WIDTYPE(obj, widtype) 0; -- 2.7.4