Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h
Log Message:
reparent window when border is deleted. It will disappear sometime.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -3 -r1.198 -r1.199
--- e_border.c 13 May 2005 13:34:20 -0000 1.198
+++ e_border.c 13 May 2005 17:32:37 -0000 1.199
@@ -1417,11 +1417,6 @@
bd->handlers = evas_list_remove_list(bd->handlers, bd->handlers);
ecore_event_handler_del(h);
}
- if (!bd->already_unparented)
- {
- ecore_x_window_reparent(bd->client.win,
bd->zone->container->manager->root, bd->x + bd->client_inset.l, bd->y +
bd->client_inset.t);
- ecore_x_window_save_set_del(bd->client.win);
- }
if (bd->client.border.name) free(bd->client.border.name);
if (bd->client.icccm.title) free(bd->client.icccm.title);
if (bd->client.icccm.name) free(bd->client.icccm.name);
@@ -1447,7 +1442,13 @@
_e_border_del(E_Border *bd)
{
E_Event_Border_Remove *ev;
-
+
+ ecore_x_window_reparent(bd->client.win,
+ bd->zone->container->manager->root,
+ bd->x + bd->client_inset.l,
+ bd->y + bd->client_inset.t);
+ ecore_x_window_save_set_del(bd->client.win);
+
ev = calloc(1, sizeof(E_Event_Border_Remove));
ev->border = bd;
/* FIXME Don't ref this during shutdown. And the event is pointless
@@ -1507,12 +1508,6 @@
else
{
e_border_hide(bd, 0);
- ecore_x_window_reparent(bd->client.win,
- bd->zone->container->manager->root,
- bd->x + bd->client_inset.l,
- bd->y + bd->client_inset.t);
- ecore_x_window_save_set_del(bd->client.win);
- bd->already_unparented = 1;
e_object_del(E_OBJECT(bd));
}
return 1;
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_border.h 13 May 2005 07:24:46 -0000 1.49
+++ e_border.h 13 May 2005 17:32:37 -0000 1.50
@@ -189,7 +189,6 @@
unsigned char need_shape_merge : 1;
unsigned char need_shape_export : 1;
unsigned char fullscreen : 1;
- unsigned char already_unparented : 1;
unsigned char changed : 1;
-------------------------------------------------------
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=7393&alloc_id=16281&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
