static const char *widtype = NULL;
static void _del_hook(Evas_Object *obj);
+static void _mirrored_set(Evas_Object *obj, Eina_Bool rtl);
static void _theme_hook(Evas_Object *obj);
static void _sizing_eval(Evas_Object *obj);
static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
}
static void
+_mirrored_set(Evas_Object *obj, Eina_Bool rtl)
+{
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ edje_object_mirrored_set(wd->progressbar, rtl);
+}
+
+static void
_theme_hook(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
- edje_object_part_unswallow(NULL, wd->spacer);
+ _elm_widget_mirrored_reload(obj);
+ _mirrored_set(obj, elm_widget_mirrored_get(obj));
if (wd->horizontal)
_elm_theme_object_set(obj, wd->progressbar, "progressbar", "horizontal", elm_widget_style_get(obj));
else
_elm_theme_object_set(obj, wd->progressbar, "progressbar", "vertical", elm_widget_style_get(obj));
- if (wd->inverted)
- edje_object_signal_emit(wd->progressbar, "elm,state,inverted,on", "elm");
- else
- edje_object_signal_emit(wd->progressbar, "elm,state,inverted,off", "elm");
+
if (wd->icon)
- edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm");
- else
- edje_object_signal_emit(wd->progressbar, "elm,state,icon,hidden", "elm");
+ {
+ edje_object_part_swallow(wd->progressbar, "elm.swallow.content", wd->icon);
+ edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm");
+ }
if (wd->label)
- edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm");
- else
- edje_object_signal_emit(wd->progressbar, "elm,state,text,hidden", "elm");
- edje_object_part_text_set(wd->progressbar, "elm.text", wd->label);
+ {
+ edje_object_part_text_set(wd->progressbar, "elm.text", wd->label);
+ edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm");
+ }
if (wd->pulse)
edje_object_signal_emit(wd->progressbar, "elm,state,pulse", "elm");
else
edje_object_signal_emit(wd->progressbar, "elm,state,fraction", "elm");
- if (wd->units && !wd->pulse)
+ if (wd->pulse_state)
+ edje_object_signal_emit(wd->progressbar, "elm,state,pulse,start", "elm");
+
+ if ((wd->units) && (!wd->pulse))
edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm");
- else
- edje_object_signal_emit(wd->progressbar, "elm,state,units,hidden", "elm");
+
if (wd->horizontal)
evas_object_size_hint_min_set(wd->spacer, (double)wd->size * elm_widget_scale_get(obj) * _elm_config->scale, 1);
else
edje_object_part_swallow(wd->progressbar, "elm.swallow.bar", wd->spacer);
+ if (wd->inverted)
+ edje_object_signal_emit(wd->progressbar, "elm,state,inverted,on", "elm");
+
_units_set(obj);
edje_object_message_signal_process(wd->progressbar);
edje_object_scale_set(wd->progressbar, elm_widget_scale_get(obj) * _elm_config->scale);
if (!wd) return;
if (sub == wd->icon)
{
- edje_object_signal_emit(wd->progressbar, "elm,state,icon,hidden", "elm");
- evas_object_event_callback_del_full
- (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
- wd->icon = NULL;
- _sizing_eval(obj);
+ edje_object_signal_emit(wd->progressbar, "elm,state,icon,hidden", "elm");
+ evas_object_event_callback_del_full
+ (sub, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _changed_size_hints, obj);
+ wd->icon = NULL;
+ edje_object_message_signal_process(wd->progressbar);
+ _sizing_eval(obj);
}
}
_val_set(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
+ Eina_Bool rtl;
double pos;
if (!wd) return;
pos = wd->val;
- if (wd->inverted) pos = MAX_RATIO_LVL - pos;
+ rtl = elm_widget_mirrored_get(obj);
+ if ((!rtl && wd->inverted) || (rtl &&
+ ((!wd->horizontal && wd->inverted) ||
+ (wd->horizontal && !wd->inverted)))) pos = MAX_RATIO_LVL - pos;
edje_object_part_drag_value_set(wd->progressbar, "elm.cur.progressbar", pos, pos);
}
Evas *e;
Widget_Data *wd;
- wd = ELM_NEW(Widget_Data);
- e = evas_object_evas_get(parent);
- obj = elm_widget_add(e);
+ ELM_WIDGET_STANDARD_SETUP(wd, Widget_Data, parent, e, obj, NULL);
+
ELM_SET_WIDTYPE(widtype, "progressbar");
elm_widget_type_set(obj, "progressbar");
elm_widget_sub_object_add(parent, obj);
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
+ elm_widget_can_focus_set(obj, EINA_FALSE);
wd->horizontal = EINA_TRUE;
wd->inverted = EINA_FALSE;
wd->spacer = evas_object_rectangle_add(e);
evas_object_color_set(wd->spacer, 0, 0, 0, 0);
- evas_object_pass_events_set(wd->spacer, 1);
+ evas_object_pass_events_set(wd->spacer, EINA_TRUE);
elm_widget_sub_object_add(obj, wd->spacer);
edje_object_part_swallow(wd->progressbar, "elm.swallow.bar", wd->spacer);
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
_units_set(obj);
_val_set(obj);
+ _mirrored_set(obj, elm_widget_mirrored_get(obj));
_sizing_eval(obj);
return obj;
}
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
state = !!state;
- if (!wd->pulse && wd->pulse_state == state) return;
+ if ((!wd->pulse) && (wd->pulse_state == state)) return;
wd->pulse_state = state;
if (wd->pulse_state)
edje_object_signal_emit(wd->progressbar, "elm,state,pulse,start", "elm");
* Set the value the progressbar indicates
*
* @param obj The progressbar object
- * @param val The fraction value (must be beween 0.0 and 1.0)
+ * @param val The fraction value (must be between 0.0 and 1.0)
*
* @ingroup Progressbar
*/
eina_stringshare_replace(&wd->label, label);
if (label)
{
- edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm");
- edje_object_message_signal_process(wd->progressbar);
+ edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm");
+ edje_object_message_signal_process(wd->progressbar);
}
else
{
- edje_object_signal_emit(wd->progressbar, "elm,state,text,hidden", "elm");
- edje_object_message_signal_process(wd->progressbar);
+ edje_object_signal_emit(wd->progressbar, "elm,state,text,hidden", "elm");
+ edje_object_message_signal_process(wd->progressbar);
}
edje_object_part_text_set(wd->progressbar, "elm.text", label);
_sizing_eval(obj);
/**
* Set the icon object of the progressbar object
*
- * Once the icon object is set, it will become a child of the progressbar object and
- * be deleted when the progressbar object is deleted. If another icon object is set
- * then the previous one becomes orophaned and will no longer be deleted along
- * with the progressbar.
+ * Once the icon object is set, a previously set one will be deleted.
+ * If you want to keep that old content object, use the
+ * elm_progressbar_icon_unset() function.
*
* @param obj The progressbar object
* @param icon The icon object
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
- if ((wd->icon != icon) && (wd->icon))
- elm_widget_sub_object_del(obj, wd->icon);
+ if (wd->icon == icon) return;
+ if (wd->icon) evas_object_del(wd->icon);
wd->icon = icon;
if (icon)
{
- elm_widget_sub_object_add(obj, icon);
- evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
- _changed_size_hints, obj);
- edje_object_part_swallow(wd->progressbar, "elm.swallow.content", icon);
- edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm");
- _sizing_eval(obj);
+ elm_widget_sub_object_add(obj, icon);
+ evas_object_event_callback_add(icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints, obj);
+ edje_object_part_swallow(wd->progressbar, "elm.swallow.content", icon);
+ edje_object_signal_emit(wd->progressbar, "elm,state,icon,visible", "elm");
+ edje_object_message_signal_process(wd->progressbar);
}
+ _sizing_eval(obj);
}
/**
}
/**
+ * Unset the icon used for the progressbar object
+ *
+ * Unparent and return the icon object which was set for this widget.
+ *
+ * @param obj The progressbar object
+ * @return The icon object that was being used
+ *
+ * @ingroup Progressbar
+ */
+EAPI Evas_Object *
+elm_progressbar_icon_unset(Evas_Object *obj)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+ if (!wd->icon) return NULL;
+ Evas_Object *icon = wd->icon;
+ elm_widget_sub_object_del(obj, wd->icon);
+ edje_object_part_unswallow(wd->progressbar, wd->icon);
+ wd->icon = NULL;
+ return icon;
+}
+
+/**
* Set the length of the progression region of the progressbar
*
* This sets the minimum width or height (depending on orientation) of the
eina_stringshare_replace(&wd->units, units);
if (units)
{
- edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm");
- edje_object_message_signal_process(wd->progressbar);
+ edje_object_signal_emit(wd->progressbar, "elm,state,units,visible", "elm");
+ edje_object_message_signal_process(wd->progressbar);
}
else
{
- edje_object_signal_emit(wd->progressbar, "elm,state,units,hidden", "elm");
- edje_object_message_signal_process(wd->progressbar);
+ edje_object_signal_emit(wd->progressbar, "elm,state,units,hidden", "elm");
+ edje_object_message_signal_process(wd->progressbar);
}
_units_set(obj);
_sizing_eval(obj);