forked from enlightenment/enlightenment
gadcon popups will no longer pop over the gadget if popping for a shelf in autohide mode
SVN revision: 79719
This commit is contained in:
parent
e2a529f0dc
commit
2ac82d5a0c
|
@ -183,6 +183,7 @@ _e_gadcon_popup_position(E_Gadcon_Popup *pop)
|
||||||
py = gy;
|
py = gy;
|
||||||
if (py + pop->h >= (zy + zh))
|
if (py + pop->h >= (zy + zh))
|
||||||
py = gy + gh - pop->h;
|
py = gy + gh - pop->h;
|
||||||
|
px = MIN(zx + zw - gw - pop->w - 3, px);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_LEFT:
|
case E_GADCON_ORIENT_LEFT:
|
||||||
|
@ -192,6 +193,7 @@ _e_gadcon_popup_position(E_Gadcon_Popup *pop)
|
||||||
py = gy;
|
py = gy;
|
||||||
if (py + pop->h >= (zy + zh))
|
if (py + pop->h >= (zy + zh))
|
||||||
py = gy + gh - pop->h;
|
py = gy + gh - pop->h;
|
||||||
|
px = MAX(zx + zw - gw - pop->w + 3, px);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_TOP:
|
case E_GADCON_ORIENT_TOP:
|
||||||
|
@ -203,6 +205,7 @@ _e_gadcon_popup_position(E_Gadcon_Popup *pop)
|
||||||
px = gx + gw - pop->w;
|
px = gx + gw - pop->w;
|
||||||
else if (px < zx)
|
else if (px < zx)
|
||||||
px = zx;
|
px = zx;
|
||||||
|
py = MAX(zy + zh - gh - pop->h + 3, py);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_BOTTOM:
|
case E_GADCON_ORIENT_BOTTOM:
|
||||||
|
@ -214,6 +217,7 @@ _e_gadcon_popup_position(E_Gadcon_Popup *pop)
|
||||||
px = gx + gw - pop->w;
|
px = gx + gw - pop->w;
|
||||||
else if (px < zx)
|
else if (px < zx)
|
||||||
px = zx;
|
px = zx;
|
||||||
|
py = MIN(zy + zh - gh - pop->h - 3, py);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case E_GADCON_ORIENT_FLOAT:
|
case E_GADCON_ORIENT_FLOAT:
|
||||||
|
|
Loading…
Reference in New Issue