Cherry-Pick: 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: Ibbffcdcb356ab0a77ba33c62a377bc5db0682f59
Original-Change-Id: I96987e827fd395f13244dbc58db600de5dc30958
Reviewed-on: https://gerrit.chromium.org/gerrit/30610
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Ready: Dave Parker <dparker@chromium.org>
Tested-by: Dave Parker <dparker@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/30724
Reviewed-by: Dave Parker <dparker@chromium.org>

1 files changed, 5 insertions, 11 deletions

diff --git a/scripts/newbitmaps/images/make_default_yaml b/scripts/newbitmaps/images/make_default_yaml
index 15b95471..3976289d 100755
--- a/scripts/newbitmaps/images/make_default_yaml
+++ b/scripts/newbitmaps/images/make_default_yaml
@@ -153,33 +153,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)
 }