Enlightenment CVS committal
Author : urandom
Project : e_modules
Module : winselector
Dir : e_modules/winselector
Modified Files:
e_mod_main.c
Removed Files:
Makefile.am~
Log Message:
use border icons instead of eaps
===================================================================
RCS file: /cvs/e/e_modules/winselector/e_mod_main.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_mod_main.c 26 Jul 2006 22:21:28 -0000 1.1
+++ e_mod_main.c 28 Jul 2006 23:23:20 -0000 1.2
@@ -40,7 +40,6 @@
static void _win_menu_item_create(E_Border *bd, E_Menu *m, Instance *inst);
static int _window_cb_focus_in(void *data, int type, void *event);
static int _window_cb_focus_out(void *data, int type, void *event);
-static int _window_cb_bd_remove(void *data, int type, void *event);
static int _window_cb_icon_change(void *data, int type, void *event);
static void _focus_in(E_Border *bd, Instance *inst);
static void _focus_out(Instance *inst);
@@ -80,8 +79,6 @@
handlers = evas_list_append (handlers, ecore_event_handler_add
(ECORE_X_EVENT_WINDOW_FOCUS_OUT, _window_cb_focus_out, inst));
handlers = evas_list_append (handlers, ecore_event_handler_add
- (E_EVENT_BORDER_REMOVE, _window_cb_bd_remove, inst));
- handlers = evas_list_append (handlers, ecore_event_handler_add
(E_EVENT_BORDER_ICON_CHANGE, _window_cb_icon_change, inst));
evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN,
_button_cb_mouse_down, inst);
@@ -296,7 +293,6 @@
static void
_win_menu_item_create(E_Border *bd, E_Menu *m, Instance *inst)
{
- E_App *a;
Evas_Object *icon;
E_Menu_Item *mi;
const char *title;
@@ -314,13 +310,7 @@
e_menu_item_callback_set(mi, _win_menu_item_cb, bd);
if (!bd->iconic) e_menu_item_toggle_set(mi, 1);
icon = e_border_icon_add(bd, evas_object_evas_get(inst->o_button));
- a = bd->app;
- if (a)
- {
- if (!((a->icon_class) &&
- (e_util_menu_item_edje_icon_list_set(mi, a->icon_class))))
- e_menu_item_icon_edje_set(mi, a->path, "icon");
- }
+ e_menu_item_icon_object_set(mi, icon);
}
static void
@@ -407,21 +397,6 @@
_focus_out(inst);
- return 1;
-}
-
-static int
-_window_cb_bd_remove(void *data, int type, void *event)
-{
- E_Event_Border_Remove *ev;
- E_Border *bd;
- Instance *inst;
-
- ev = event;
- inst = data;
- if (!(bd = ev->border)) return 1;
-
- _focus_out(inst);
return 1;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
