styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update eo class names, add hack for 1.10 class name compat

Browse Source
devs/discomfitor/eo
Mike Blumenkrantz 9 years ago
parent dbce413b42
commit 67855482fc
3 changed files with 26 additions and 26 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. 9
      src/bin/e.h
  2. 39
      src/bin/e_menu.c
  3. 4
      src/modules/ibox/e_mod_main.c

9
src/bin/e.h
Unescape View File

@ -119,6 +119,11 @@ void *alloca (size_t);
# include <Emotion.h>
# include <Elementary.h>
/* FIXME: remove this hack at some point */
# ifndef EDJE_CLASS
# define EDJE_CLASS EDJE_OBJ_CLASS
#endif
# ifdef HAVE_HAL
# include <E_Hal.h>
# endif
@ -182,10 +187,6 @@ typedef struct _E_Rect E_Rect;
# define MAX(x, y) (((x) > (y)) ? (x) : (y))
#endif
#if (EINA_VERSION_MAJOR == 1) && (EINA_VERSION_MINOR < 8)
# define eina_list_last_data_get(X) eina_list_data_get(eina_list_last(X))
#endif
# define E_FREE_FUNC(_h, _fn) do { if (_h) { _fn((void*)_h); _h = NULL; } } while (0)
# define E_INTERSECTS(x, y, w, h, xx, yy, ww, hh) \
(((x) < ((xx) + (ww))) && ((y) < ((yy) + (hh))) && (((x) + (w)) > (xx)) && (((y) + (h)) > (yy)))

39
src/bin/e_menu.c
Unescape View File

@ -1,5 +1,4 @@
#include "e.h"
#include <Eo.h>
/* TODO List:
*
@ -750,7 +749,7 @@ e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub)
{
if (mi->submenu_object)
{
if (eo_isa(mi->submenu_object, EDJE_OBJ_CLASS))
if (eo_isa(mi->submenu_object, EDJE_CLASS))
{
/* already have a correct submenu object, don't re-set it */
_e_menu_lock = EINA_FALSE;
@ -880,11 +879,11 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog)
edje_object_signal_emit(mi->bg_object, "e,state,on", "e");
if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,on", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS))
if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,on", "e");
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS))
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,on", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,on", "e");
if (mi->menu->bg_object)
edje_object_signal_emit(mi->menu->bg_object, "e,state,on", "e");
@ -896,11 +895,11 @@ e_menu_item_toggle_set(E_Menu_Item *mi, int tog)
edje_object_signal_emit(mi->bg_object, "e,state,off", "e");
if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,off", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS))
if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,off", "e");
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS))
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,off", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,off", "e");
if (mi->menu->bg_object)
edje_object_signal_emit(mi->menu->bg_object, "e,state,off", "e");
@ -1010,17 +1009,17 @@ e_menu_item_active_set(E_Menu_Item *mi, int active)
edje_object_signal_emit(mi->bg_object, "e,state,selected", "e");
if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,selected", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS))
if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,selected", "e");
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS))
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,selected", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,selected", "e");
if (mi->icon_key)
{
if (mi->icon_object)
{
if (eo_isa(mi->icon_object, EDJE_OBJ_CLASS))
if (eo_isa(mi->icon_object, EDJE_CLASS))
edje_object_signal_emit(mi->icon_object, "e,state,selected", "e");
else
e_icon_selected_set(mi->icon_object, EINA_TRUE);
@ -1039,17 +1038,17 @@ e_menu_item_active_set(E_Menu_Item *mi, int active)
edje_object_signal_emit(mi->bg_object, "e,state,unselected", "e");
if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,unselected", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS))
if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,unselected", "e");
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_OBJ_CLASS))
if (mi->submenu_object && eo_isa(mi->submenu_object, EDJE_CLASS))
edje_object_signal_emit(mi->submenu_object, "e,state,unselected", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,unselected", "e");
if (mi->icon_key)
{
if (mi->icon_object)
{
if (eo_isa(mi->icon_object, EDJE_OBJ_CLASS))
if (eo_isa(mi->icon_object, EDJE_CLASS))
edje_object_signal_emit(mi->icon_object, "e,state,unselected", "e");
else
e_icon_selected_set(mi->icon_object, EINA_FALSE);
@ -1085,9 +1084,9 @@ e_menu_item_disabled_set(E_Menu_Item *mi, int disable)
mi->disable = 1;
if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,disable", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS))
if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,disable", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,disable", "e");
}
else
@ -1095,9 +1094,9 @@ e_menu_item_disabled_set(E_Menu_Item *mi, int disable)
mi->disable = 0;
if (mi->icon_bg_object)
edje_object_signal_emit(mi->icon_bg_object, "e,state,enable", "e");
if (mi->label_object && eo_isa(mi->label_object, EDJE_OBJ_CLASS))
if (mi->label_object && eo_isa(mi->label_object, EDJE_CLASS))
edje_object_signal_emit(mi->label_object, "e,state,enable", "e");
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_OBJ_CLASS))
if (mi->toggle_object && eo_isa(mi->toggle_object, EDJE_CLASS))
edje_object_signal_emit(mi->toggle_object, "e,state,enable", "e");
}
}

4
src/modules/ibox/e_mod_main.c
Unescape View File

@ -649,11 +649,11 @@ _ibox_icon_signal_emit(IBox_Icon *ic, char *sig, char *src)
{
if (ic->o_holder)
edje_object_signal_emit(ic->o_holder, sig, src);
if (ic->o_icon && eo_isa(ic->o_icon, EDJE_OBJ_CLASS))
if (ic->o_icon && eo_isa(ic->o_icon, EDJE_CLASS))
edje_object_signal_emit(ic->o_icon, sig, src);
if (ic->o_holder2)
edje_object_signal_emit(ic->o_holder2, sig, src);
if (ic->o_icon2 && eo_isa(ic->o_icon2, EDJE_OBJ_CLASS))
if (ic->o_icon2 && eo_isa(ic->o_icon2, EDJE_CLASS))
edje_object_signal_emit(ic->o_icon2, sig, src);
}

Write Preview
Loading…
Cancel
Save