Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1617)

Unified Diff: third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js

Issue 1013263002: Update Google Input Tools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js
diff --git a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js
index aa0af28e90d3a91e3f85c0a98bae766fc57f37b8..2856f4f6bc4a08d84e19bc4488d52bd231af3886 100644
--- a/third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js
+++ b/third_party/google_input_tools/src/chrome/os/inputview/elements/content/altdataview.js
@@ -17,10 +17,9 @@ goog.require('goog.array');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.dom.classlist');
-goog.require('goog.math.Box');
goog.require('goog.math.Coordinate');
+goog.require('goog.object');
goog.require('goog.style');
-goog.require('i18n.input.chrome.inputview.Accents');
goog.require('i18n.input.chrome.inputview.Css');
goog.require('i18n.input.chrome.inputview.content.constants');
goog.require('i18n.input.chrome.inputview.elements.Element');
@@ -49,6 +48,7 @@ function convertToScreenCoordinate(coordinate) {
};
+
/**
* The view for alt data.
*
@@ -203,11 +203,12 @@ AltDataView.prototype.show = function(key, isRTL) {
var height = key.availableHeight;
var characters;
var fixedColumns = 0;
+ var isCompact = key.type == ElementType.COMPACT_KEY;
if (key.type == ElementType.CHARACTER_KEY) {
key = /** @type {!i18n.input.chrome.inputview.elements.content.
CharacterKey} */ (key);
characters = key.getAltCharacters();
- } else if (key.type == ElementType.COMPACT_KEY) {
+ } else if (isCompact) {
key = /** @type {!i18n.input.chrome.inputview.elements.content.
CompactKey} */ (key);
characters = key.getMoreCharacters();
@@ -229,6 +230,8 @@ AltDataView.prototype.show = function(key, isRTL) {
goog.style.setElementShown(this.getElement(), true);
this.getDomHelper().removeChildren(this.getElement());
+ var w = isCompact ? Math.round(width * 0.8) : Math.round(width * 0.9);
+ var h = isCompact ? Math.round(height * 0.8) : Math.round(height * 0.9);
this.useIMEWindow_ = !!(chrome.app.window && chrome.app.window.create);
if (this.useIMEWindow_) {
if (this.altdataWindow_) {
@@ -243,11 +246,11 @@ AltDataView.prototype.show = function(key, isRTL) {
var startKeyIndex = this.getStartKeyIndex_(parentKeyLeftTop.x, numOfColumns,
width, screen.width);
- var altDataWindowWidth = numOfColumns * width;
- var altDataWindowHeight = numOfRows * height;
+ var altDataWindowWidth = numOfColumns * w;
+ var altDataWindowHeight = numOfRows * h;
var windowTop = parentKeyLeftTop.y - altDataWindowHeight -
AltDataView.PADDING_;
- var windowLeft = parentKeyLeftTop.x - startKeyIndex * width;
+ var windowLeft = parentKeyLeftTop.x - startKeyIndex * w;
var screenCoordinate = convertToScreenCoordinate(
new goog.math.Coordinate(windowLeft, windowTop));
var windowBounds = goog.object.create('left', screenCoordinate.x,
@@ -263,10 +266,10 @@ AltDataView.prototype.show = function(key, isRTL) {
var contentWindow = self.altdataWindow_.contentWindow;
contentWindow.addEventListener('load', function() {
contentWindow.accents.setAccents(characters, numOfColumns,
- numOfRows, width, height, startKeyIndex);
+ numOfRows, w, h, startKeyIndex);
self.highlightItem(
- Math.ceil(parentKeyLeftTop.x + width / 2),
- Math.ceil(parentKeyLeftTop.y + height / 2));
+ Math.ceil(parentKeyLeftTop.x + w / 2),
+ Math.ceil(parentKeyLeftTop.y + h / 2));
var marginBox = goog.style.getMarginBox(
contentWindow.document.body);
// Adjust the window bounds to compensate body's margin. The margin
@@ -283,33 +286,33 @@ AltDataView.prototype.show = function(key, isRTL) {
} else {
// The total width of the characters + the separators, every separator has
// width = 1.
- var altDataWindowWidth = width * characters.length;
- var altDataWindowHeight = height;
+ var altDataWindowWidth = w * characters.length;
+ var altDataWindowHeight = h;
var left = parentKeyLeftTop.x;
if ((left + altDataWindowWidth) > screen.width) {
// If no enough space at the right, then make it to the left.
- left = parentKeyLeftTop.x + width - altDataWindowWidth;
+ left = parentKeyLeftTop.x + w - altDataWindowWidth;
characters.reverse();
}
var elemTop = parentKeyLeftTop.y - altDataWindowHeight -
AltDataView.PADDING_;
if (elemTop < 0) {
// If no enough top space, then display below the key.
- elemTop = parentKeyLeftTop.y + height + AltDataView.PADDING_;
+ elemTop = parentKeyLeftTop.y + h + AltDataView.PADDING_;
}
for (var i = 0; i < characters.length; i++) {
var keyElem = this.addKey_(characters[i], isRTL);
- goog.style.setSize(keyElem, width, height);
+ goog.style.setSize(keyElem, w, h);
this.altdataElements_.push(keyElem);
if (i != characters.length - 1) {
this.addSeparator_(height);
}
}
goog.style.setPosition(this.getElement(), left, elemTop);
- this.highlightItem(Math.ceil(parentKeyLeftTop.x + width / 2),
- Math.ceil(parentKeyLeftTop.y + height / 2));
+ this.highlightItem(Math.ceil(parentKeyLeftTop.x + w / 2),
+ Math.ceil(parentKeyLeftTop.y + h / 2));
}
goog.style.setElementShown(this.coverElement_, true);

Powered by Google App Engine
This is Rietveld 408576698