Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 07:19:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make picklist label display "CUSTOM" when slider value is changed

Browse source
This commit is contained in:
David Rowe 2017-08-16 21:11:10 +12:00
parent 30e9b8ea45
commit f9de451b30
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scripts/vr-edit/modules/toolMenu.js
View file

@ -990,7 +990,7 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
optionsSettings[optionsItems[i].id].value = value; optionsSettings[optionsItems[i].id].value = value;
} }
if (optionsItems[i].type === "picklist") { if (optionsItems[i].type === "picklist") {
// Value is picklist label. optionsSettings[optionsItems[i].id].value = value;
optionsItems[i].label = value; optionsItems[i].label = value;
} }
if (optionsItems[i].setting.callback) { if (optionsItems[i].setting.callback) {
@ -1094,6 +1094,17 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
closeOptions(); closeOptions();
} }
function setPresetsLabelToCustom() {
var CUSTOM = "CUSTOM";
if (optionsSettings.presets.value !== CUSTOM) {
optionsSettings.presets.value = CUSTOM;
Overlays.editOverlay(optionsOverlaysLabels[optionsOverlaysIDs.indexOf("presets")], {
text: CUSTOM
});
Settings.setValue(optionsSettings.presets.key, CUSTOM);
}
}
function evaluateParameter(parameter) { function evaluateParameter(parameter) {
var parameters, var parameters,
overlayID, overlayID,
@ -1223,8 +1234,8 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
doCommand("togglePhysicsPresets", "presets"); doCommand("togglePhysicsPresets", "presets");
// Update picklist label. // Update picklist label.
index = optionsOverlaysIDs.indexOf(parameter); label = optionsItems[optionsOverlaysIDs.indexOf(parameter)].label;
label = optionsItems[index].label; optionsSettings.presets.value = label;
Overlays.editOverlay(optionsOverlaysLabels[optionsOverlaysIDs.indexOf("presets")], { Overlays.editOverlay(optionsOverlaysLabels[optionsOverlaysIDs.indexOf("presets")], {
text: label text: label
}); });
@ -1235,18 +1246,22 @@ ToolMenu = function (side, leftInputs, rightInputs, uiCommandCallback) {
break; break;
case "setGravity": case "setGravity":
setPresetsLabelToCustom();
Settings.setValue(optionsSettings.gravitySlider.key, parameter); Settings.setValue(optionsSettings.gravitySlider.key, parameter);
uiCommandCallback("setGravity", parameter); uiCommandCallback("setGravity", parameter);
break; break;
case "setBounce": case "setBounce":
setPresetsLabelToCustom();
Settings.setValue(optionsSettings.bounceSlider.key, parameter); Settings.setValue(optionsSettings.bounceSlider.key, parameter);
uiCommandCallback("setBounce", parameter); uiCommandCallback("setBounce", parameter);
break; break;
case "setDamping": case "setDamping":
setPresetsLabelToCustom();
Settings.setValue(optionsSettings.dampingSlider.key, parameter); Settings.setValue(optionsSettings.dampingSlider.key, parameter);
uiCommandCallback("setDamping", parameter); uiCommandCallback("setDamping", parameter);
break; break;
case "setDensity": case "setDensity":
setPresetsLabelToCustom();
Settings.setValue(optionsSettings.densitySlider.key, parameter); Settings.setValue(optionsSettings.densitySlider.key, parameter);
uiCommandCallback("setDensity", parameter); uiCommandCallback("setDensity", parameter);
break; break;