Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Pager should listen to iconify event, not show/hide
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- e_mod_main.c 21 Mar 2005 20:58:43 -0000 1.72
+++ e_mod_main.c 21 Mar 2005 23:05:38 -0000 1.73
@@ -39,8 +39,8 @@
static int _pager_face_cb_event_border_move(void *data, int type, void
*event);
static int _pager_face_cb_event_border_add(void *data, int type, void
*event);
static int _pager_face_cb_event_border_remove(void *data, int type,
void *event);
-static int _pager_face_cb_event_border_hide(void *data, int type, void
*event);
-static int _pager_face_cb_event_border_show(void *data, int type, void
*event);
+static int _pager_face_cb_event_border_iconify(void *data, int type,
void *event);
+static int _pager_face_cb_event_border_uniconify(void *data, int type,
void *event);
static int _pager_face_cb_event_border_stick(void *data, int type,
void *event);
static int _pager_face_cb_event_border_unstick(void *data, int type,
void *event);
static int _pager_face_cb_event_border_desk_set(void *data, int type,
void *event);
@@ -291,12 +291,12 @@
face->ev_handler_border_remove =
ecore_event_handler_add(E_EVENT_BORDER_REMOVE,
_pager_face_cb_event_border_remove, face);
- face->ev_handler_border_hide =
- ecore_event_handler_add(E_EVENT_BORDER_HIDE,
- _pager_face_cb_event_border_hide, face);
- face->ev_handler_border_show =
- ecore_event_handler_add(E_EVENT_BORDER_SHOW,
- _pager_face_cb_event_border_show, face);
+ face->ev_handler_border_iconify =
+ ecore_event_handler_add(E_EVENT_BORDER_ICONIFY,
+ _pager_face_cb_event_border_iconify, face);
+ face->ev_handler_border_uniconify =
+ ecore_event_handler_add(E_EVENT_BORDER_UNICONIFY,
+ _pager_face_cb_event_border_uniconify, face);
face->ev_handler_border_stick =
ecore_event_handler_add(E_EVENT_BORDER_STICK,
_pager_face_cb_event_border_stick, face);
@@ -373,8 +373,8 @@
ecore_event_handler_del(face->ev_handler_border_move);
ecore_event_handler_del(face->ev_handler_border_add);
ecore_event_handler_del(face->ev_handler_border_remove);
- ecore_event_handler_del(face->ev_handler_border_hide);
- ecore_event_handler_del(face->ev_handler_border_show);
+ ecore_event_handler_del(face->ev_handler_border_iconify);
+ ecore_event_handler_del(face->ev_handler_border_uniconify);
ecore_event_handler_del(face->ev_handler_border_stick);
ecore_event_handler_del(face->ev_handler_border_unstick);
ecore_event_handler_del(face->ev_handler_border_desk_set);
@@ -779,14 +779,13 @@
face = data;
ev = event;
- if ((face->zone != ev->border->zone))
- return 1;
- if (_pager_face_border_find(face, ev->border))
- {
- printf("BUG: _pager_face_cb_event_border_add()\n");
- printf(" An already existing border shouldn't be added again\n");
- return 1;
- }
+ if (face->zone != ev->border->zone) return 1;
+ if (_pager_face_border_find(face, ev->border))
+ {
+ printf("BUG: _pager_face_cb_event_border_add()\n");
+ printf(" An already existing border shouldn't be added again\n");
+ return 1;
+ }
pd = _pager_face_desk_find(face, ev->border->desk);
if (pd)
@@ -827,7 +826,7 @@
}
static int
-_pager_face_cb_event_border_hide(void *data, int type, void *event)
+_pager_face_cb_event_border_iconify(void *data, int type, void *event)
{
E_Event_Border_Hide *ev;
Pager_Face *face;
@@ -844,16 +843,13 @@
pd = l->data;
pw = _pager_desk_border_find(pd, ev->border);
if (pw)
- {
- if (ev->border->desk->visible)
- evas_object_hide(pw->window_object);
- }
+ evas_object_hide(pw->window_object);
}
return 1;
}
static int
-_pager_face_cb_event_border_show(void *data, int type, void *event)
+_pager_face_cb_event_border_uniconify(void *data, int type, void *event)
{
E_Event_Border_Show *ev;
Pager_Face *face;
@@ -870,10 +866,7 @@
pd = l->data;
pw = _pager_desk_border_find(pd, ev->border);
if (pw)
- {
- if (ev->border->desk->visible)
- evas_object_show(pw->window_object);
- }
+ evas_object_show(pw->window_object);
}
return 1;
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- e_mod_main.h 20 Mar 2005 11:49:32 -0000 1.18
+++ e_mod_main.h 21 Mar 2005 23:05:40 -0000 1.19
@@ -63,8 +63,8 @@
Ecore_Event_Handler *ev_handler_border_move;
Ecore_Event_Handler *ev_handler_border_add;
Ecore_Event_Handler *ev_handler_border_remove;
- Ecore_Event_Handler *ev_handler_border_hide;
- Ecore_Event_Handler *ev_handler_border_show;
+ Ecore_Event_Handler *ev_handler_border_iconify;
+ Ecore_Event_Handler *ev_handler_border_uniconify;
Ecore_Event_Handler *ev_handler_border_stick;
Ecore_Event_Handler *ev_handler_border_unstick;
Ecore_Event_Handler *ev_handler_border_desk_set;
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
