#include <Elementary.h>
#include "elm_priv.h"
-/**
- * @ingroup Elementary
- */
-
typedef struct _Widget_Data Widget_Data;
-enum
-{
- DEFAULT = 0,
- HIGHLIGHTED,
- FOCUSED,
- DISABLED,
-};
-
struct _Widget_Data
{
Evas_Object *btn, *icon;
double ar_threshold;
double ar_interval;
Ecore_Timer *timer;
- const char *statelabel[4];
- int statetype[4];
Eina_Bool autorepeat : 1;
Eina_Bool repeating : 1;
Eina_Bool delete_me : 1;
static void _del_pre_hook(Evas_Object *obj);
static void _theme_hook(Evas_Object *obj);
static void _disable_hook(Evas_Object *obj);
+static void _content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content);
+static Evas_Object *_content_get_hook(const Evas_Object *obj, const char *part);
+static Evas_Object *_content_unset_hook(Evas_Object *obj, const char *part);
static void _sizing_eval(Evas_Object *obj);
static void _changed_size_hints(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _sub_del(void *data, Evas_Object *obj, void *event_info);
static Eina_Bool _event_hook(Evas_Object *obj, Evas_Object *src,
Evas_Callback_Type type, void *event_info);
-static void _set_label(Evas_Object *obj, const char *label);
-static void _signal_default_text_set(void *data, Evas_Object *obj, const char *emission, const char *source);
-
static const char SIG_CLICKED[] = "clicked";
static const char SIG_REPEATED[] = "repeated";
static const char SIG_PRESSED[] = "pressed";
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (wd->label) eina_stringshare_del(wd->label);
- if (wd->statelabel[DEFAULT]) eina_stringshare_del(wd->statelabel[DEFAULT]);
- if (wd->statelabel[HIGHLIGHTED]) eina_stringshare_del(wd->statelabel[HIGHLIGHTED]);
- if (wd->statelabel[FOCUSED]) eina_stringshare_del(wd->statelabel[FOCUSED]);
- if (wd->statelabel[DISABLED]) eina_stringshare_del(wd->statelabel[DISABLED]);
free(wd);
}
if (!wd) return;
if (elm_widget_focus_get(obj))
{
- if (wd->statelabel[FOCUSED])
- {
- _set_label(obj, wd->statelabel[FOCUSED]);
- }
- edje_object_signal_emit(wd->btn, "elm,action,focus", "elm");
- evas_object_focus_set(wd->btn, EINA_TRUE);
+ edje_object_signal_emit(wd->btn, "elm,action,focus", "elm");
+ evas_object_focus_set(wd->btn, EINA_TRUE);
}
else
{
- if (wd->statelabel[DEFAULT])
- _set_label(obj, wd->statelabel[DEFAULT]);
- edje_object_signal_emit(wd->btn, "elm,action,unfocus", "elm");
- evas_object_focus_set(wd->btn, EINA_FALSE);
+ edje_object_signal_emit(wd->btn, "elm,action,unfocus", "elm");
+ evas_object_focus_set(wd->btn, EINA_FALSE);
}
}
_elm_widget_mirrored_reload(obj);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_elm_theme_object_set(obj, wd->btn, "button", "base", elm_widget_style_get(obj));
- if (elm_object_disabled_get(obj))
- edje_object_signal_emit(wd->btn, "elm,state,disabled", "elm");
if (wd->icon)
edje_object_part_swallow(wd->btn, "elm.swallow.content", wd->icon);
if (wd->label)
else
edje_object_signal_emit(wd->btn, "elm,state,icon,hidden", "elm");
edje_object_part_text_set(wd->btn, "elm.text", wd->label);
+ if (elm_object_disabled_get(obj))
+ edje_object_signal_emit(wd->btn, "elm,state,disabled", "elm");
edje_object_message_signal_process(wd->btn);
edje_object_scale_set(wd->btn, elm_widget_scale_get(obj) * _elm_config->scale);
str = edje_object_data_get(wd->btn, "focus_highlight");
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return;
if (elm_widget_disabled_get(obj))
- {
- if (wd->statelabel[DISABLED] )
- {
- _set_label(obj, wd->statelabel[DISABLED]);
- }
- edje_object_signal_emit(wd->btn, "elm,state,disabled", "elm");
- }
+ edje_object_signal_emit(wd->btn, "elm,state,disabled", "elm");
else
- {
- if (wd->statelabel[DEFAULT])
- _set_label(obj, wd->statelabel[DEFAULT]);
- edje_object_signal_emit(wd->btn, "elm,state,enabled", "elm");
- }
+ edje_object_signal_emit(wd->btn, "elm,state,enabled", "elm");
}
static void
}
static void
+_content_set_hook(Evas_Object *obj, const char *part, Evas_Object *content)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype);
+ Widget_Data *wd = elm_widget_data_get(obj);
+ if (!wd) return;
+ if (part && strcmp(part, "icon")) return;
+ if (wd->icon == content) return;
+ if (wd->icon) evas_object_del(wd->icon);
+ wd->icon = content;
+ if (content)
+ {
+ elm_widget_sub_object_add(obj, content);
+ evas_object_event_callback_add(content,
+ EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints, obj);
+ edje_object_part_swallow(wd->btn, "elm.swallow.content", content);
+ edje_object_signal_emit(wd->btn, "elm,state,icon,visible", "elm");
+ edje_object_message_signal_process(wd->btn);
+ }
+ _sizing_eval(obj);
+}
+
+static Evas_Object *
+_content_get_hook(const Evas_Object *obj, const char *part)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Widget_Data *wd;
+
+ if (part && strcmp(part, "icon")) return NULL;
+ wd = elm_widget_data_get(obj);
+ if (!wd) return NULL;
+ return wd->icon;
+}
+
+static Evas_Object *
+_content_unset_hook(Evas_Object *obj, const char *part)
+{
+ ELM_CHECK_WIDTYPE(obj, widtype) NULL;
+ Widget_Data *wd;
+
+ if (part && strcmp(part, "icon")) return NULL;
+ 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);
+ evas_object_event_callback_del_full(wd->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS,
+ _changed_size_hints, obj);
+ edje_object_part_unswallow(wd->btn, wd->icon);
+ wd->icon = NULL;
+ return icon;
+}
+
+static void
_sizing_eval(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
wd->timer = NULL;
}
wd->repeating = EINA_FALSE;
- evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+ if ((_elm_config->access_mode == ELM_ACCESS_MODE_OFF) ||
+ (_elm_access_2nd_click_timeout(obj)))
+ {
+ if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
+ _elm_access_say(E_("Clicked"));
+ evas_object_smart_callback_call(obj, SIG_CLICKED, NULL);
+ }
}
static void
Widget_Data *wd = elm_widget_data_get(data);
if (!wd) return;
- if (wd->statelabel[HIGHLIGHTED])
- {
- _set_label(data, wd->statelabel[HIGHLIGHTED]);
- }
if ((wd->autorepeat) && (!wd->repeating))
{
if (wd->ar_threshold <= 0.0)
{
Widget_Data *wd = elm_widget_data_get(data);
if (!wd) return;
- if (wd->statelabel[DEFAULT])
- _set_label(data, wd->statelabel[DEFAULT]);
if (wd->timer)
{
}
static void
-_signal_default_text_set(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
-{
- Widget_Data *wd = elm_widget_data_get(data);
- if (!wd) return;
- if (wd->statelabel[DEFAULT])
- _set_label(data, wd->statelabel[DEFAULT]);
-}
-
-static void
_elm_button_label_set(Evas_Object *obj, const char *item, const char *label)
{
ELM_CHECK_WIDTYPE(obj, widtype);
return wd->label;
}
+static char *
+_access_info_cb(void *data __UNUSED__, Evas_Object *obj, Elm_Widget_Item *item __UNUSED__)
+{
+ const char *txt = elm_widget_access_info_get(obj);
+ if (!txt) txt = _elm_button_label_get(obj, NULL);
+ if (txt) return strdup(txt);
+ return NULL;
+}
+
+static char *
+_access_state_cb(void *data __UNUSED__, Evas_Object *obj, Elm_Widget_Item *item __UNUSED__)
+{
+ if (elm_widget_disabled_get(obj))
+ return strdup(E_("State: Disabled"));
+ return NULL;
+}
+
EAPI Evas_Object *
elm_button_add(Evas_Object *parent)
{
elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
elm_widget_text_set_hook_set(obj, _elm_button_label_set);
elm_widget_text_get_hook_set(obj, _elm_button_label_get);
+ elm_widget_content_set_hook_set(obj, _content_set_hook);
+ elm_widget_content_get_hook_set(obj, _content_get_hook);
+ elm_widget_content_unset_hook_set(obj, _content_unset_hook);
wd->btn = edje_object_add(e);
_elm_theme_object_set(obj, wd->btn, "button", "base", "default");
- wd->statetype[DEFAULT] = 0;
- wd->statetype[HIGHLIGHTED] = 0;
- wd->statetype[FOCUSED] = 0;
- wd->statetype[DISABLED] = 0;
- wd->statelabel[DEFAULT] = 0;
- wd->statelabel[HIGHLIGHTED] = 0;
- wd->statelabel[FOCUSED] = 0;
- wd->statelabel[DISABLED] = 0;
edje_object_signal_callback_add(wd->btn, "elm,action,click", "",
_signal_clicked, obj);
edje_object_signal_callback_add(wd->btn, "elm,action,press", "",
_signal_pressed, obj);
edje_object_signal_callback_add(wd->btn, "elm,action,unpress", "",
_signal_unpressed, obj);
- edje_object_signal_callback_add(wd->btn, "elm,action,default,text,set", "",
- _signal_default_text_set, obj);
elm_widget_resize_object_set(obj, wd->btn);
evas_object_smart_callback_add(obj, "sub-object-del", _sub_del, obj);
// TODO: convert Elementary to subclassing of Evas_Smart_Class
// TODO: and save some bytes, making descriptions per-class and not instance!
evas_object_smart_callbacks_descriptions_set(obj, _signals);
- return obj;
-}
-
-static void
-_set_label(Evas_Object *obj, const char *label)
-{
- Widget_Data *wd = elm_widget_data_get(obj);
-
- edje_object_part_text_set(wd->btn, "elm.text", label);
- _sizing_eval(obj);
-}
-
-EAPI void
-elm_button_label_set_for_state(Evas_Object *obj, const char *label, UIControlState state)
-{
- Widget_Data *wd = elm_widget_data_get(obj);
-
- if (!wd) return;
- if (label == NULL) return;
-
- if (state == UIControlStateDefault)
- {
- wd->statetype[DEFAULT] = UIControlStateDefault;
- eina_stringshare_replace(&wd->statelabel[DEFAULT], label);
- return;
- }
- if (state == UIControlStateHighlighted)
- {
- wd->statetype[HIGHLIGHTED] = UIControlStateHighlighted;
- eina_stringshare_replace(&wd->statelabel[HIGHLIGHTED], label);
- return;
- }
- if (state == UIControlStateFocused)
- {
- wd->statetype[FOCUSED] = UIControlStateFocused;
- eina_stringshare_replace(&wd->statelabel[FOCUSED], label);
- return;
- }
- if (state == UIControlStateDisabled)
- {
- wd->statetype[DISABLED] = UIControlStateDisabled;
- eina_stringshare_replace(&wd->statelabel[DISABLED], label);
- return;
- }
-}
-EAPI const char*
-elm_button_label_get_for_state(const Evas_Object *obj, UIControlState state)
-{
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
-
- if (state == UIControlStateDefault)
- return wd->statelabel[DEFAULT];
- else if (state == UIControlStateHighlighted)
- return wd->statelabel[HIGHLIGHTED];
- else if (state == UIControlStateFocused)
- return wd->statelabel[FOCUSED];
- else if (state == UIControlStateDisabled)
- return wd->statelabel[DISABLED];
- else
- return NULL;
+ _elm_access_object_register(obj, wd->btn);
+ _elm_access_text_set(_elm_access_object_get(obj),
+ ELM_ACCESS_TYPE, E_("Button"));
+ _elm_access_callback_set(_elm_access_object_get(obj),
+ ELM_ACCESS_INFO, _access_info_cb, obj);
+ _elm_access_callback_set(_elm_access_object_get(obj),
+ ELM_ACCESS_STATE, _access_state_cb, obj);
+ return obj;
}
EAPI void
return _elm_button_label_get(obj, NULL);
}
+
EAPI void
elm_button_icon_set(Evas_Object *obj, Evas_Object *icon)
{
- ELM_CHECK_WIDTYPE(obj, widtype);
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return;
- 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->btn, "elm.swallow.content", icon);
- edje_object_signal_emit(wd->btn, "elm,state,icon,visible", "elm");
- edje_object_message_signal_process(wd->btn);
- }
- _sizing_eval(obj);
+ _content_set_hook(obj, "icon", icon);
}
EAPI Evas_Object *
elm_button_icon_get(const Evas_Object *obj)
{
- ELM_CHECK_WIDTYPE(obj, widtype) NULL;
- Widget_Data *wd = elm_widget_data_get(obj);
- if (!wd) return NULL;
- return wd->icon;
+ return _content_get_hook(obj, "icon");
}
EAPI Evas_Object *
elm_button_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->btn, wd->icon);
- wd->icon = NULL;
- return icon;
+ return _content_unset_hook(obj, "icon");
}
EAPI void