Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon_popup.c
Log Message:
Handle corner cases where popup X may be less than the zone X.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon_popup.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_gadcon_popup.c 8 Jan 2008 06:12:22 -0000 1.8
+++ e_gadcon_popup.c 8 Jan 2008 19:33:48 -0000 1.9
@@ -62,7 +62,8 @@
e_gadcon_popup_show(E_Gadcon_Popup *pop)
{
Evas_Object *o;
- Evas_Coord gx, gy, gw, gh, zw, zh, px, py, ww, wh;
+ Evas_Coord gx, gy, gw, gh, zw, zh, zx;
+ Evas_Coord px, py, ww, wh;
if (!pop) return;
E_OBJECT_CHECK(pop);
@@ -92,6 +93,7 @@
e_gadcon_client_geometry_get(pop->gcc, &gx, &gy, &gw, &gh);
zw = pop->gcc->gadcon->zone->w;
zh = pop->gcc->gadcon->zone->h;
+ zx = pop->gcc->gadcon->zone->x;
switch (pop->gcc->gadcon->orient)
{
case E_GADCON_ORIENT_CORNER_RT:
@@ -118,6 +120,8 @@
px = (gx + (gw / 2)) - (pop->w / 2);
if (px + pop->w >= zw)
px = gx + gw - pop->w;
+ else if (px < zx)
+ px = zx;
break;
case E_GADCON_ORIENT_BOTTOM:
case E_GADCON_ORIENT_CORNER_BL:
@@ -126,6 +130,8 @@
px = (gx + (gw / 2)) - (pop->w / 2);
if (px + pop->w >= zw)
px = gx + gw - pop->w;
+ else if (px < zx)
+ px = zx;
break;
default:
e_popup_move_resize(pop->win, 50, 50, pop->w, pop->h);
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
