[feat](trx-frontend-http): frequency-ordered z-index and hover-to-front for RDS overlay layers

Each RDS PS overlay item (position: absolute within the shared #rds-ps-overlay
container) now receives a z-index derived from its channel frequency: items are
sorted by freq_hz ascending so higher-frequency layers sit on top of
lower-frequency ones by default.

Hovering any layer temporarily assigns it the maximum z-index (entry count + 10)
to bring it to the front; mouseleave restores the frequency-derived default
stored in data-default-z.

Also reverts the incorrectly applied vchan picker layer changes from the
previous commit.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Signed-off-by: Stan Grams <sjg@haxx.space>
This commit is contained in:
2026-03-12 20:12:23 +01:00
parent 1fe7dc88c6
commit add0a93424
4 changed files with 13 additions and 84 deletions
@@ -1364,6 +1364,12 @@ function renderRdsOverlays() {
evt.stopPropagation(); evt.stopPropagation();
copyRdsPsToClipboard(entry.rds, entry.freq_hz); copyRdsPsToClipboard(entry.rds, entry.freq_hz);
}); });
el.addEventListener("mouseenter", () => {
el.style.zIndex = String(entries.length + 10);
});
el.addEventListener("mouseleave", () => {
if (el.dataset.defaultZ) el.style.zIndex = el.dataset.defaultZ;
});
rdsPsOverlay.appendChild(el); rdsPsOverlay.appendChild(el);
rdsOverlayEntries.push({ ...entry, el, stackIdx: idx }); rdsOverlayEntries.push({ ...entry, el, stackIdx: idx });
}); });
@@ -1386,6 +1392,10 @@ function positionRdsOverlays() {
const count = rdsOverlayEntries.length; const count = rdsOverlayEntries.length;
const mid = (count - 1) / 2; const mid = (count - 1) / 2;
const stackStepPx = 26; const stackStepPx = 26;
// Assign z-indices: sort by frequency ascending so higher-frequency layers
// sit on top of lower-frequency ones in the default (non-hover) state.
const sortedByFreq = [...rdsOverlayEntries].sort((a, b) => a.freq_hz - b.freq_hz);
const freqZMap = new Map(sortedByFreq.map((e, i) => [e.id, i + 1]));
rdsOverlayEntries.forEach((entry, idx) => { rdsOverlayEntries.forEach((entry, idx) => {
const el = entry.el; const el = entry.el;
if (!el) return; if (!el) return;
@@ -1399,6 +1409,9 @@ function positionRdsOverlays() {
const offsetPx = Math.round((idx - mid) * stackStepPx); const offsetPx = Math.round((idx - mid) * stackStepPx);
el.style.left = `${clamped * width}px`; el.style.left = `${clamped * width}px`;
el.style.top = `calc(50% + ${offsetPx}px)`; el.style.top = `calc(50% + ${offsetPx}px)`;
const z = String(freqZMap.get(entry.id) ?? (idx + 1));
el.style.zIndex = z;
el.dataset.defaultZ = z;
}); });
} }
@@ -262,7 +262,6 @@
<div class="full-row label-below-row" id="vchan-row" style="display:none;"> <div class="full-row label-below-row" id="vchan-row" style="display:none;">
<div class="label"><span>Channels</span></div> <div class="label"><span>Channels</span></div>
<div class="vchan-picker" id="vchan-picker"></div> <div class="vchan-picker" id="vchan-picker"></div>
<div class="vchan-freq-layers" id="vchan-freq-layers"></div>
</div> </div>
<div class="full-row label-below-row"> <div class="full-row label-below-row">
<div class="label"><span>Signal</span></div> <div class="label"><span>Signal</span></div>
@@ -49,50 +49,6 @@ function vchanHandleChannels(data) {
} }
} }
function vchanRenderLayers() {
const container = document.getElementById("vchan-freq-layers");
if (!container) return;
container.innerHTML = "";
if (vchanChannels.length === 0) {
container.style.height = "0";
return;
}
// Sort by frequency ascending so higher-frequency channels get higher z-index.
const sorted = [...vchanChannels].sort((a, b) => a.freq_hz - b.freq_hz);
const LAYER_H_PX = 32;
const STEP_PX = 11; // vertical offset between layers so each peeks below the next
const totalH = LAYER_H_PX + (sorted.length - 1) * STEP_PX;
container.style.height = totalH + "px";
sorted.forEach((ch, i) => {
const layer = document.createElement("div");
layer.className = "vchan-freq-layer";
if (ch.id === vchanActiveId) layer.classList.add("active");
layer.style.top = (i * STEP_PX) + "px";
// Higher frequency → higher index → higher z-index (sits on top by default).
const defaultZ = i + 1;
layer.style.zIndex = defaultZ;
layer.textContent = `${ch.index}: ${vchanFmtFreq(ch.freq_hz)} ${ch.mode}`;
layer.title = `Ch ${ch.index}: ${vchanFmtFreq(ch.freq_hz)} ${ch.mode} · ${ch.subscribers} subscriber${ch.subscribers !== 1 ? "s" : ""}`;
// Bring hovered layer to the front; restore on leave.
const maxZ = sorted.length + 10;
layer.addEventListener("mouseenter", () => { layer.style.zIndex = maxZ; });
layer.addEventListener("mouseleave", () => { layer.style.zIndex = defaultZ; });
layer.addEventListener("click", () => {
if (ch.id !== vchanActiveId) vchanSubscribe(ch.id);
});
container.appendChild(layer);
});
}
function vchanRender() { function vchanRender() {
const picker = document.getElementById("vchan-picker"); const picker = document.getElementById("vchan-picker");
if (!picker) return; if (!picker) return;
@@ -137,7 +93,6 @@ function vchanRender() {
addBtn.addEventListener("click", vchanAllocate); addBtn.addEventListener("click", vchanAllocate);
picker.appendChild(addBtn); picker.appendChild(addBtn);
vchanRenderLayers();
vchanSyncAccentUI(); vchanSyncAccentUI();
} }
@@ -392,44 +392,6 @@ input.status-input, select.status-input { width: 100%; padding: 0.45rem 0.5rem;
border-color: var(--vchan-color); border-color: var(--vchan-color);
box-shadow: inset 3px 0 0 var(--vchan-color); box-shadow: inset 3px 0 0 var(--vchan-color);
} }
/* Frequency layers: absolutely-positioned channel strips stacked by frequency */
.vchan-freq-layers {
position: relative;
margin-top: 0.5rem;
/* height is set dynamically by vchanRenderLayers() */
}
.vchan-freq-layer {
position: absolute;
left: 0;
right: 0;
height: 2rem;
display: flex;
align-items: center;
padding: 0 0.6rem;
border-radius: 6px;
background: var(--input-bg);
border: 1px solid var(--border-light);
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-size: 0.82rem;
color: var(--text-muted);
cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
transition: border-color 0.12s, box-shadow 0.12s;
}
.vchan-freq-layer:hover {
border-color: var(--vchan-color);
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.35);
color: var(--text);
}
.vchan-freq-layer.active {
background: var(--btn-bg);
color: var(--text);
font-weight: 600;
border-color: var(--vchan-color);
box-shadow: inset 3px 0 0 var(--vchan-color);
}
/* Applied to #freq and #spectrum-bw-input when on a virtual channel */ /* Applied to #freq and #spectrum-bw-input when on a virtual channel */
.vchan-ch-active { .vchan-ch-active {
border-color: var(--vchan-color) !important; border-color: var(--vchan-color) !important;