From 0868f8f3b7aa40ba0eda3d38b16162bb2bb96bf1 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 16 Aug 2012 16:40:26 -0700 Subject: [PATCH] Fix vertical placement of bmp images on firmware screens. BUG=chromium-os:33608 TEST=Run 'make' in newbitmaps directory to generate new bmpblock. Run on DUT. Observe spacing in the footer section is closer together. Change-Id: I96987e827fd395f13244dbc58db600de5dc30958 Reviewed-on: https://gerrit.chromium.org/gerrit/30610 Reviewed-by: Hung-Te Lin Commit-Ready: Dave Parker Tested-by: Dave Parker --- scripts/newbitmaps/images/make_default_yaml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/scripts/newbitmaps/images/make_default_yaml b/scripts/newbitmaps/images/make_default_yaml index 216cc0f540..caf0684bd3 100755 --- a/scripts/newbitmaps/images/make_default_yaml +++ b/scripts/newbitmaps/images/make_default_yaml @@ -155,33 +155,27 @@ add_centered_below() { local width local height local x - local y - - height=$(get_max_height $images) - y=$(expr $cur_y + $height) width=$(total_width $images) x=$(expr $cur_x - $width / 2) - add_images $x $y $images + add_images $x $cur_y $images } # This adds a list of images and updates the insert location -# below the new images with a padding of $xpad. +# below the new images with a padding of $ypad. insert_centered_below() { local images=$@ local width local height local x - local y - - height=$(get_max_height $images) - y=$(expr $cur_y + $height) width=$(total_width $images) x=$(expr $cur_x - $width / 2) - add_images $x $y $images + add_images $x $cur_y $images + + height=$(get_max_height $images) move_pos_down $(expr $height + $ypad) }