const char *units;
const char *indicator;
- const char *(*indicator_format_func)(double val);
- void (*indicator_format_free)(const char *str);
+ char *(*indicator_format_func)(double val);
+ void (*indicator_format_free)(char *str);
- const char *(*units_format_func)(double val);
- void (*units_format_free)(const char *str);
+ char *(*units_format_func)(double val);
+ void (*units_format_free)(char *str);
double val, val_min, val_max, val2;
Evas_Coord size;
ev = event_info;
if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) return EINA_FALSE;
if (elm_widget_disabled_get(obj)) return EINA_FALSE;
- if ((!strcmp(ev->keyname, "Left"))
- || (!strcmp(ev->keyname, "KP_Left")))
+ if ((!strcmp(ev->keyname, "Left")) ||
+ ((!strcmp(ev->keyname, "KP_Left")) && (!ev->string)))
{
if (!wd->horizontal) return EINA_FALSE;
if (!wd->inverted) _drag_down(obj, NULL, NULL, NULL);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE;
}
- else if ((!strcmp(ev->keyname, "Right"))
- || (!strcmp(ev->keyname, "KP_Right")))
+ else if ((!strcmp(ev->keyname, "Right")) ||
+ ((!strcmp(ev->keyname, "KP_Right")) && (!ev->string)))
{
if (!wd->horizontal) return EINA_FALSE;
if (!wd->inverted) _drag_up(obj, NULL, NULL, NULL);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE;
}
- else if ((!strcmp(ev->keyname, "Up")) || (!strcmp(ev->keyname, "KP_Up")))
+ else if ((!strcmp(ev->keyname, "Up")) ||
+ ((!strcmp(ev->keyname, "KP_Up")) && (!ev->string)))
{
if (wd->horizontal) return EINA_FALSE;
if (wd->inverted) _drag_up(obj, NULL, NULL, NULL);
ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
return EINA_TRUE;
}
- else if ((!strcmp(ev->keyname, "Down")) || (!strcmp(ev->keyname, "KP_Down")))
+ else if ((!strcmp(ev->keyname, "Down")) ||
+ ((!strcmp(ev->keyname, "KP_Down")) && (!ev->string)))
{
if (wd->horizontal) return EINA_FALSE;
if (wd->inverted) _drag_down(obj, NULL, NULL, NULL);
{
Widget_Data *wd = fdata;
- edje_object_part_text_set(wd->slider, key, data);
+ edje_object_part_text_escaped_set(wd->slider, key, data);
return 1;
}
if (!wd) return;
if (wd->units_format_func)
{
- const char *buf;
+ char *buf;
buf = wd->units_format_func(wd->val);
- edje_object_part_text_set(wd->slider, "elm.units", buf);
+ edje_object_part_text_escaped_set(wd->slider, "elm.units", buf);
if (wd->units_format_free) wd->units_format_free(buf);
}
else if (wd->units)
char buf[1024];
snprintf(buf, sizeof(buf), wd->units, wd->val);
- edje_object_part_text_set(wd->slider, "elm.units", buf);
+ edje_object_part_text_escaped_set(wd->slider, "elm.units", buf);
}
else
- edje_object_part_text_set(wd->slider, "elm.units", NULL);
+ edje_object_part_text_escaped_set(wd->slider, "elm.units", NULL);
}
static void
if (!wd) return;
if (wd->indicator_format_func)
{
- const char *buf;
+ char *buf;
buf = wd->indicator_format_func(wd->val);
- edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
+ edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
if (wd->indicator_format_free) wd->indicator_format_free(buf);
}
else if (wd->indicator)
{
char buf[1024];
snprintf(buf, sizeof(buf), wd->indicator, wd->val);
- edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
+ edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
}
else
- edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", NULL);
+ edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", NULL);
}
static void
if (wd->spacer_down)
{
Evas_Coord d = 0;
-
+
evas_object_geometry_get(wd->spacer, &x, &y, &w, &h);
if (wd->horizontal) d = abs(ev->cur.canvas.x - x - wd->downx);
else d = abs(ev->cur.canvas.y - y - wd->downy);
edje_object_message_signal_process(wd->slider);
}
- edje_object_part_text_set(wd->slider, real_part, label);
+ edje_object_part_text_escaped_set(wd->slider, real_part, label);
_sizing_eval(obj);
}
if (!wd) return NULL;
if (!wd->labels) return NULL;
- if (!part)
+ if (!part)
return eina_hash_find(wd->labels, "elm.text");
return eina_hash_find(wd->labels, part);
}
eina_stringshare_del(label);
}
+static void
+_min_max_set(Evas_Object *obj)
+{
+ char *buf_min = NULL;
+ char *buf_max = NULL;
+
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if (wd->units_format_func)
+ {
+ buf_min = wd->units_format_func(wd->val_min);
+ buf_max = wd->units_format_func(wd->val_max);
+ }
+ else if (wd->units)
+ {
+ int length = strlen(wd->units);
+
+ buf_min = alloca(length + 128);
+ buf_max = alloca(length + 128);
+
+ snprintf((char*) buf_min, length + 128, wd->units, wd->val_min);
+ snprintf((char*) buf_max, length + 128, wd->units, wd->val_max);
+ }
+
+ edje_object_part_text_escaped_set(wd->slider, "elm.units.min", buf_min);
+ edje_object_part_text_escaped_set(wd->slider, "elm.units.max", buf_max);
+
+ if (wd->units_format_func && wd->units_format_free)
+ {
+ wd->units_format_free(buf_min);
+ wd->units_format_free(buf_max);
+ }
+}
+
+
EAPI Evas_Object *
elm_slider_add(Evas_Object *parent)
{
}
EAPI void
-elm_slider_label_set(Evas_Object *obj, const char *label)
-{
- _elm_slider_label_set(obj, NULL, label);
-}
-
-EAPI const char *
-elm_slider_label_get(const Evas_Object *obj)
-{
- return _elm_slider_label_get(obj, NULL);
-}
-
-EAPI void
-elm_slider_icon_set(Evas_Object *obj, Evas_Object *icon)
-{
- _content_set_hook(obj, "icon", icon);
-}
-
-EAPI Evas_Object *
-elm_slider_icon_unset(Evas_Object *obj)
-{
- return _content_unset_hook(obj, "icon");
-}
-
-EAPI Evas_Object *
-elm_slider_icon_get(const Evas_Object *obj)
-{
- return _content_get_hook(obj, "icon");
-}
-
-EAPI void
elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size)
{
ELM_CHECK_WIDTYPE(obj, widtype);
edje_object_signal_emit(wd->slider, "elm,state,units,hidden", "elm");
edje_object_message_signal_process(wd->slider);
}
+ _min_max_set(obj);
_units_set(obj);
_sizing_eval(obj);
}
wd->val_max = max;
if (wd->val < wd->val_min) wd->val = wd->val_min;
if (wd->val > wd->val_max) wd->val = wd->val_max;
+ _min_max_set(obj);
_val_set(obj);
_units_set(obj);
_indicator_set(obj);
}
EAPI void
-elm_slider_indicator_format_function_set(Evas_Object *obj, const char *(*func)(double val), void (*free_func)(const char *str))
+elm_slider_indicator_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str))
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
}
EAPI void
-elm_slider_units_format_function_set(Evas_Object *obj, const char *(*func)(double val), void (*free_func)(const char *str))
+elm_slider_units_format_function_set(Evas_Object *obj, char *(*func)(double val), void (*free_func)(char *str))
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
wd->units_format_func = func;
wd->units_format_free = free_func;
- _indicator_set(obj);
-}
-
-EAPI void
-elm_slider_end_set(Evas_Object *obj, Evas_Object *end)
-{
- _content_set_hook(obj, "end", end);
-}
-
-EAPI Evas_Object *
-elm_slider_end_unset(Evas_Object *obj)
-{
- return _content_unset_hook(obj, "end");
-}
-
-EAPI Evas_Object *
-elm_slider_end_get(const Evas_Object *obj)
-{
- return _content_get_hook(obj, "end");
+ _min_max_set(obj);
+ _units_set(obj);
}
EAPI void