forked from enlightenment/efl
Evas: Integrate patch from Robert Bradford which makes the framespace
adding and subtracting consistent. Fixes ticket #1295. SVN revision: 75545
This commit is contained in:
parent
4800e571da
commit
5c5c1da5fb
|
@ -763,18 +763,12 @@ evas_object_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E
|
||||||
|
|
||||||
if (!obj->is_frame)
|
if (!obj->is_frame)
|
||||||
{
|
{
|
||||||
int fx, fy;
|
|
||||||
|
|
||||||
evas_output_framespace_get(obj->layer->evas,
|
|
||||||
&fx, &fy, NULL, NULL);
|
|
||||||
|
|
||||||
if ((!obj->smart.parent) && (obj->smart.smart))
|
if ((!obj->smart.parent) && (obj->smart.smart))
|
||||||
{
|
{
|
||||||
if (nx > 0) nx -= fx;
|
int fx, fy;
|
||||||
if (ny > 0) ny -= fy;
|
|
||||||
}
|
evas_output_framespace_get(obj->layer->evas,
|
||||||
else if ((obj->smart.parent) && (!obj->smart.smart))
|
&fx, &fy, NULL, NULL);
|
||||||
{
|
|
||||||
if (nx > 0) nx -= fx;
|
if (nx > 0) nx -= fx;
|
||||||
if (ny > 0) ny -= fy;
|
if (ny > 0) ny -= fy;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue