Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_desk.c e_zone.c
Log Message:
Hide desktop before windows, so that fullscreen can check if the desk
is visible or not.
Don't set desk_?_current in e_zone.c, it should only be done in e_desk_show
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -3 -r1.304 -r1.305
--- e_border.c 1 Jul 2005 10:24:58 -0000 1.304
+++ e_border.c 1 Jul 2005 11:05:47 -0000 1.305
@@ -862,6 +862,7 @@
{
edje_object_signal_emit(bd->bg_object, "passive", "");
e_focus_event_focus_out(bd);
+ /* FIXME: Sometimes we should leave the window fullscreen! */
if (bd->fullscreen)
e_border_unfullscreen(bd);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_desk.c 1 Jul 2005 10:07:24 -0000 1.41
+++ e_desk.c 1 Jul 2005 11:05:48 -0000 1.42
@@ -79,14 +79,30 @@
e_desk_show(E_Desk *desk)
{
E_Border_List *bl;
- int x, y, was_zone = 0;
+ E_Border *bd;
+ int was_zone = 0;
+ int x, y;
E_Event_Desk_Show *ev;
- E_Border *bd;
E_OBJECT_CHECK(desk);
E_OBJECT_TYPE_CHECK(desk, E_DESK_TYPE);
if (desk->visible) return;
-
+
+ for (x = 0; x < desk->zone->desk_x_count; x++)
+ {
+ for (y = 0; y < desk->zone->desk_y_count; y++)
+ {
+ E_Desk *desk2;
+
+ desk2 = e_desk_at_xy_get(desk->zone,x, y);
+ if (desk2->visible)
+ {
+ desk2->visible = 0;
+ ecore_evas_hide(desk2->black_ecore_evas);
+ }
+ }
+ }
+
bl = e_container_border_list_first(desk->zone->container);
if (desk->zone->bg_object) was_zone = 1;
while ((bd = e_container_border_list_next(bl)))
@@ -103,22 +119,8 @@
}
e_container_border_list_free(bl);
- for (x = 0; x < desk->zone->desk_x_count; x++)
- {
- for (y = 0; y < desk->zone->desk_y_count; y++)
- {
- E_Desk *desk2;
-
- desk2 = e_desk_at_xy_get(desk->zone,x, y);
- desk2->visible = 0;
- ecore_evas_hide(desk2->black_ecore_evas);
- if (desk2 == desk)
- {
- desk->zone->desk_x_current = x;
- desk->zone->desk_y_current = y;
- }
- }
- }
+ desk->zone->desk_x_current = desk->x;
+ desk->zone->desk_y_current = desk->y;
if (desk->fullscreen)
{
ecore_evas_show(desk->black_ecore_evas);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- e_zone.c 1 Jul 2005 08:33:32 -0000 1.63
+++ e_zone.c 1 Jul 2005 11:05:48 -0000 1.64
@@ -346,12 +346,10 @@
moved = 0;
if (zone->desk_x_current >= xx)
{
- zone->desk_x_current = xx - 1;
moved = 1;
}
if (zone->desk_y_current >= yy)
{
- zone->desk_y_current = yy - 1;
moved = 1;
}
if (moved)
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs