From 5c5c1da5fbaf1bc81e7d87e694002b1b8c3ad825 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 22 Aug 2012 12:41:44 +0000 Subject: [PATCH] Evas: Integrate patch from Robert Bradford which makes the framespace adding and subtracting consistent. Fixes ticket #1295. SVN revision: 75545 --- legacy/evas/src/lib/canvas/evas_object_main.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_main.c b/legacy/evas/src/lib/canvas/evas_object_main.c index 955570b6ae..78f21cac3c 100644 --- a/legacy/evas/src/lib/canvas/evas_object_main.c +++ b/legacy/evas/src/lib/canvas/evas_object_main.c @@ -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; }