safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1170: Use separately-declared key widths.

Browse Source
This commit is contained in:
Michael Jumper
2015-04-28 18:36:54 -07:00
parent 6f99e3f1ab
commit 2a1eb4dd70
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
guacamole-common-js/src/main/webapp/modules/OnScreenKeyboard.js
View File

@@ -307,7 +307,7 @@ Guacamole.OnScreenKeyboard = function(layout) {
* *
* @type Guacamole.OnScreenKeyboard.Layout * @type Guacamole.OnScreenKeyboard.Layout
*/ */
this.layout = layout; this.layout = new Guacamole.OnScreenKeyboard.Layout(layout);
/** /**
* Returns the element containing the entire on-screen keyboard. * Returns the element containing the entire on-screen keyboard.
@@ -569,7 +569,7 @@ Guacamole.OnScreenKeyboard = function(layout) {
// Add key to DOM, maintain scale // Add key to DOM, maintain scale
div.appendChild(keyElement); div.appendChild(keyElement);
scaledElements.push(new ScaledElement(div, 1 /* TODO: Pull from layout */, 1, true)); scaledElements.push(new ScaledElement(div, osk.layout.keyWidth[object] || 1, 1, true));
} // end if object is key name } // end if object is key name
@@ -642,6 +642,16 @@ Guacamole.OnScreenKeyboard.Layout = function(template) {
*/ */
this.width = template.width; this.width = template.width;
/**
* The width of each key, in arbitrary units, relative to other keys in
* this layout. The true pixel size of each key will be determined by the
* overall size of the keyboard. If not defined here, the width of each
* key will default to 1.
*
* @type Object.<String, Number>
*/
this.keyWidth = template.keyWidth || {};
}; };
/** /**
@@ -727,13 +737,4 @@ Guacamole.OnScreenKeyboard.Key = function(template, name) {
*/ */
this.requires = template.requires || []; this.requires = template.requires || [];
/**
* The width of this key, in arbitrary units, relative to other keys in the
* same layout. The true pixel size of this key will be determined by the
* overall size of the keyboard. By default, this will be 1.
*
* @type Number
*/
this.width = template.width || 1;
}; };