Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 03:40:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move widget parameters into propeties

Browse source
This commit is contained in:
David Rowe 2015-04-07 09:27:53 -07:00
parent 187ca2a403
commit a844b73fcc
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
examples/users.js
View file

@ -9,8 +9,9 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
var PopUpMenu = function (prompt, value, values, properties) { var PopUpMenu = function (properties) {
var promptOverlay, var value = properties.value,
promptOverlay,
valueOverlay, valueOverlay,
buttonOverlay, buttonOverlay,
optionOverlays = [], optionOverlays = [],
@ -27,9 +28,9 @@ var PopUpMenu = function (prompt, value, values, properties) {
var y, var y,
i; i;
y = properties.y - (values.length - 1) * properties.lineHeight; y = properties.y - (properties.values.length - 1) * properties.lineHeight;
for (i = 0; i < values.length; i += 1) { for (i = 0; i < properties.values.length; i += 1) {
Overlays.editOverlay(optionOverlays[i], { y: y }); Overlays.editOverlay(optionOverlays[i], { y: y });
y += properties.lineHeight; y += properties.lineHeight;
} }
@ -39,7 +40,7 @@ var PopUpMenu = function (prompt, value, values, properties) {
var i, var i,
yOffScreen = Controller.getViewportDimensions().y; yOffScreen = Controller.getViewportDimensions().y;
for (i = 0; i < values.length; i += 1) { for (i = 0; i < properties.values.length; i += 1) {
optionOverlays[i] = Overlays.addOverlay("text", { optionOverlays[i] = Overlays.addOverlay("text", {
x: properties.x + properties.promptWidth, x: properties.x + properties.promptWidth,
y: yOffScreen, y: yOffScreen,
@ -51,7 +52,7 @@ var PopUpMenu = function (prompt, value, values, properties) {
alpha: properties.optionAlpha, alpha: properties.optionAlpha,
backgroundColor: properties.popupBackgroundColor, backgroundColor: properties.popupBackgroundColor,
backgroundAlpha: properties.popupBackgroundAlpha, backgroundAlpha: properties.popupBackgroundAlpha,
text: values[i], text: properties.values[i],
font: properties.font, font: properties.font,
visible: true visible: true
}); });
@ -84,7 +85,7 @@ var PopUpMenu = function (prompt, value, values, properties) {
if (isDisplayingOptions) { if (isDisplayingOptions) {
for (i = 0; i < optionOverlays.length; i += 1) { for (i = 0; i < optionOverlays.length; i += 1) {
if (overlay === optionOverlays[i]) { if (overlay === optionOverlays[i]) {
value = values[i]; value = properties.values[i];
Overlays.editOverlay(valueOverlay, { text: value }); Overlays.editOverlay(valueOverlay, { text: value });
clicked = true; clicked = true;
} }
@ -138,7 +139,7 @@ var PopUpMenu = function (prompt, value, values, properties) {
alpha: properties.promptAlpha, alpha: properties.promptAlpha,
backgroundColor: properties.promptBackgroundColor, backgroundColor: properties.promptBackgroundColor,
backgroundAlpha: properties.promptBackgroundAlpha, backgroundAlpha: properties.promptBackgroundAlpha,
text: prompt, text: properties.prompt,
font: properties.font, font: properties.font,
visible: properties.visible visible: properties.visible
}); });
@ -814,7 +815,10 @@ var usersWindow = (function () {
alpha: FRIENDS_BUTTON_ALPHA alpha: FRIENDS_BUTTON_ALPHA
}); });
displayControl = new PopUpMenu(DISPLAY_PROMPT, DISPLAY_VALUES[0], DISPLAY_VALUES, { displayControl = new PopUpMenu({
prompt: DISPLAY_PROMPT,
value: DISPLAY_VALUES[0],
values: DISPLAY_VALUES,
x: WINDOW_MARGIN, x: WINDOW_MARGIN,
y: viewportHeight, y: viewportHeight,
width: WINDOW_WIDTH - 1.5 * WINDOW_MARGIN, width: WINDOW_WIDTH - 1.5 * WINDOW_MARGIN,