Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
first attempt at cleaning up event object stacking.
this still isn't perfect, but is much better.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -3 -r1.121 -r1.122
--- e_mod_main.c 11 Sep 2005 00:18:57 -0000 1.121
+++ e_mod_main.c 11 Sep 2005 06:03:13 -0000 1.122
@@ -815,14 +815,18 @@
o = evas_object_rectangle_add(pd->face->evas);
pw->event_object = o;
- evas_object_layer_set(o, 2);
+
evas_object_repeat_events_set(o, 1);
evas_object_color_set(o, 0, 0, 0, 0);
+// evas_object_color_set(o, rand()%255, rand()%255, rand()%255, 255);
+
+
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_IN,
_pager_window_cb_mouse_in, pw);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_OUT,
_pager_window_cb_mouse_out, pw);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_pager_window_cb_mouse_down, pw);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP,
_pager_window_cb_mouse_up, pw);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE,
_pager_window_cb_mouse_move, pw);
+
evas_object_show(o);
e_layout_pack(pd->layout_object, pw->event_object);
e_layout_child_raise(pw->event_object);
@@ -1293,7 +1297,7 @@
pd->wins = evas_list_append(pd->wins, pw);
e_layout_pack(pd->layout_object, pw->window_object);
e_layout_pack(pd->layout_object, pw->event_object);
- e_layout_child_raise(pw->window_object);
+ e_border_raise(pw->border);
_pager_window_move(face, pw);
}
}
@@ -1360,12 +1364,13 @@
if (pw2)
{
e_layout_child_raise_above(pw->window_object,
pw2->window_object);
- e_layout_child_raise_above(pw->event_object,
pw2->event_object);
+ e_layout_child_raise_above(pw->event_object,
pw->window_object);
+ e_layout_child_raise_above(pw2->event_object,
pw2->window_object);
}
else
{
e_layout_child_raise(pw->window_object);
- e_layout_child_raise(pw->event_object);
+ e_layout_child_raise_above(pw->event_object,
pw->window_object);
}
}
else if (ev->type == E_STACKING_BELOW)
@@ -1373,12 +1378,12 @@
if (pw2)
{
e_layout_child_lower_below(pw->window_object,
pw2->window_object);
- e_layout_child_lower_below(pw->event_object,
pw2->event_object);
+ e_layout_child_raise_above(pw->event_object,
pw->window_object);
}
else
{
e_layout_child_lower(pw->window_object);
- e_layout_child_lower(pw->event_object);
+ e_layout_child_raise_above(pw->event_object,
pw->window_object);
}
}
}
-------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
