Skip to content

GitLab

T
tangled
Commit f2c2c7fb authored by rsadam@chromium.org's avatar rsadam@chromium.org
Browse files
Options

Fixes alignment of spacebar row. 


BUG=342796

Review URL: https://codereview.chromium.org/163473003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251167 0039d316-1c4b-4281-b951-d872f2087c98
parent bc24d80a
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 24 deletions
ui/keyboard/resources/layouts/qwerty.html
View file @ f2c2c7fb
......@@ -26,7 +26,7 @@
<kb-key class="dark" toKeyset="down:symbol" char="Invalid"
align="left" weight="105">?123</kb-key>
<kb-key class="dark">_</kb-key>
<kb-key class="dark">/</kb-key>
<kb-key class="dark" stretch>/</kb-key>
<kb-key char=" " class="space" weight="540"></kb-key>
<kb-key class="dark">,</kb-key>
<kb-key class="dark">.</kb-key>
......@@ -57,7 +57,7 @@
<kb-key class="dark" toKeyset="down:symbol" char="Invalid"
align="left" weight="105">?123</kb-key>
<kb-key class="dark">_</kb-key>
<kb-key class="dark">/</kb-key>
<kb-key class="dark" stretch>/</kb-key>
<kb-key char=" " class="space" weight="540"></kb-key>
<kb-key class="dark">,</kb-key>
<kb-key class="dark">.</kb-key>
......@@ -88,7 +88,7 @@
<kb-row>
<kb-abc-key align="left" weight="105">ABC</kb-abc-key>
<kb-key class="dark">_</kb-key>
<kb-key class="dark">/</kb-key>
<kb-key class="dark" stretch>/</kb-key>
<kb-key char=" " class="space" weight="540"></kb-key>
<kb-key class="dark">,</kb-key>
<kb-key class="dark">.</kb-key>
......@@ -125,11 +125,11 @@
<kb-row>
<kb-abc-key align="left" weight="105">ABC</kb-abc-key>
<kb-key class="dark">&lt;</kb-key>
<kb-key class="dark">&gt;</kb-key>
<kb-key class="dark" stretch>&gt;</kb-key>
<kb-key char=" " class="space" weight="540"></kb-key>
<kb-key class="dark">,</kb-key>
<kb-key class="dark">.</kb-key>
<kb-hide-keyboard-key weight="105">hide</kb-hide-keyboard-key>
<kb-hide-keyboard-key stretch weight="105">hide</kb-hide-keyboard-key>
</kb-row>
</kb-keyset>
</template>
ui/keyboard/resources/layouts/system-qwerty.html
View file @ f2c2c7fb
......@@ -38,7 +38,7 @@
<kb-shift-key stretch weight="135" align="right">shift</kb-shift-key>
</kb-row>
<kb-row>
<kb-modifier-key class="dark" weight="150" char="Ctrl"
<kb-modifier-key class="dark" stretch weight="150" char="Ctrl"
align="left">ctrl</kb-modifier-key>
<kb-modifier-key class="dark" stretch weight="150" char="Alt"
align="left">alt</kb-modifier-key>
......@@ -85,7 +85,7 @@
<kb-shift-key stretch weight="135" align="right">shift</kb-shift-key>
</kb-row>
<kb-row>
<kb-modifier-key class="symbol dark" weight="150" char="Ctrl"
<kb-modifier-key class="symbol dark" stretch weight="150" char="Ctrl"
align="left">ctrl</kb-modifier-key>
<kb-modifier-key class="symbol dark" stretch weight="150" char="Alt"
align="left">alt</kb-modifier-key>
......@@ -98,7 +98,7 @@
weight="75"> </kb-key>
<kb-key class="dark" repeat char="Arrow-Right" image="right"
weight="75"></kb-key>
<kb-hide-keyboard-key stretch image="keyboard"></kb-hide-keyboard-key>
<kb-hide-keyboard-key image="keyboard" stretch></kb-hide-keyboard-key>
</kb-row>
<kb-altkey-container hidden>
</kb-altkey-container>
......
ui/keyboard/resources/main.js
View file @ f2c2c7fb
......@@ -294,29 +294,50 @@
/**
* 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;
}
}
......@@ -325,7 +346,7 @@
* 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.
*/
......@@ -383,7 +404,7 @@
var leftWidth = leftEdge - params.offsetLeft - params.pitchX;
var leftKeys = allKeys.array().slice(0, spaceIndex);
redistribute(leftKeys,
params.pitchX,
params,
params.offsetLeft,
leftWidth,
keyHeight,
......@@ -401,7 +422,7 @@
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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment