enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 13 Pull Requests 2 Projects Releases Wiki Activity

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:
Christopher Michael 2012-08-22 12:41:44 +00:00
parent 4800e571da
commit 5c5c1da5fb
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
legacy/evas/src/lib/canvas/evas_object_main.c
View File

@ -763,18 +763,12 @@ evas_object_geometry_get(const Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, E
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 (nx > 0) nx -= fx;
if (ny > 0) ny -= fy;
}
else if ((obj->smart.parent) && (!obj->smart.smart))
{
int fx, fy;
evas_output_framespace_get(obj->layer->evas,
&fx, &fy, NULL, NULL);
if (nx > 0) nx -= fx;
if (ny > 0) ny -= fy;
}