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
|
@ -762,19 +762,13 @@ evas_object_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E
|
|||
ny = obj->cur.geometry.y;
|
||||
|
||||
if (!obj->is_frame)
|
||||
{
|
||||
if ((!obj->smart.parent) && (obj->smart.smart))
|
||||
{
|
||||
int fx, fy;
|
||||
|
||||
evas_output_framespace_get(obj->layer->evas,
|
||||
&fx, &fy, NULL, NULL);
|
||||
|
||||
if ((!obj->smart.parent) && (obj->smart.smart))
|
||||
{
|
||||
if (nx > 0) nx -= fx;
|
||||
if (ny > 0) ny -= fy;
|
||||
}
|
||||
else if ((obj->smart.parent) && (!obj->smart.smart))
|
||||
{
|
||||
if (nx > 0) nx -= fx;
|
||||
if (ny > 0) ny -= fy;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue