Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_shelf.c
Log Message:
Delay assignment of es->win, as e_popup_edje_bg_object_set might change
the window (patch from jeffdameth).
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -3 -r1.87 -r1.88
--- e_shelf.c 8 Dec 2007 23:40:57 -0000 1.87
+++ e_shelf.c 9 Dec 2007 15:38:03 -0000 1.88
@@ -109,15 +109,12 @@
e_popup_layer_set(es->popup, layer);
es->ee = es->popup->ecore_evas;
es->evas = es->popup->evas;
- es->win = es->popup->evas_win;
}
else
{
e_drop_xdnd_register_set(zone->container->event_win, 1);
es->ee = zone->container->bg_ecore_evas;
es->evas = zone->container->bg_evas;
- /* TODO: We should have a mouse out on the evas object if we are on the
desktop */
- es->win = zone->container->event_win;
}
es->fit_along = 1;
es->layer = layer;
@@ -149,6 +146,7 @@
evas_object_show(es->o_event);
evas_object_show(es->o_base);
e_popup_edje_bg_object_set(es->popup, es->o_base);
+ es->win = es->popup->evas_win;
}
else
{
@@ -156,6 +154,8 @@
evas_object_move(es->o_base, es->zone->x + es->x, es->zone->y + es->y);
evas_object_layer_set(es->o_event, layer);
evas_object_layer_set(es->o_base, layer);
+ /* TODO: We should have a mouse out on the evas object if we are on the
desktop */
+ es->win = zone->container->event_win;
}
es->gadcon = e_gadcon_swallowed_new(es->name, es->id, es->o_base,
"e.swallow.content");
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
