From f12cbc0ad243c8d4591e808e700b7abbe5a35144 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 5 Jul 2004 10:59:37 +0000 Subject: [PATCH] oops - fix alignment just a little SVN revision: 10695 --- legacy/edje/src/lib/edje_calc.c | 42 +++++++++++++---------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/legacy/edje/src/lib/edje_calc.c b/legacy/edje/src/lib/edje_calc.c index b65282b..d75c97b 100644 --- a/legacy/edje/src/lib/edje_calc.c +++ b/legacy/edje/src/lib/edje_calc.c @@ -373,10 +373,12 @@ _edje_part_recalc_single(Edje *ed, if (params->h > 0) { double aspect; - double new_w, new_h; + double new_w, new_h, want_x, want_y, want_w, want_h; - new_h = params->h; - new_w = params->w; + want_x = params->x; + want_y = params->y; + want_h = new_h = params->h; + want_w = new_w = params->w; aspect = (double)params->w / (double)params->h; if (desc->aspect.prefer == EDJE_ASPECT_PREFER_NONE) /* keep both dimensions in check */ { @@ -415,41 +417,23 @@ _edje_part_recalc_single(Edje *ed, if ((params->h - new_h) > (params->w - new_w)) { if (params->h < new_h) - { - params->y = params->y + - ((params->h - new_h) * (1.0 - desc->align.y)); - params->h = new_h; - } + params->h = new_h; else if (params->h > new_h) - { - params->y = params->y + - ((params->h - new_h) * desc->align.y); - params->h = new_h; - } + params->h = new_h; if (desc->aspect.prefer == EDJE_ASPECT_PREFER_VERTICAL) - { - params->w = new_w; - } + params->w = new_w; } else { if (params->w < new_w) - { - params->x = params->x + - ((params->w - new_w) * (1.0 - desc->align.x)); - params->w = new_w; - } + params->w = new_w; else if (params->w > new_w) - { - params->x = params->x + - ((params->w - new_w) * desc->align.x); - params->w = new_w; - } + params->w = new_w; if (desc->aspect.prefer == EDJE_ASPECT_PREFER_HORIZONTAL) - { - params->h = new_h; - } + params->h = new_h; } + params->x = want_x + ((want_w - params->w) * desc->align.x); + params->y = want_y + ((want_h - params->h) * desc->align.y); } #endif -- 2.7.4