Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7f1923f
feat(desktop): custom JUCE SVG caption, ArSonMiX brand and event-driv…
masarray Nov 9, 2026
9bf3ecf
test(desktop): exercise coalesced WIRE resize/restore logic in fast n…
masarray Nov 9, 2026
e395704
test(desktop): align mock bank commit on structural resize
masarray Nov 9, 2026
33f6e2d
fix(desktop): keep GUI assembler anchor and mock-safe native bridge m…
masarray Nov 9, 2026
c5d7188
test(ui): preserve frozen V28 CSS fixture while replaying additive de…
masarray Nov 9, 2026
519ba23
fix(test): decode legacy newline escapes when reconstructing V28 chec…
masarray Nov 9, 2026
520b25d
fix(wire): invalidate MAIN fragments and stale animation on native re…
masarray Nov 9, 2026
53e1ac0
test(ui): replay MAIN wire fragment cache edits in immutable V28 CSS …
masarray Nov 9, 2026
af20b5c
fix(desktop): cancel orphaned WIRE pointer capture at resize; verify …
masarray Nov 9, 2026
adb73a9
test(wire): accept both spring animation and settled cubic while veri…
masarray Nov 9, 2026
fbc4bff
test(wire): assert actual bank-capacity transition instead of fixed v…
masarray Nov 9, 2026
80d5157
style(desktop): compact JUCE window controls and group spacious nativ…
masarray Nov 9, 2026
f631afc
test(css): isolate native toolbar V2 from immutable historical V28 pa…
masarray Nov 9, 2026
184f3a0
merge: reconcile native caption/WIRE with main Player M3 key-tempo wi…
masarray Nov 9, 2026
a178135
fix(desktop): seamless ArSonMiX caption and operator-only audio statu…
masarray Nov 9, 2026
d2405d5
test(native): keep measured audio evidence internal while asserting c…
masarray Nov 9, 2026
043064b
fix(win): use JUCE 8 GlyphArrangement and qualified copyright codepoint
masarray Nov 9, 2026
be70f45
fix(ui): prevent raw device/error codes and diagnostics leaking to op…
masarray Nov 9, 2026
af1589d
fix(ui): show audio connection loss as user guidance, never remap or …
masarray Nov 9, 2026
10db1c9
test(ui): report exact native footer copy on Chromium instead of opaq…
masarray Nov 9, 2026
6493906
fix(desktop): hide internal QA/FAT from every footer lane and polish …
masarray Nov 9, 2026
31de872
test(ui): verify all three native footer fields hide internal QA and …
masarray Nov 9, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/p1-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
node scripts/check_console_puzzle.mjs
node --check web/approved-native-bridge.js
node --check web/approved-native-contract.js
node --test tests/workstream_coordination_contract.test.mjs tests/ci_workflow_efficiency_test.mjs tests/chat_ci_dispatch_contract.test.mjs tests/approved_native_m2_contract.test.cjs tests/native_artifact_packaging_contract_test.mjs tests/windows_installer_contract_test.mjs tests/live_graph_contract_test.mjs
node --test tests/workstream_coordination_contract.test.mjs tests/ci_workflow_efficiency_test.mjs tests/chat_ci_dispatch_contract.test.mjs tests/approved_native_m2_contract.test.cjs tests/native_artifact_packaging_contract_test.mjs tests/windows_installer_contract_test.mjs tests/live_graph_contract_test.mjs tests/native_caption_wire_geometry_contract.test.cjs
python -m unittest discover -s tests -p approved_native_gui_bundle_test.py -v
python -m unittest discover -s scripts/tests -p test_factoryfx_release_bundle.py -v
- name: Compressor exact-source native CPU A/B (same runner, non-gating timing)
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/ui-smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ jobs:
run: python tests/approved_native_harmony_smoke.py
- name: Cold start first WIRE and original-channel VST3 picker editor
run: python tests/approved_native_cold_start_smoke.py
- name: Native desktop titlebar toolbar measured in Chromium at four viewport widths
run: python tests/native_header_toolbar_chromium_smoke.py
- name: Native WIRE gain and OUT share accepted PCM identity (real Chromium)
run: python tests/approved_native_wire_gain_smoke.py
- name: Stage D one runtime CSSOM and actual stylesheet network count
Expand All @@ -278,6 +280,8 @@ jobs:
run: python tests/pages_wire_first_canonical_main_smoke.py
- name: Verify V49 direct WIRE, gain wheel, connected status, replug and scoped undo
run: python tests/pages_wire_v49_direct_controls_smoke.py
- name: Desktop titlebar WIRE geometry across resize and cancelled pointer capture
run: python tests/desktop_wire_resize_chromium_smoke.py
- name: Verify V53 handle-free FX row drag, keyboard and rack reorder
run: python tests/pages_fx_rail_v53_smoke.py
- name: Qualify public /preview/ floating Channel Editor with zero mixer reflow (five real Chromium viewports)
Expand Down Expand Up @@ -479,7 +483,7 @@ jobs:
done
git diff --exit-code -- site/preview-v2/index.html site/preview-v2/assets/mixer-chrome-material.css site/preview-v2/assets/mixer-plugin-browser.css site/preview-v2/assets/mixer-pan-controls.css site/preview-v2/assets/mixer-fader-assembly.css site/preview-v2/assets/mixer-meter-display.css site/preview-v2/assets/mixer-utility-controls.css
- name: Verify V28 exact approved /preview/ source and interactive browser parity
if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && (startsWith(github.head_ref, 'css/v28-') || startsWith(github.head_ref, 'integration/product-'))) }}
if: ${{ (github.event_name == 'workflow_dispatch' && inputs.historical_css == true) || (github.event_name == 'pull_request' && (startsWith(github.head_ref, 'css/v28-') || startsWith(github.head_ref, 'integration/product-'))) }}
run: python tests/pages_css_architecture_v28_smoke.py
- name: Verify embedded Inter font and contextual V7 micro-controls
if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && startsWith(github.head_ref, 'integration/product-')) }}
Expand Down
67 changes: 67 additions & 0 deletions site/preview-v2/assets/mixer-chrome-material.css
Original file line number Diff line number Diff line change
Expand Up @@ -1489,3 +1489,70 @@ html :where(.app, .app *),html :where(.app, .app *)::before,html :where(.app, .a
.routing-wire-overlay path{filter:none!important;pointer-events:none}



/* Desktop JUCE titlebar: one real OS window caption, no doubled WebView header.
The public interactive browser reference keeps its own top identity bar. */
html.armix-native-desktop .app > .window-title{display:none!important}
.window-title .logo{display:inline-flex!important;align-items:center;gap:0;letter-spacing:.015em}
.window-title .logo .armix-brand-ar{color:#48d5f3}
.window-title .logo .armix-brand-son{color:#eff8fa}
.window-title .logo .armix-brand-mix{color:#ffad59}
/* Compact consistent operator toolbar spacing, preserving existing BTN-180 skin. */
.app .command-bar{
min-height:34px!important;align-items:center!important;column-gap:5px!important;
padding-left:9px!important;padding-right:9px!important;
}
.app .command-bar>.sep{margin-left:2px!important;margin-right:2px!important}
.app .command-bar .toolbar-label{font-size:9px!important;letter-spacing:.06em}
@media(max-width:1220px){
.app .command-bar{column-gap:3px!important;padding-left:5px!important;padding-right:5px!important}
}

/* Native desktop toolbar V2 — functional hardware keys stay 29px high.
Separate command groups visually; keep the bank and More fully usable.
The public /preview/ layout and historical fixture are untouched. */
html.armix-native-desktop .app .command-bar{
height:43px!important;min-height:43px!important;max-height:43px!important;
flex:0 0 43px!important;
align-items:center!important;column-gap:8px!important;
padding-inline:12px!important;
background:linear-gradient(180deg,#1b3340 0%,#172d39 100%)!important;
border-top:1px solid #5f7b864c!important;
border-bottom:1px solid #081922!important;
}
html.armix-native-desktop .app .command-bar>.armix-toolbar-divider,
html.armix-native-desktop .app .command-bar>.sep{
display:block!important;flex:0 0 1px!important;width:1px!important;
height:21px!important;padding:0!important;
margin:0 4px!important;align-self:center!important;pointer-events:none!important;
background:linear-gradient(180deg,transparent,#7799a27d 30%,#7799a27d 70%,transparent)!important;
border:0!important;
}
html.armix-native-desktop .app .command-bar>.tool:not(.bank-arrow),
html.armix-native-desktop .app .command-bar>.more-tools>summary.tool{
padding-inline:10px!important;
}
html.armix-native-desktop .app .command-bar>.mixer-file-tool{
gap:6px!important;
}
html.armix-native-desktop .app .command-bar>.mixer-file-tool img{
display:block;width:16px;height:16px;flex:none;
}
html.armix-native-desktop .app .command-bar>.toolbar-label{
font-size:9px!important;letter-spacing:.09em!important;
}
@media(max-width:1360px){
html.armix-native-desktop .app .command-bar{
column-gap:5px!important;padding-inline:7px!important;
}
html.armix-native-desktop .app .command-bar>.armix-toolbar-divider{display:none!important}
html.armix-native-desktop .app .command-bar>.tool:not(.bank-arrow),
html.armix-native-desktop .app .command-bar>.more-tools>summary.tool{
padding-inline:7px!important;
}
}
@media(max-width:1150px){
html.armix-native-desktop .app .command-bar{
column-gap:4px!important;padding-inline:5px!important;
}
}
15 changes: 15 additions & 0 deletions site/preview-v2/assets/mixer-contextual-buttons.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,18 @@
script.src=new URL('arson-player.js',base).href;
document.body.appendChild(script);
})();

/* ArSonMiX owner wordmark; original source HTML/assembler anchor is immutable. */
(()=>{
'use strict';
const logo=document.querySelector('.app > .window-title .logo');
if(!logo||logo.textContent!=='ArSonMix'||typeof logo.replaceChildren!=='function')return;
logo.replaceChildren(...[
['armix-brand-ar','Ar'],['armix-brand-son','Son'],['armix-brand-mix','MiX']
].map(([cls,value])=>{
const span=document.createElement('span');
span.className=cls;span.textContent=value;
return span;
}));
logo.setAttribute('aria-label','ArSonMiX');
})();
76 changes: 69 additions & 7 deletions site/preview-v2/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1284,6 +1284,9 @@
/* One accepted CH→MAIN edge is represented by two local cable fragments.
Physical coordinates are measured from actual sockets; never connect strips
with a long SVG crossing banks or alter the audio graph. */
// MAIN mini cables use a separate one-shot dirty flag; ordinary pointer moves
// must not force layout reads on a stable native viewport.
let wireFragmentGeometryDirty=false;
function paintMainWireFragment(strip,edge,isMain){
const section=strip?.querySelector('.send-section.wire-section');
if(!section)return;
Expand All @@ -1292,9 +1295,9 @@
layer?.remove();return;
}
// Pointer-motion repaint must not synchronously remeasure every channel.
// Structural render, bank, density and resize remount the section; a
// changed accepted edgeId invalidates this tiny projection automatically.
if(layer?.dataset.edgeId===String(edge.id))return;
// A stable edgeId can still move when the host window is resized.
// Refresh the physical anchor only on a geometry event (or edge edit).
if(layer?.dataset.edgeId===String(edge.id)&&!wireFragmentGeometryDirty)return;
const jack=section.querySelector(isMain?'.wire-node-in .wire-arrow':'.wire-node-out .wire-pin');
const sectionRect=section.getBoundingClientRect(),pin=jack?.getBoundingClientRect();
if(!pin||!sectionRect.width||!sectionRect.height)return;
Expand Down Expand Up @@ -1355,6 +1358,7 @@
}
function renderWireRouting(){
syncMainWireFragments();
wireFragmentGeometryDirty=false;
if(wireWsOpen&&!wireGesture?.active)renderWireWorkspace();
document.querySelector('.console-body')?.classList.toggle('wire-intent',!!wireIntent);
const svg=document.getElementById('wireLayer'),viewport=document.getElementById('viewport');
Expand Down Expand Up @@ -2879,10 +2883,68 @@
document.getElementById(e.key==='ArrowRight'?'bankNext':'bankPrev').click();
}
});
let resizeQueued=false;
window.addEventListener('resize',()=>{
if(resizeQueued)return;resizeQueued=true;
requestAnimationFrame(()=>{resizeQueued=false;render();});
// Desktop maximise, restore, DPI changes and normal resizing are layout events,
// not mixer/PCM edits. Read the true socket bounds AFTER layout and coalesce
// concurrent ResizeObserver + viewport events into one animation frame.
let wireGeometryFrame=0,wireGeometryDirty=false;
function scheduleWireGeometryReflow(){
wireGeometryDirty=true;
if(wireGeometryFrame||document.hidden)return;
wireGeometryFrame=requestAnimationFrame(()=>{
wireGeometryFrame=0;
if(document.hidden)return;
const viewport=document.getElementById('viewport');
if(!viewport||viewport.clientWidth<=0||viewport.clientHeight<=0)return;
wireGeometryDirty=false;
const root=document.querySelector('.console-body');
const drawn=Number(root?.style.getPropertyValue('--bank-capacity'));
const required=bankCapacity();
if(drawn&&required!==drawn){
// A bank rebuild destroys pointer-capture owners. Retire only in-flight
// UI gestures BEFORE the strips are replaced; the committed WIRE graph,
// route identities and accepted fader level never change on resize.
if(wireGesture){
const g=wireGesture;wireGesture=null;wireSuppressClick=true;
setWireSnapTarget(null);
root?.classList.remove('wire-dragging');
root?.querySelectorAll('.is-replug-origin,.is-drag-origin').forEach(el=>
el.classList.remove('is-replug-origin','is-drag-origin'));
const owner=root?.querySelector('.strip[data-id="'+(g.originDestId??g.sourceId)+'"] '+
(g.originDestId!=null?'.wire-node-in':'.wire-node-out'));
if(owner?.hasPointerCapture?.(g.pointerId))owner.releasePointerCapture?.(g.pointerId);
}
if(faderGesture){
const g=faderGesture;faderGesture=null;
if(g.box?.hasPointerCapture?.(g.pointerId))g.box.releasePointerCapture?.(g.pointerId);
}
// Kill any RAF that still closes over the pre-resize cable coordinates.
++wireMotion.token;wireMotion.key=null;wireMotion.offset=0;
render(); // structural bank change only
}else{
// Stop a still-running cable spring (its animation closes over old pixels).
++wireMotion.token;wireMotion.key=null;wireMotion.offset=0;
wireFragmentGeometryDirty=true;
renderWireRouting(); // geometry-only; no native graph/strip edits
}
});
}
// WebView2 can resize its child compositor one event AFTER the parent HWND.
// Observe stable mixer boxes rather than polling or assuming old viewport width.
if(typeof ResizeObserver==='function'){
const wireGeometryObserver=new ResizeObserver(scheduleWireGeometryReflow);
for(const id of ['viewport','tracks','master']){
const el=document.getElementById(id);
if(el)wireGeometryObserver.observe(el);
}
wireGeometryObserver.observe(document.querySelector('.console-body'));
}
window.addEventListener('resize',scheduleWireGeometryReflow,{passive:true});
window.visualViewport?.addEventListener?.('resize',scheduleWireGeometryReflow,{passive:true});
document.getElementById('viewport')?.addEventListener?.('scroll',scheduleWireGeometryReflow,{passive:true});
window.addEventListener('focus',scheduleWireGeometryReflow,{passive:true});
window.addEventListener('pageshow',scheduleWireGeometryReflow,{passive:true});
document.addEventListener('visibilitychange',()=>{
if(!document.hidden)scheduleWireGeometryReflow();
});
restorePluginPreferences();init();
})();
Expand Down
152 changes: 152 additions & 0 deletions src/ArSonWindowChrome.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
// SPDX-License-Identifier: AGPL-3.0-only
#pragma once
#include <juce_gui_basics/juce_gui_basics.h>

namespace armix::ui
{
// Only the main JUCE mixer window uses this caption. No WebView2 command
// round trips for minimise, maximise, close, drag or OS window resizing.
class MixerCaptionButton final : public juce::Button
{
public:
explicit MixerCaptionButton (int kind) : Button ("ArSonMiX window control"), kind_ (kind)
{
// Exact operator-provided SVG path geometry, in its native 24x24 coordinates.
icon_ = load (kind == juce::DocumentWindow::closeButton
? "M6.4,19L5,17.6L10.6,12L5,6.4L6.4,5L12,10.6L17.6,5L19,6.4L13.4,12L19,17.6L17.6,19L12,13.4L6.4,19Z"
: kind == juce::DocumentWindow::minimiseButton
? "M6,21V19H18v2H6Z"
: "M3,21V3H21V21H3Zm2-2H19V5H5V19Zm0,0V5V19Z");
if (kind == juce::DocumentWindow::maximiseButton)
restoreIcon_ = load ("M8,3H21V16H18V6H8V3ZM3,8H16V21H3V8ZM6,11V18H13V11H6Z");
setTooltip (kind == juce::DocumentWindow::closeButton ? "Close" :
kind == juce::DocumentWindow::minimiseButton ? "Minimise" : "Maximise / restore");
setMouseCursor (juce::MouseCursor::PointingHandCursor);
}

void paintButton (juce::Graphics& g, bool over, bool down) override
{
const bool close = kind_ == juce::DocumentWindow::closeButton;
// Compact 34 px hit area; only the 30x25 interior lights on hover.
// No timers, interpolated animations, allocation or WebView2 messaging.
// A pressed command is immediately visible: teal minimise, blue
// maximise/restore, and intentionally red close.
if (over || down)
{
// Clear chromatic outline on hover; solid pressed state.
// The native JUCE Button repaints only on its mouse-state change.
const bool minimise = kind_ == juce::DocumentWindow::minimiseButton;
const auto accent = close ? juce::Colour (0xffff6874)
: minimise ? juce::Colour (0xff50d4e7)
: juce::Colour (0xff67b9ff);
const auto pressed = close ? juce::Colour (0xffdc3549)
: minimise ? juce::Colour (0xff168fa7)
: juce::Colour (0xff287abd);
const auto face = getLocalBounds().toFloat().reduced (2.0f, 3.0f);
g.setColour (down ? pressed : accent.withAlpha ((juce::uint8) 27));
g.fillRoundedRectangle (face, 3.0f);
g.setColour (accent);
g.drawRoundedRectangle (face.reduced (0.5f), 3.0f, 1.0f);
}
if (hasKeyboardFocus (true))
{
g.setColour (juce::Colour (0xff68d9f2));
g.drawRoundedRectangle (getLocalBounds().toFloat().reduced (1.5f, 2.5f), 3.0f, 1.0f);
}
auto* parent = findParentComponentOfClass<juce::DocumentWindow>();
auto* image = kind_ == juce::DocumentWindow::maximiseButton &&
parent != nullptr && parent->isFullScreen()
? restoreIcon_.get() : icon_.get();
if (image != nullptr)
{
const auto b = getLocalBounds().toFloat();
image->drawWithin (g, { b.getCentreX() - 6.0f, b.getCentreY() - 6.0f, 12.0f, 12.0f },
juce::RectanglePlacement::centred, isEnabled() ? 1.0f : 0.45f);
}
}

private:
static std::unique_ptr<juce::Drawable> load (const char* path)
{
juce::String source ("<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 24 24\"><path fill=\"#dcecf2\" d=\"");
source << path << "\"/></svg>";
if (auto xml = juce::XmlDocument::parse (source))
return juce::Drawable::createFromSVG (*xml);
return {};
}
int kind_;
std::unique_ptr<juce::Drawable> icon_, restoreIcon_;
};

class MixerCaptionLookAndFeel final : public juce::LookAndFeel_V4
{
public:
juce::Button* createDocumentWindowButton (int kind) override
{
return new MixerCaptionButton (kind);
}

void positionDocumentWindowButtons (juce::DocumentWindow&, int x, int y, int w, int h,
juce::Button* minimise, juce::Button* maximise,
juce::Button* close, bool onLeft) override
{
constexpr int buttonWidth = 34;
if (onLeft)
{
for (auto* button : { close, minimise, maximise })
if (button != nullptr) { button->setBounds (x, y, buttonWidth, h); x += buttonWidth; }
}
else
{
x += w;
for (auto* button : { close, maximise, minimise })
if (button != nullptr) { x -= buttonWidth; button->setBounds (x, y, buttonWidth, h); }
}
}

void drawDocumentWindowTitleBar (juce::DocumentWindow& window, juce::Graphics& g,
int w, int h, int titleX, int titleW,
const juce::Image* icon, bool) override
{
g.fillAll (juce::Colour (0xff112632));
g.setColour (juce::Colour (0xff365b6b));
g.drawHorizontalLine (h - 1, 0.0f, static_cast<float> (w));
int x = juce::jmax (10, titleX + 9);
if (icon != nullptr && icon->isValid())
{
g.drawImageWithin (*icon, x, (h - 16) / 2, 16, 16,
juce::RectanglePlacement::centred, false);
x += 23;
}
const auto brandFont = juce::Font (juce::FontOptions { 13.0f });
g.setFont (brandFont);
const auto alpha = window.isActiveWindow() ? 1.0f : 0.72f;
auto paintPart = [&] (const juce::String& word, juce::Colour colour)
{
// Real glyph advances: "ArSonMiX" is one continuous wordmark.
const auto advance = juce::GlyphArrangement::getStringWidthInt (brandFont, word);
g.setColour (colour.withMultipliedAlpha (alpha));
g.drawText (word, x, 0, advance + 2, h, juce::Justification::centredLeft, false);
x += advance;
};
paintPart ("Ar", juce::Colour (0xff48d5f3));
paintPart ("Son", juce::Colour (0xffeff8fa));
paintPart ("MiX", juce::Colour (0xffffad59));
x += 15;
const auto remaining = juce::jmax (0, titleX + titleW - x - 9);
if (remaining > 80)
{
// Explicit Unicode code point prevents mojibake in MSVC builds.
const auto separator = juce::String (" ") +
juce::String::charToString ((juce::juce_wchar) 0x00b7) + " ";
const auto subtitle = juce::String ("Open Source Premium Digital Mixer")
+ separator + "Version 01.00" + separator
+ juce::String::charToString ((juce::juce_wchar) 0x00a9) + " 2026 SonKuPik";
g.setColour (juce::Colour (0xff96b3bf).withMultipliedAlpha (alpha));
g.setFont (juce::Font (juce::FontOptions { 10.5f }));
g.drawText (subtitle, x, 0, remaining, h,
juce::Justification::centredLeft, true);
}
}
};
} // namespace armix::ui
Loading
Loading