lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert hiding UI elements.

Browse Source
This commit is contained in:
Blaz Kristan 2021-12-03 21:17:59 +01:00
parent 5c7e3c6bab
commit 44f9bc5f0e
2 changed files with 864 additions and 876 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wled00/data/index.js
View File

@ -1106,8 +1106,7 @@ function updateSelectedFx()
if (selectedEffect) { if (selectedEffect) {
selectedEffect.classList.add('selected'); selectedEffect.classList.add('selected');
// WLEDSR: extract the Slider and color control string from the HTML element and set it. // WLEDSR: extract the Slider and color control string from the HTML element and set it.
//sliderControl = selectedEffect.dataset.opt.replace(/&/g, "&"); setSliderAndColorControl(selectedFx);
setSliderAndColorControl(selectedFx /*, sliderControl*/);
} }
} }
@ -1197,23 +1196,14 @@ function readState(s,command=false)
for (let e = cd.length-1; e >= 0; e--) for (let e = cd.length-1; e >= 0; e--)
{ {
var r,g,b,w; var r,g,b,w;
//if (Array.isArray(i.col[e])) {
r = i.col[e][0]; r = i.col[e][0];
g = i.col[e][1]; g = i.col[e][1];
b = i.col[e][2]; b = i.col[e][2];
if (isRgbw) w = i.col[e][3]; if (isRgbw) w = i.col[e][3];
//} else {
// // unsigned long RGBW (@blazoncek v2 experimental API implementation, obsolete & will be removed)
// r = (i.col[e]>>16) & 0xFF;
// g = (i.col[e]>> 8) & 0xFF;
// b = (i.col[e] ) & 0xFF;
// if (isRgbw) w = (i.col[e] >> 24) & 0xFF;
//}
cd[e].style.backgroundColor = "rgb(" + r + "," + g + "," + b + ")"; cd[e].style.backgroundColor = "rgb(" + r + "," + g + "," + b + ")";
if (isRgbw) whites[e] = parseInt(w); if (isRgbw) whites[e] = parseInt(w);
} }
selectSlot(csel); selectSlot(csel);
//gId('sliderW').value = whites[csel];
if (i.cct && i.cct>=0) gId("sliderA").value = i.cct; if (i.cct && i.cct>=0) gId("sliderA").value = i.cct;
gId('sliderSpeed').value = i.sx; gId('sliderSpeed').value = i.sx;
@ -1332,6 +1322,8 @@ function setSliderAndColorControl(idx/*, extra*/)
btn.style.display = "none"; btn.style.display = "none";
} }
} }
/*
// perhaps too aggressive
var ccfg = cfg.comp.colors; var ccfg = cfg.comp.colors;
gId("picker").style.display = hide && ccfg.picker ? "none" : "block"; gId("picker").style.display = hide && ccfg.picker ? "none" : "block";
gId("vwrap").style.display = hide && ccfg.picker ? "none" : "block"; gId("vwrap").style.display = hide && ccfg.picker ? "none" : "block";
@ -1340,6 +1332,7 @@ function setSliderAndColorControl(idx/*, extra*/)
gId("wbal").style.display = hide && !cct ? "none" : "block"; gId("wbal").style.display = hide && !cct ? "none" : "block";
gId("rgbwrap").style.display = hide && ccfg.rgb ? "none" : "block"; gId("rgbwrap").style.display = hide && ccfg.rgb ? "none" : "block";
gId("qcs-w").style.display = hide && ccfg.quick ? "none" : "block"; gId("qcs-w").style.display = hide && ccfg.quick ? "none" : "block";
*/
gId("cslLabel").innerHTML = cslLabel; gId("cslLabel").innerHTML = cslLabel;
// set palette on/off // set palette on/off

1717
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff