Fixes alignment of spacebar row.

ui/keyboard/resources/main.js

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 (function(exports) {
   /**
    * Alignment options for a keyset.
    * @param {Object=} opt_keyset The keyset to calculate the dimensions for.
    *    Defaults to the current active keyset.
    */
   var AlignmentOptions = function(opt_keyset) {
@@ skipping 276 matching lines @@
         return 0;
       return x >= high? 1 : -1;
     }
 
     return binarySearch(0, allKeys.length -1, testFn);
   }
 
   /**
    * Redistributes the total width amongst the keys in the range provided.
    * @param {Array.<kb-key>} allKeys Ordered list of keys to stretch.
-   * @param {number} pitch The space between two keys.
+   * @param {AlignmentOptions} params Options for aligning the keyset.
    * @param {number} xOffset The x-coordinate of the key who's index is start.
    * @param {number} width The total extraneous width to distribute.
    * @param {number} keyHeight The height of each key.
    * @param {number} yOffset The y-coordinate of the top edge of the row.
    */
-  function redistribute(allKeys, pitch, xOffset, width, keyHeight, yOffset) {
-    var weight = 0;
+  function redistribute(allKeys, params, xOffset, width, keyHeight, yOffset) {
+    var availableWidth = width - (allKeys.length - 1) * params.pitchX;
+    var stretchWeight = 0;
+    var nStretch = 0;
     for (var i = 0; i < allKeys.length; i++) {
       var key = allKeys[i];
-      weight += key.weight;
+      if (key.stretch) {
+        stretchWeight += key.weight;
+        nStretch++;
+      } else if (key.weight == DEFAULT_KEY_WEIGHT_X) {
+        availableWidth -= params.keyWidth;
+      } else {
+        availableWidth -=
+            Math.floor(key.weight/DEFAULT_KEY_WEIGHT_X * params.keyWidth);
+      }
     }
-    var availableWidth = width - (allKeys.length - 1) * pitch;
-    var pixelsPerWeight = width / weight;
+    if (stretchWeight <= 0)
+      console.error("Cannot stretch row without a stretchable key");
+    // Rounding error to distribute.
+    var pixelsPerWeight = availableWidth / stretchWeight;
     for (var i = 0; i < allKeys.length; i++) {
-      var key = allKeys[i]
-      var keyWidth = Math.floor(key.weight * pixelsPerWeight);
-      if (i == allKeys.length -1) {
-        keyWidth =  availableWidth;
+      var key = allKeys[i];
+      var keyWidth = params.keyWidth;
+      if (key.weight != DEFAULT_KEY_WEIGHT_X) {
+        keyWidth =
+            Math.floor(key.weight/DEFAULT_KEY_WEIGHT_X * params.keyWidth);
       }
-      updateKey(allKeys[i], keyWidth, keyHeight, xOffset, yOffset)
-      availableWidth -= keyWidth;
-      xOffset += keyWidth + pitch;
+      if (key.stretch) {
+        nStretch--;
+        if (nStretch > 0) {
+          keyWidth = Math.floor(key.weight * pixelsPerWeight);
+          availableWidth -= keyWidth;
+        } else {
+          keyWidth = availableWidth;
+        }
+      }
+      updateKey(key, keyWidth, keyHeight, xOffset, yOffset)
+      xOffset += keyWidth + params.pitchX;
     }
   }
 
   /**
    * Aligns a row such that the spacebar is perfectly aligned with the row above
    * it. A precondition is that all keys in this row can be stretched as needed.
    * @param {!kb-row} row The current row to be aligned.
    * @param {!kb-row} prevRow The row above the current row.
-   * @param {!AlignmentOptions} params The parameters used to align the keyset.
+   * @param {!AlignmentOptions} params Options for aligning the keyset.
    * @param {number} keyHeight The height of the keys in this row.
    * @param {number} heightOffset The height offset caused by the rows above.
    */
   function realignSpacebarRow(row, prevRow, params, keyHeight, heightOffset) {
     var allKeys = row.children;
     var stretchWeightBeforeSpace = 0;
     var stretchBefore = 0;
     var stretchWeightAfterSpace = 0;
     var stretchAfter = 0;
     var spaceIndex = -1;
@@ skipping 37 matching lines @@
 
     var rightKey =
         findClosestKey(prevRowKeys, spacePredictedRight, params.pitchX, false);
 
     var yOffset = params.offsetTop + heightOffset;
     // Fix left side.
     var leftEdge = parseFloat(leftKey.style.left);
     var leftWidth = leftEdge - params.offsetLeft - params.pitchX;
     var leftKeys = allKeys.array().slice(0, spaceIndex);
     redistribute(leftKeys,
-                 params.pitchX,
+                 params,
                  params.offsetLeft,
                  leftWidth,
                  keyHeight,
                  yOffset);
     // Fix right side.
     var rightEdge = parseFloat(rightKey.style.left) +
         parseFloat(rightKey.style.width);
     var spacebarWidth = rightEdge - leftEdge;
     updateKey(allKeys[spaceIndex],
               spacebarWidth,
               keyHeight,
               leftEdge,
               yOffset);
     var rightWidth =
         params.availableWidth - (rightEdge - params.offsetLeft + params.pitchX);
     var rightKeys = allKeys.array().slice(spaceIndex + 1);
     redistribute(rightKeys,
-                 params.pitchX,
+                 params,
                  rightEdge + params.pitchX,//xOffset.
                  rightWidth,
                  keyHeight,
                  yOffset);
   }
 
   /**
    * Realigns a given row based on the parameters provided.
    * @param {!kb-row} row The row to realign.
    * @param {!AlignmentOptions} params The parameters used to align the keyset.
@@ skipping 182 matching lines @@
   var importedContent = importHTML(content);
   expandHTML(importedContent);
   return importedContent;
 }
 
 // Prevents all default actions of touch. Keyboard should use its own gesture
 // recognizer.
 addEventListener('touchstart', function(e) { e.preventDefault() });
 addEventListener('touchend', function(e) { e.preventDefault() });
 addEventListener('touchmove', function(e) { e.preventDefault() });