Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/pager
Modified Files:
e_mod_main.c
Log Message:
Don't raise border when changing desk
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -3 -r1.132 -r1.133
--- e_mod_main.c 22 Sep 2005 20:17:55 -0000 1.132
+++ e_mod_main.c 22 Sep 2005 22:57:17 -0000 1.133
@@ -1338,6 +1338,9 @@
pd = _pager_face_desk_find(face, ev->border->desk);
if (pd)
{
+ Pager_Win *pw2 = NULL;
+ E_Border *bd;
+
/* remove it from whatever desk it was on */
pw->desk->wins = evas_list_remove(pw->desk->wins, pw);
e_layout_unpack(pw->window_object);
@@ -1348,7 +1351,21 @@
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_border_raise(pw->border);
+
+ bd = e_util_desk_border_above(pw->border);
+ if (bd)
+ pw2 = _pager_desk_border_find(pd, bd);
+ if (pw2)
+ {
+ e_layout_child_lower_below(pw->window_object,
pw2->window_object);
+ e_layout_child_raise_above(pw->event_object,
pw->window_object);
+ }
+ else
+ {
+ e_layout_child_raise(pw->window_object);
+ e_layout_child_raise_above(pw->event_object,
pw->window_object);
+ }
+
_pager_window_move(face, pw);
}
}
@@ -1365,8 +1382,25 @@
pw = _pager_window_new(pd, ev->border);
if (pw)
{
+ Pager_Win *pw2 = NULL;
+ E_Border *bd;
+
pd->wins = evas_list_append(pd->wins, pw);
- e_border_raise(pw->border);
+ bd = e_util_desk_border_above(pw->border);
+ if (bd)
+ pw2 = _pager_desk_border_find(pd, bd);
+ if (pw2)
+ {
+ e_layout_child_lower_below(pw->window_object,
pw2->window_object);
+ e_layout_child_raise_above(pw->event_object,
pw->window_object);
+ }
+ else
+ {
+ e_layout_child_raise(pw->window_object);
+ e_layout_child_raise_above(pw->event_object,
pw->window_object);
+ }
+
+ _pager_window_move(face, pw);
}
}
}
@@ -1380,8 +1414,25 @@
pw = _pager_window_new(pd, ev->border);
if (pw)
{
+ Pager_Win *pw2 = NULL;
+ E_Border *bd;
+
pd->wins = evas_list_append(pd->wins, pw);
- e_border_raise(pw->border);
+ bd = e_util_desk_border_above(pw->border);
+ if (bd)
+ pw2 = _pager_desk_border_find(pd, bd);
+ if (pw2)
+ {
+ e_layout_child_lower_below(pw->window_object,
pw2->window_object);
+ e_layout_child_raise_above(pw->event_object,
pw->window_object);
+ }
+ else
+ {
+ e_layout_child_raise(pw->window_object);
+ e_layout_child_raise_above(pw->event_object,
pw->window_object);
+ }
+
+ _pager_window_move(face, pw);
}
}
}
@@ -1441,7 +1492,8 @@
}
else
{
- e_layout_child_raise(pw->window_object);
+ /* If we aren't above any window, we are at the
bottom */
+ e_layout_child_lower(pw->window_object);
e_layout_child_raise_above(pw->event_object,
pw->window_object);
}
}
@@ -1454,7 +1506,8 @@
}
else
{
- e_layout_child_lower(pw->window_object);
+ /* If we aren't below any window, we are at the top
*/
+ e_layout_child_raise(pw->window_object);
e_layout_child_raise_above(pw->event_object,
pw->window_object);
}
}
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs