enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 25 Pull Requests 2 Projects Releases Wiki Activity

Pager should listen to iconify event, not show/hide 

SVN revision: 13839
This commit is contained in:
sebastid 2005-03-21 23:05:40 +00:00 committed by sebastid
parent a43f77e34c
commit 83a8630f13
2 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/modules/pager/e_mod_main.c
View File

@ -39,8 +39,8 @@ static int _pager_face_cb_event_border_resize(void *data, int type, void
static int _pager_face_cb_event_border_move(void *data, int type, void *event); 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_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_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_iconify(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_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_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_unstick(void *data, int type, void *event);
static int _pager_face_cb_event_border_desk_set(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 @@ _pager_face_new(E_Zone *zone)
face->ev_handler_border_remove = face->ev_handler_border_remove =
ecore_event_handler_add(E_EVENT_BORDER_REMOVE, ecore_event_handler_add(E_EVENT_BORDER_REMOVE,
_pager_face_cb_event_border_remove, face); _pager_face_cb_event_border_remove, face);
face->ev_handler_border_hide = face->ev_handler_border_iconify =
ecore_event_handler_add(E_EVENT_BORDER_HIDE, ecore_event_handler_add(E_EVENT_BORDER_ICONIFY,
_pager_face_cb_event_border_hide, face); _pager_face_cb_event_border_iconify, face);
face->ev_handler_border_show = face->ev_handler_border_uniconify =
ecore_event_handler_add(E_EVENT_BORDER_SHOW, ecore_event_handler_add(E_EVENT_BORDER_UNICONIFY,
_pager_face_cb_event_border_show, face); _pager_face_cb_event_border_uniconify, face);
face->ev_handler_border_stick = face->ev_handler_border_stick =
ecore_event_handler_add(E_EVENT_BORDER_STICK, ecore_event_handler_add(E_EVENT_BORDER_STICK,
_pager_face_cb_event_border_stick, face); _pager_face_cb_event_border_stick, face);
@ -373,8 +373,8 @@ _pager_face_free(Pager_Face *face)
ecore_event_handler_del(face->ev_handler_border_move); 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_add);
ecore_event_handler_del(face->ev_handler_border_remove); 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_iconify);
ecore_event_handler_del(face->ev_handler_border_show); 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_stick);
ecore_event_handler_del(face->ev_handler_border_unstick); ecore_event_handler_del(face->ev_handler_border_unstick);
ecore_event_handler_del(face->ev_handler_border_desk_set); ecore_event_handler_del(face->ev_handler_border_desk_set);
@ -779,14 +779,13 @@ _pager_face_cb_event_border_add(void *data, int type, void *event)
face = data; face = data;
ev = event; ev = event;
if ((face->zone != ev->border->zone)) if (face->zone != ev->border->zone) return 1;
return 1; if (_pager_face_border_find(face, ev->border))
if (_pager_face_border_find(face, ev->border)) {
{ printf("BUG: _pager_face_cb_event_border_add()\n");
printf("BUG: _pager_face_cb_event_border_add()\n"); printf(" An already existing border shouldn't be added again\n");
printf(" An already existing border shouldn't be added again\n"); return 1;
return 1; }
}
pd = _pager_face_desk_find(face, ev->border->desk); pd = _pager_face_desk_find(face, ev->border->desk);
if (pd) if (pd)
@ -827,7 +826,7 @@ _pager_face_cb_event_border_remove(void *data, int type, void *event)
} }
static int 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; E_Event_Border_Hide *ev;
Pager_Face *face; Pager_Face *face;
@ -844,16 +843,13 @@ _pager_face_cb_event_border_hide(void *data, int type, void *event)
pd = l->data; pd = l->data;
pw = _pager_desk_border_find(pd, ev->border); pw = _pager_desk_border_find(pd, ev->border);
if (pw) if (pw)
{ evas_object_hide(pw->window_object);
if (ev->border->desk->visible)
evas_object_hide(pw->window_object);
}
} }
return 1; return 1;
} }
static int 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; E_Event_Border_Show *ev;
Pager_Face *face; Pager_Face *face;
@ -870,10 +866,7 @@ _pager_face_cb_event_border_show(void *data, int type, void *event)
pd = l->data; pd = l->data;
pw = _pager_desk_border_find(pd, ev->border); pw = _pager_desk_border_find(pd, ev->border);
if (pw) if (pw)
{ evas_object_show(pw->window_object);
if (ev->border->desk->visible)
evas_object_show(pw->window_object);
}
} }
return 1; return 1;
} }

4
src/modules/pager/e_mod_main.h
View File

@ -63,8 +63,8 @@ struct _Pager_Face
Ecore_Event_Handler *ev_handler_border_move; Ecore_Event_Handler *ev_handler_border_move;
Ecore_Event_Handler *ev_handler_border_add; Ecore_Event_Handler *ev_handler_border_add;
Ecore_Event_Handler *ev_handler_border_remove; Ecore_Event_Handler *ev_handler_border_remove;
Ecore_Event_Handler *ev_handler_border_hide; Ecore_Event_Handler *ev_handler_border_iconify;
Ecore_Event_Handler *ev_handler_border_show; Ecore_Event_Handler *ev_handler_border_uniconify;
Ecore_Event_Handler *ev_handler_border_stick; Ecore_Event_Handler *ev_handler_border_stick;
Ecore_Event_Handler *ev_handler_border_unstick; Ecore_Event_Handler *ev_handler_border_unstick;
Ecore_Event_Handler *ev_handler_border_desk_set; Ecore_Event_Handler *ev_handler_border_desk_set;