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:
Merge Raise/Lower event to Stack event.
Fix raise/lower order.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -3 -r1.116 -r1.117
--- e_mod_main.c 7 Sep 2005 04:47:14 -0000 1.116
+++ e_mod_main.c 7 Sep 2005 14:55:46 -0000 1.117
@@ -44,8 +44,7 @@
static int _pager_cb_event_border_stick(void *data, int type, void
*event);
static int _pager_cb_event_border_unstick(void *data, int type, void
*event);
static int _pager_cb_event_border_desk_set(void *data, int type, void
*event);
-static int _pager_cb_event_border_raise(void *data, int type, void
*event);
-static int _pager_cb_event_border_lower(void *data, int type, void
*event);
+static int _pager_cb_event_border_stack(void *data, int type, void
*event);
static int _pager_cb_event_border_icon_change(void *data, int type,
void *event);
static int _pager_cb_event_zone_desk_count_set(void *data, int type,
void *event);
static int _pager_cb_event_desk_show(void *data, int type, void
*event);
@@ -299,12 +298,9 @@
pager->ev_handler_border_desk_set =
ecore_event_handler_add(E_EVENT_BORDER_DESK_SET,
_pager_cb_event_border_desk_set, pager);
- pager->ev_handler_border_raise =
- ecore_event_handler_add(E_EVENT_BORDER_RAISE,
- _pager_cb_event_border_raise, pager);
- pager->ev_handler_border_lower =
- ecore_event_handler_add(E_EVENT_BORDER_LOWER,
- _pager_cb_event_border_lower, pager);
+ pager->ev_handler_border_stack =
+ ecore_event_handler_add(E_EVENT_BORDER_STACK,
+ _pager_cb_event_border_stack, pager);
pager->ev_handler_border_icon_change =
ecore_event_handler_add(E_EVENT_BORDER_ICON_CHANGE,
_pager_cb_event_border_icon_change, pager);
@@ -360,10 +356,8 @@
ecore_event_handler_del(pager->ev_handler_border_unstick);
if (pager->ev_handler_border_desk_set)
ecore_event_handler_del(pager->ev_handler_border_desk_set);
- if (pager->ev_handler_border_raise)
- ecore_event_handler_del(pager->ev_handler_border_raise);
- if (pager->ev_handler_border_lower)
- ecore_event_handler_del(pager->ev_handler_border_lower);
+ if (pager->ev_handler_border_stack)
+ ecore_event_handler_del(pager->ev_handler_border_stack);
if (pager->ev_handler_border_icon_change)
ecore_event_handler_del(pager->ev_handler_border_icon_change);
if (pager->ev_handler_zone_desk_count_set)
@@ -1290,45 +1284,9 @@
}
static int
-_pager_cb_event_border_raise(void *data, int type, void *event)
+_pager_cb_event_border_stack(void *data, int type, void *event)
{
- E_Event_Border_Raise *ev;
- Pager *pager;
- Evas_List *l, *l2;
-
- pager = data;
- ev = event;
- for (l = pager->faces; l; l = l->next)
- {
- Pager_Face *face;
-
- face = l->data;
- if (face->zone != ev->border->zone) continue;
- for (l2 = face->desks; l2; l2 = l2->next)
- {
- Pager_Desk *pd;
- Pager_Win *pw, *pw2 = NULL;
-
- pd = l2->data;
- pw = _pager_desk_border_find(pd, ev->border);
- if (pw)
- {
- if (ev->above)
- pw2 = _pager_desk_border_find(pd, ev->above);
- if (pw2)
- e_layout_child_raise_above(pw->window_object,
pw2->window_object);
- else
- e_layout_child_raise(pw->window_object);
- }
- }
- }
- return 1;
-}
-
-static int
-_pager_cb_event_border_lower(void *data, int type, void *event)
-{
- E_Event_Border_Lower *ev;
+ E_Event_Border_Stack *ev;
Pager *pager;
Evas_List *l, *l2;
@@ -1349,12 +1307,22 @@
pw = _pager_desk_border_find(pd, ev->border);
if (pw)
{
- if (ev->below)
- pw2 = _pager_desk_border_find(pd, ev->below);
- if (pw2)
- e_layout_child_lower_below(pw->window_object,
pw2->window_object);
- else
- e_layout_child_lower(pw->window_object);
+ if (ev->stack)
+ pw2 = _pager_desk_border_find(pd, ev->stack);
+ if (ev->type == E_STACKING_ABOVE)
+ {
+ if (pw2)
+ e_layout_child_raise_above(pw->window_object,
pw2->window_object);
+ else
+ e_layout_child_raise(pw->window_object);
+ }
+ else if (ev->type == E_STACKING_BELOW)
+ {
+ if (pw2)
+ e_layout_child_lower_below(pw->window_object,
pw2->window_object);
+ else
+ e_layout_child_lower(pw->window_object);
+ }
}
}
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_mod_main.h 7 Sep 2005 04:47:14 -0000 1.29
+++ e_mod_main.h 7 Sep 2005 14:55:46 -0000 1.30
@@ -63,8 +63,7 @@
Ecore_Event_Handler *ev_handler_border_stick;
Ecore_Event_Handler *ev_handler_border_unstick;
Ecore_Event_Handler *ev_handler_border_desk_set;
- Ecore_Event_Handler *ev_handler_border_raise;
- Ecore_Event_Handler *ev_handler_border_lower;
+ Ecore_Event_Handler *ev_handler_border_stack;
Ecore_Event_Handler *ev_handler_border_icon_change;
Ecore_Event_Handler *ev_handler_zone_desk_count_set;
Ecore_Event_Handler *ev_handler_desk_show;
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
