enlightenment
/
enlightenment
5
6
Fork 6
Code Issues 15 Pull Requests 2 Projects Releases Wiki Activity

e_widget_button -> elm_button conversion

Browse Source 
focus highlighting on buttons is gone because this doesn't exist in the elm button theme

so much excitement. http://media.giphy.com/media/xxLCDIDA0iKU8/giphy.gif

 #teamborker
devs/bu5hm4n/econfigure2
Mike Blumenkrantz 8 years ago
parent ffd51904e2
commit b1c976d80d
1 changed files with 11 additions and 75 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 86
      src/bin/e_widget_button.c

86
src/bin/e_widget_button.c
Unescape View File

@ -1,12 +1,5 @@
#include "e.h"
typedef enum _E_Widget_Button_Type E_Widget_Button_Type;
enum _E_Widget_Button_Type
{
E_WIDGET_BUTTON_TEXT = 1 << 0,
E_WIDGET_BUTTON_ICON = 1 << 1
};
typedef struct _E_Widget_Data E_Widget_Data;
struct _E_Widget_Data
{
@ -15,16 +8,14 @@ struct _E_Widget_Data
void (*func)(void *data, void *data2);
void *data;
void *data2;
E_Widget_Button_Type type;
};
static void _e_wid_del_hook(Evas_Object *obj);
static void _e_wid_focus_hook(Evas_Object *obj);
static void _e_wid_activate_hook(Evas_Object *obj);
static void _e_wid_disable_hook(Evas_Object *obj);
static void _e_wid_signal_cb1(void *data, Evas_Object *obj, const char *emission, const char *source);
static void _click(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED);
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void *event_info);
static void _e_wid_button_state_send(E_Widget_Data *wd);
/* local subsystem functions */
/* externally accessible functions */
@ -33,7 +24,6 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
{
Evas_Object *obj, *o;
E_Widget_Data *wd;
Evas_Coord mw, mh;
obj = e_widget_add(evas);
@ -47,16 +37,12 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
wd->data2 = data2;
e_widget_data_set(obj, wd);
o = edje_object_add(evas);
o = elm_button_add(e_win_evas_win_get(evas));
evas_object_smart_callback_add(o, "clicked", _click, obj);
wd->o_button = o;
e_theme_edje_object_set(o, "base/theme/widgets",
"e/widgets/button");
edje_object_signal_callback_add(o, "e,action,click", "",
_e_wid_signal_cb1, obj);
if ((label) && (label[0] != 0))
{
edje_object_part_text_set(o, "e.text.label", label);
wd->type |= E_WIDGET_BUTTON_TEXT;
elm_object_text_set(o, label);
}
e_widget_sub_object_add(obj, o);
@ -70,16 +56,11 @@ e_widget_button_add(Evas *evas, const char *label, const char *icon, void (*func
o = e_icon_add(evas);
wd->o_icon = o;
e_util_icon_theme_set(o, icon);
edje_object_part_swallow(wd->o_button, "e.swallow.icon", o);
elm_object_content_set(wd->o_button, o);
e_widget_sub_object_add(obj, o);
evas_object_show(o);
wd->type |= E_WIDGET_BUTTON_ICON;
}
_e_wid_button_state_send(wd);
edje_object_size_min_calc(wd->o_button, &mw, &mh);
e_widget_size_min_set(obj, mw, mh);
return obj;
}
@ -87,48 +68,32 @@ EAPI void
e_widget_button_label_set(Evas_Object *obj, const char *label)
{
E_Widget_Data *wd;
int mw, mh;
wd = e_widget_data_get(obj);
edje_object_part_text_set(wd->o_button, "e.text.label", label);
if ((label) && (label[0] != 0))
wd->type |= E_WIDGET_BUTTON_TEXT;
else
wd->type &= ~E_WIDGET_BUTTON_TEXT;
_e_wid_button_state_send(wd);
edje_object_size_min_calc(wd->o_button, &mw, &mh);
e_widget_size_min_set(obj, mw, mh);
elm_object_text_set(wd->o_button, label);
}
EAPI void
e_widget_button_icon_set(Evas_Object *obj, Evas_Object *icon)
{
E_Widget_Data *wd;
int mw, mh;
wd = e_widget_data_get(obj);
if (wd->o_icon)
{
e_widget_sub_object_del(obj, wd->o_icon);
evas_object_hide(wd->o_icon);
edje_object_part_unswallow(wd->o_button, wd->o_icon);
elm_object_content_unset(wd->o_button);
evas_object_del(wd->o_icon);
wd->o_icon = NULL;
}
if (icon)
{
wd->o_icon = icon;
edje_object_part_swallow(wd->o_button, "e.swallow.icon", icon);
evas_object_pass_events_set(icon, 1);
elm_object_content_set(wd->o_button, icon);
evas_object_show(icon);
e_widget_sub_object_add(obj, icon);
wd->type |= E_WIDGET_BUTTON_ICON;
}
else
wd->type &= ~E_WIDGET_BUTTON_ICON;
_e_wid_button_state_send(wd);
edje_object_size_min_calc(wd->o_button, &mw, &mh);
e_widget_size_min_set(obj, mw, mh);
}
static void
@ -146,16 +111,7 @@ _e_wid_focus_hook(Evas_Object *obj)
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
if (e_widget_focus_get(obj))
{
edje_object_signal_emit(wd->o_button, "e,state,focused", "e");
evas_object_focus_set(wd->o_button, 1);
}
else
{
edje_object_signal_emit(wd->o_button, "e,state,unfocused", "e");
evas_object_focus_set(wd->o_button, 0);
}
elm_object_focus_set(wd->o_button, e_widget_focus_get(obj));
}
static void
@ -173,14 +129,11 @@ _e_wid_disable_hook(Evas_Object *obj)
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
if (e_widget_disabled_get(obj))
edje_object_signal_emit(wd->o_button, "e,state,disabled", "e");
else
edje_object_signal_emit(wd->o_button, "e,state,enabled", "e");
elm_object_disabled_set(wd->o_button, e_widget_disabled_get(obj));
}
static void
_e_wid_signal_cb1(void *data, Evas_Object *obj __UNUSED__, const char *emission __UNUSED__, const char *source __UNUSED__)
_click(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Evas_Object *wid;
@ -196,20 +149,3 @@ _e_wid_focus_steal(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__,
{
e_widget_focus_steal(data);
}
static void
_e_wid_button_state_send(E_Widget_Data *wd)
{
if ((!wd) || (!wd->o_button)) return;
if (wd->type & E_WIDGET_BUTTON_TEXT)
{
if (wd->type & E_WIDGET_BUTTON_ICON)
edje_object_signal_emit(wd->o_button, "e,state,combo", "e");
else
edje_object_signal_emit(wd->o_button, "e,state,text", "e");
}
else if (wd->type & E_WIDGET_BUTTON_ICON)
edje_object_signal_emit(wd->o_button, "e,state,icon", "e");
edje_object_message_signal_process(wd->o_button);
}

Write Preview
Loading…
Cancel
Save