Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c
Log Message:
Make ->layer always consistent with real layer. Else it might get ugly.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -3 -r1.213 -r1.214
--- e_border.c 19 May 2005 04:38:32 -0000 1.213
+++ e_border.c 19 May 2005 04:54:23 -0000 1.214
@@ -431,9 +431,7 @@
E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if (!bd->visible) return;
- printf("hide1\n");
if (bd->moving) return;
- printf("hide2\nn");
ecore_x_window_hide(bd->client.win);
e_container_shape_hide(bd->shape);
@@ -454,7 +452,6 @@
ev = calloc(1, sizeof(E_Event_Border_Hide));
ev->border = bd;
e_object_ref(E_OBJECT(bd));
- printf("ref bd %p to %i\n", bd, e_object_ref_get(E_OBJECT(bd)));
ecore_event_add(E_EVENT_BORDER_HIDE, ev,
_e_border_event_border_hide_free, NULL);
}
}
@@ -962,8 +959,6 @@
if ((bd->shaded) || (bd->shading)) return;
if (!bd->fullscreen)
{
- int layer;
-
bd->saved.x = bd->x;
bd->saved.y = bd->y;
bd->saved.w = bd->w;
@@ -971,10 +966,8 @@
e_hints_window_fullscreen_set(bd, 1);
- layer = bd->layer;
bd->layer = 200;
e_border_raise(bd);
- bd->layer = layer;
e_border_move_resize(bd,
bd->zone->x - bd->client_inset.l,
bd->zone->y - bd->client_inset.t,
@@ -1007,6 +1000,7 @@
bd->changes.size = 1;
bd->changed = 1;
+ bd->layer = 100;
e_border_raise(bd);
edje_object_signal_emit(bd->bg_object, "unfullscreen", "");
@@ -1393,7 +1387,6 @@
static void
_e_border_free(E_Border *bd)
{
- printf("BD FREE %p\n", bd);
if (resize == bd)
_e_border_resize_end(bd);
if (move == bd)
@@ -1454,7 +1447,6 @@
{
E_Event_Border_Remove *ev;
- printf("BD DEL %p\n", bd);
ecore_x_window_reparent(bd->client.win,
bd->zone->container->manager->root,
bd->x + bd->client_inset.l,
@@ -1506,26 +1498,20 @@
// printf("in hide cb\n");
bd = data;
e = ev;
- printf("hide..\n");
bd = e_border_find_by_client_window(e->win);
if (!bd) return 1;
- printf("found %p\n");
if (bd->ignore_first_unmap > 0)
{
- printf("IGNORE UNMAP\n");
bd->ignore_first_unmap--;
return 1;
}
/* Don't delete hidden or iconified windows */
if ((bd->iconic) || (!bd->visible))
{
- printf("iconic %i || !visible %i\n",
- bd->iconic, bd->visible);
e_border_hide(bd, 1);
}
else
{
- printf("hide + del\n");
e_border_hide(bd, 0);
e_object_del(E_OBJECT(bd));
}
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
