diff --git a/wled00/data/index.css b/wled00/data/index.css index bb39df5ae..f23de7f79 100644 --- a/wled00/data/index.css +++ b/wled00/data/index.css @@ -234,11 +234,11 @@ button { } #liveview2D { - height: 320px; + height: 90%; display: none; - width: 100%; + width: 90%; border: 0px; - margin: auto; + margin: 0 auto; } .tab { diff --git a/wled00/data/index.htm b/wled00/data/index.htm index 1231a8f1c..8b7aacc2c 100644 --- a/wled00/data/index.htm +++ b/wled00/data/index.htm @@ -64,7 +64,7 @@ - + @@ -330,7 +330,7 @@
Peek
- } - else - { - gId('buttonSr').lastChild.innerHTML = "Peek"; //lastchild isPeek
- } - - gId(lvID).style.display = (isLv) ? "block":"none"; - var url = (loc?`http://${locip}`:'') + "/" + lvID; - gId(lvID).src = (isLv) ? url:"about:blank"; + gId('liveview').style.display = (isLv) ? "block":"none"; + var url = (loc?`http://${locip}`:'') + "/liveview"; + gId('liveview').src = (isLv) ? url:"about:blank"; gId('buttonSr').className = (isLv) ? "active":""; if (!isLv && ws && ws.readyState === WebSocket.OPEN) ws.send('{"lv":false}'); size(); } +function toggleLiveview2D() +{ + if (isInfo) toggleInfo(); + if (isNodes) toggleNodes(); + if (isLv) toggleLiveview(); + + isLv2D = !isLv2D; + + if (isLv2D) { + var cn = ''; + d.getElementById('kliveview2D').innerHTML = cn; + } + + gId('mliveview2D').style.transform = (isLv2D) ? "translateY(0px)":"translateY(100%)"; + + gId("liveview2D").style.display = (isLv2D) ? "block":"none"; + var url = (loc?`http://${locip}`:'') + "/liveview2D"; + gId("liveview2D").src = (isLv2D) ? url:"about:blank"; + gId('buttonSr').className = (isLv2D) ? "active":""; + if (!isLv2D && ws && ws.readyState === WebSocket.OPEN) ws.send('{"lv":false}'); + size(); +} + function toggleInfo() { if (isNodes) toggleNodes(); - if (isLv) toggleLiveview(); + if (isLv2D) toggleLiveview2D(); isInfo = !isInfo; if (isInfo) requestJson(); gId('info').style.transform = (isInfo) ? "translateY(0px)":"translateY(100%)"; @@ -1568,7 +1573,7 @@ function toggleInfo() function toggleNodes() { if (isInfo) toggleInfo(); - if (isLv) toggleLiveview(); + if (isLv2D) toggleLiveview2D(); isNodes = !isNodes; if (isNodes) loadNodes(); gId('nodes').style.transform = (isNodes) ? "translateY(0px)":"translateY(100%)"; diff --git a/wled00/data/liveviewws2D.htm b/wled00/data/liveviewws2D.htm index c12b30206..d363b05c2 100644 --- a/wled00/data/liveviewws2D.htm +++ b/wled00/data/liveviewws2D.htm @@ -9,23 +9,16 @@ body { margin: 0; } - #canv1, #canv2 { - background: black; - filter: brightness(175%); - width: 100%; - height: 100%; - position: absolute; - } -