Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions scripts/compose_operator_ux.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,15 @@
identity=height('.rail-cell.identity'),
route=height('.rail-cell.route'),
send=height('.rail-cell.send');
// Panels remain equal halves when upper racks are expanded. If all upper
// modules fold, the existing flex fader may use the deliberately freed bay.
// V60 one authoritative layout allocator, not an overriding stylesheet.
// Favor a taller physical fader by borrowing at most 48px of genuinely
// spare FX space. Retain at least 125px for insert controls, and never
// change the synchronized source/MASTER/rail mechanical alignment.
const half=Math.round(h/2);
const fader=Math.max(130,Math.round(half-pan-switches-footer));
const fx=Math.max(125,Math.round(half-identity-route-send));
const fxBase=Math.max(125,Math.round(half-identity-route-send));
const boost=Math.min(48,Math.max(0,fxBase-125));
const fader=Math.max(130,Math.round(half-pan-switches-footer+boost));
const fx=fxBase-boost;
const signature=fader+':'+fx;
if(signature===previous)return;
previous=signature;
Expand All @@ -59,7 +63,7 @@
"""

OPERATOR_CSS = """
/* V29 adaptive 50/50 console, authored for the same rail/strip/Master tokens.
/* V60 physical-fader-priority console, same rail/strip/Master tokens.
At very short heights preserve minimum usable controls and scroll vertically. */
.console-pane{overflow-y:auto!important;overflow-x:hidden!important}
.console-body{min-height:610px!important;
Expand Down
12 changes: 0 additions & 12 deletions site/preview-v2/assets/mixer-chrome-material.css
Original file line number Diff line number Diff line change
Expand Up @@ -1557,15 +1557,3 @@ html.armix-native-desktop .app .command-bar>.toolbar-label{
}
}

/* V60 operator fader reach — authoritative MECHANICAL CHROME height owner.
The original V28 declaration above remains intact for migration fixtures.
Source, BUS/FX, pinned MASTER and section rail all share --v13-fader-h;
this grows physical travel while the FX rack gives up only elastic space.
No cap bitmap, dB scale, bridge or WIRE geometry is changed here. */
.console-body{--v13-fader-h:clamp(198px,calc(100dvh - 538px),550px)}
@media(max-height:850px){
.console-body{--v13-fader-h:clamp(194px,calc(100dvh - 538px),390px)}
}
@media(max-height:610px){
.console-body{--v13-fader-h:clamp(155px,32dvh,210px)}
}
10 changes: 6 additions & 4 deletions tests/approved_operator_ux_chromium_fat.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ def wait_balanced(page):
if(!root||!pan||!footer)return false;
const r=root.getBoundingClientRect(),p=pan.getBoundingClientRect(),
f=footer.getBoundingClientRect();
return Math.abs((p.top-r.top)-(f.bottom-p.top))<=2;
const upper=p.top-r.top,lower=f.bottom-p.top;
return Number.isFinite(parseFloat(root.style.getPropertyValue('--v13-fader-h'))) &&
lower>=upper-2 && lower-upper<=100;
}""",timeout=4000)

def inspect_page(page, width, height, scale, label):
Expand Down Expand Up @@ -119,8 +121,8 @@ def inspect_page(page, width, height, scale, label):
assert abs(m['gap'])<=3,(width,height,m)
assert m['overflow']>=-3
assert m['upper']>0 and m['lower']>0
assert abs(m['upper']-m['lower'])<=2,(width,height,m)
# Expand all components and verify coherent 50:50 allocation.
assert -2<=m['lower']-m['upper']<=100,(width,height,"tactile fader budget",m)
# Expand all components and verify bounded physical-fader-first allocation.
for area in ('route','fx','send'):
if page.locator('.console-body').evaluate("(e,a)=>e.classList.contains('collapsed-'+a)",area):
page.locator(f'.section-rail [data-section="{area}"]').click()
Expand All @@ -130,7 +132,7 @@ def inspect_page(page, width, height, scale, label):
assert m['route']>=20 and m['fx']>=100 and m['wire']>=20,(width,height,m)
assert m['upper']>0 and m['lower']>0
assert abs(m['gap'])<=3,(width,height,m)
assert abs(m['upper']-m['lower'])<=2,(width,height,m)
assert -2<=m['lower']-m['upper']<=100,(width,height,"tactile fader budget",m)
# Fold the FX; sections/fader must preserve mechanical labels and avoid
# a second panel/overflow, even when all three upper parts are collapsed.
for area in ('fx','route','send'):
Expand Down
2 changes: 1 addition & 1 deletion tests/approved_operator_ux_smoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def test_single_composed_gui_stays_faithful_and_editable(self):
self.assertIn('id="densitySelect"',compiled) # stable legacy JS contract, hidden
self.assertIn('id="densitySelect" class="density-select" hidden',compiled)
self.assertEqual(compiled.count(CLOSE_ICON),6)
self.assertIn("V29 adaptive 50/50 console",chrome)
self.assertIn("V60 physical-fader-priority console",chrome)
self.assertIn("position:fixed;z-index:115;left:8px",chrome)
self.assertIn("max-height:calc(100dvh - 16px);overflow-y:auto",chrome)
self.assertEqual(compiled.count('id="channelIdentity"'),1)
Expand Down
9 changes: 6 additions & 3 deletions tests/pages_v60_fader_wire_tactile_smoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
HTML=(ROOT/"site/preview-v2/index.html").read_text("utf-8")
FADER=(ROOT/"site/preview-v2/assets/mixer-fader-assembly.css").read_text("utf-8")
CHROME=(ROOT/"site/preview-v2/assets/mixer-chrome-material.css").read_text("utf-8")
SPLIT=(ROOT/"scripts/compose_operator_ux.py").read_text("utf-8")
WIRE=(ROOT/"site/preview-v2/assets/mixer-wire-dots.css").read_text("utf-8")


Expand All @@ -27,9 +28,11 @@ def source_contract():
"line.style.setProperty('--wire-selected-hue'"):
assert text in HTML,("missing tactile contract",text)
assert "elapsed<1600" not in HTML
assert "--v13-fader-h:clamp(198px,calc(100dvh - 538px),550px)" in CHROME
assert "--v13-fader-h:clamp(155px,32dvh,210px)" in CHROME
assert "const boost=Math.min(48,Math.max(0,fxBase-125))" in SPLIT
assert "const fader=Math.max(130,Math.round(half-pan-switches-footer+boost))" in SPLIT
assert "const fx=fxBase-boost" in SPLIT
assert "--fader-fixed-h:clamp(" not in FADER
assert "--v13-fader-h:clamp(198px" not in CHROME
assert "stroke:transparent!important;" in WIRE
assert "stroke-width:5.6px!important;opacity:1!important;" in WIRE
assert "stroke-dasharray:none!important;" in WIRE
Expand Down Expand Up @@ -63,7 +66,7 @@ def exercise(page,width,height):
a,b,c=layout["fader"],layout["master"],layout["rail"]
assert all(x and x["h"]>0 for x in (a,b,c)),layout
assert abs(a["h"]-b["h"])<2 and abs(a["h"]-c["h"])<2,(width,layout)
min_height=350 if height>=1000 else (310 if height>=850 else 250)
min_height=370 if height>=1000 else (320 if height>=850 else 255)
assert a["h"]>=min_height,(width,"tall hardware fader lower bound",layout)
print("V60 geometry",width,height,"fader",a["h"],"CSS token",layout["token"],"flex",layout["flex"])
assert layout["travel"]["h"]>a["h"]-110,(width,layout)
Expand Down
8 changes: 4 additions & 4 deletions tests/preview_v2_v7_visual_smoke.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def audit_geometry(page, title):


def audit_v29_operator_collapse(page, label):
"""Real published V29: one comfort layout, frame-synchronized 50:50.
"""Real published V60: one comfort layout, bounded fader-priority split.

Keep all eight actual operator fold combinations, not the obsolete V7
fixed-viewport fader-height law. Legacy V7 geometry remains independently
Expand Down Expand Up @@ -169,12 +169,12 @@ def audit_v29_operator_collapse(page, label):
assert data["wireDeck"]!="none" and data["wireTray"]!="none",(
label,status,"WIRE dock unexpectedly hidden",data)
assert data["sendExpanded"]=="true",(label,status,"WIRE rail expand ARIA drift")
# For ALL expanded upper modules the native V29 50:50 split
# must be actual computed geometry, not a forced old pixel target.
# V60 genuinely lengthens the fader only from spare FX area;
# preserve bounded geometry even with every bay expanded.
if not any(target):
upper=rows["pan"]["strip"]["top"]-data["root"]["top"]
lower=rows["footer"]["strip"]["bottom"]-rows["pan"]["strip"]["top"]
assert abs(upper-lower)<=3,(label,"V29 halves must be equal",upper,lower,data)
assert -3<=lower-upper<=100,(label,"V60 tactile fader priority must be bounded",upper,lower,data)
assert page.locator('#tracks .strip[data-id="5"] .wire-node-out').get_attribute("data-wire-main-edge")==initial_edge,(
label,status,"fold changed accepted MAIN EdgeId")
finally:
Expand Down
Loading