fix(ui): font consistency, button sizing, menu positioning, user count

Bundled UI polish pass addressing several visual issues reported in
Bitwig on Windows.

Fonts:
- ConnectionBar status label ("Connected"/"Disconnected") and BeatBar
  BPM/BPI numbers were using FontOptions(13.0f).withStyle("Bold"). On
  Windows without a typeface name, JUCE falls back to a serif face for
  the bold variant, which looked mismatched against the sans-serif
  button text. Both now use a plain 15pt / 13pt font matching the
  TextButton font (LookAndFeel_V4 uses 15pt plain for h=28 buttons).
- The normal Connected/Disconnected status text is now suppressed
  entirely — the colored dot is the sole indicator. "Connecting..." and
  error messages still render.

Button sizing:
- Connect/Disconnect button: 90 → 105px so "Disconnect" no longer
  clips at the default plugin size.
- Video button: 44 → 54px so "Video" no longer horizontally squashes.
- Default plugin width (kBaseWidth): 1000 → 1030 to accommodate both
  widened buttons without crowding the right-side cluster.

Menus:
- UI Scale right-click menu now uses .withParentComponent(this)
  instead of .withTargetComponent(this), so the popup (a) inherits
  JamWideLookAndFeel for consistent typography/colours and (b) opens
  at the mouse position rather than being anchored to the editor's
  bounds. Applied to both the editor-level and ConnectionBar-level
  handlers.

Session info:
- SessionInfoStrip now renders "Users: N/M" when the connected
  server's max slot count is known from the cached public server
  list. The NINJAM protocol itself does not expose max-slots, so the
  editor looks up the current server address in
  processor.cachedServerList by parsing "host:port" out of
  lastServerAddress. When unknown (user never browsed), falls back to
  "Users: N".

OSC dot:
- OscStatusDot diameter: 10 → 8px to match the server-connection dot
  drawn in ConnectionBar::paint.

BPM/BPI suppression refactor (NinjamRunThread):
- Replaced the iteration-count connectGrace_ int counter with a
  time-based suppressBpmBpiUntilMs_ int64. After a fresh OK status
  transition we silently track BPM/BPI for 2.5 seconds, during which
  the NJClient defaults (120/32) are replaced by the server's real
  config without emitting a bogus "BPM changed from 120 to N" chat
  message. Prior implementation assumed a fixed number of run-loop
  iterations, which could fire or mis-fire depending on actual
  iteration cadence.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: mkschulze

juce/JamWideJuceEditor.cpp

@@ -191,7 +191,12 @@ void JamWideJuceEditor::mouseDown(const juce::MouseEvent& e)
         menu.addItem(3, "2x",   true, juce::approximatelyEqual(processorRef.scaleFactor, 2.0f));
         menu.addSeparator();
         menu.addItem(4, "Show Session Info", true, infoStripVisible);
-        menu.showMenuAsync(juce::PopupMenu::Options(),
+        // withParentComponent(this) — NOT withTargetComponent — so the menu
+        // (a) inherits JamWideLookAndFeel from the editor for consistent
+        // typography/colours, and (b) still opens at the mouse position
+        // (withTargetComponent would anchor the menu to the editor's bounds,
+        // which is wrong for a right-click context menu).
+        menu.showMenuAsync(juce::PopupMenu::Options().withParentComponent(this),
             [this](int result) {
                 if (result >= 1 && result <= 3)
                 {
@@ -274,7 +279,33 @@ void JamWideJuceEditor::timerCallback()
         int syncState = processorRef.syncState_.load(std::memory_order_relaxed);
 
         int userCount = processorRef.userCount.load(std::memory_order_relaxed);
-        sessionInfoStrip.update(intervalCount, elapsedMs, beat, bpi, syncState, isStandalone, userCount);
+
+        // Look up max user slots from the cached public server list. The
+        // NINJAM protocol itself does not expose max-slots, so this is only
+        // populated when the user has refreshed the server browser and the
+        // connected server appears in the list. maxUsers=0 => unknown; the
+        // strip falls back to rendering just the current count.
+        int maxUsers = 0;
+        const juce::String& addr = processorRef.lastServerAddress;
+        if (addr.isNotEmpty() && !processorRef.cachedServerList.empty())
+        {
+            // Parse "host:port" out of the editor's last-used address string.
+            // Port is optional — match on host alone if it's missing.
+            int colon = addr.lastIndexOfChar(':');
+            juce::String host = colon >= 0 ? addr.substring(0, colon) : addr;
+            int port = colon >= 0 ? addr.substring(colon + 1).getIntValue() : 0;
+            for (const auto& entry : processorRef.cachedServerList)
+            {
+                if (juce::String(entry.host).equalsIgnoreCase(host)
+                    && (port == 0 || entry.port == port))
+                {
+                    maxUsers = entry.max_users;
+                    break;
+                }
+            }
+        }
+
+        sessionInfoStrip.update(intervalCount, elapsedMs, beat, bpi, syncState, isStandalone, userCount, maxUsers);
     }
 
     // Note: VU updates are driven by ChannelStripArea's own 30Hz timer (REVIEW FIX #7)

juce/JamWideJuceEditor.h

@@ -99,7 +99,11 @@ class JamWideJuceEditor : public juce::AudioProcessorEditor,
     bool infoStripVisible = true;
     int prevPollStatus_ = -1;  // REVIEW FIX: member, not static
 
-    static constexpr int kBaseWidth = 1000;
+    // 1030 accommodates the widened Connect/Disconnect button (105px) and
+    // Video button (54px) so "Disconnect" and "Video" both fit at the default
+    // plugin size without the right-side Fit/Video/Sync/Route/Vorbis cluster
+    // crowding the status label.
+    static constexpr int kBaseWidth = 1030;
     static constexpr int kBaseHeight = 700;
     static constexpr int kConnectionBarHeight = 44;
     static constexpr int kBeatBarHeight = 22;

juce/NinjamRunThread.cpp

@@ -278,11 +278,14 @@ void NinjamRunThread::run()
 
                 lastStatus_ = currentStatus;
 
-                // On connect: grace period to suppress false BPM/BPI "changed" messages.
-                // Server sends actual config AFTER status becomes OK, so the first
-                // few iterations see default→real transitions that aren't real changes.
+                // BPM/BPI suppression window: after a fresh OK transition,
+                // silently track values for 2.5s so the NJClient defaults
+                // (120/32) can be replaced by the real server config
+                // without emitting a bogus "changed" chat message.
                 if (currentStatus == NJClient::NJC_STATUS_OK)
-                    connectGrace_ = 5;
+                    suppressBpmBpiUntilMs_ = juce::Time::currentTimeMillis() + 2500;
+                else
+                    suppressBpmBpiUntilMs_ = 0;
 
                 // On connect: set up all 4 local channels per D-12
                 if (currentStatus == NJClient::NJC_STATUS_OK)
@@ -380,11 +383,15 @@ void NinjamRunThread::run()
             int bpi = client->GetBPI();
             processor.uiSnapshot.bpi.store(bpi, std::memory_order_relaxed);
 
-            // Detect BPM/BPI changes (skip during connect grace period —
-            // server sends actual config AFTER status becomes OK)
-            if (connectGrace_ > 0)
+            // Detect BPM/BPI changes, but only AFTER the post-connect
+            // suppression window has expired. During the window the NJClient
+            // defaults (120/32) transition to the server's real config, and
+            // that transition must not be reported as a "changed" message.
+            if (suppressBpmBpiUntilMs_ > 0
+                && juce::Time::currentTimeMillis() < suppressBpmBpiUntilMs_)
             {
-                --connectGrace_;
+                // Still in the post-connect suppression window — silently
+                // track values via the uiSnapshot store above.
             }
             else
             {

juce/NinjamRunThread.h

@@ -34,7 +34,14 @@ class NinjamRunThread : public juce::Thread
     JamWideJuceProcessor& processor;
     jamwide::ServerListFetcher serverListFetcher;
     int lastStatus_ = -1;  // NJClient::NJC_STATUS_DISCONNECTED
-    int connectGrace_ = 0;  // Skip BPM/BPI change messages for N iterations after connect
+    // BPM/BPI change detection: suppress the initial default→real transition
+    // that fires when the server sends its actual config on login. NJClient
+    // constructs with m_bpm=120, m_bpi=32 defaults — GetActualBPM()/GetBPI()
+    // return those until the server sends its config message, which can take
+    // hundreds of ms. Use a time-based suppression window: after status goes
+    // OK, silently track values for ~2.5s without emitting chat messages.
+    // After the window expires, normal change detection resumes.
+    juce::int64 suppressBpmBpiUntilMs_ = 0;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(NinjamRunThread)
 };

juce/osc/OscStatusDot.cpp

@@ -28,9 +28,10 @@ void OscStatusDot::paint(juce::Graphics& g)
     g.drawText("OSC", juce::Rectangle<float>(labelX, labelY, labelWidth, 9.0f),
                juce::Justification::centredLeft, false);
 
-    // Dot: 10px diameter, 4px gap after "OSC" text, centered vertically
+    // Dot: 8px diameter to match the server-connection dot drawn in
+    // ConnectionBar::paint. 4px gap after "OSC" text, centered vertically.
     const float dotX = labelX + labelWidth + 4.0f;
-    const float dotY = (bounds.getHeight() - 10.0f) * 0.5f;
+    const float dotY = (bounds.getHeight() - 8.0f) * 0.5f;
 
     // Color based on OscServer state (per D-09: 3-state indicator)
     juce::Colour dotColour;
@@ -42,7 +43,7 @@ void OscStatusDot::paint(juce::Graphics& g)
         dotColour = juce::Colour(JamWideLookAndFeel::kAccentConnect);     // Green: active
 
     g.setColour(dotColour);
-    g.fillEllipse(dotX, dotY, 10.0f, 10.0f);
+    g.fillEllipse(dotX, dotY, 8.0f, 8.0f);
 }
 
 void OscStatusDot::mouseUp(const juce::MouseEvent& e)

juce/ui/BeatBar.cpp

@@ -48,10 +48,16 @@ void BeatBar::paint(juce::Graphics& g)
             }
         }
 
+        // BPM/BPI: use a plain 13pt font. .withStyle("Bold") without a typeface
+        // name falls back to a serif face on Windows (same JUCE quirk as the
+        // status label), which makes the numbers look mismatched against the
+        // sans-serif "Intervals:" / "Elapsed:" labels in the strip below.
+        const auto numberFont = juce::FontOptions(13.0f);
+
         // BPM value (right-aligned in first 36px)
         auto bpmArea = labelArea.removeFromLeft(36);
         g.setColour(textCol);
-        g.setFont(juce::FontOptions(13.0f).withStyle("Bold"));
+        g.setFont(numberFont);
         g.drawText(juce::String(static_cast<int>(currentBpm_)), bpmArea,
                    juce::Justification::centredRight, false);
 
@@ -63,7 +69,7 @@ void BeatBar::paint(juce::Graphics& g)
 
         // BPI value (left-aligned in remaining ~28px)
         g.setColour(textCol);
-        g.setFont(juce::FontOptions(13.0f).withStyle("Bold"));
+        g.setFont(numberFont);
         g.drawText(juce::String(bpi_), labelArea, juce::Justification::centredLeft, false);
     }
 

juce/ui/ConnectionBar.cpp

@@ -93,9 +93,19 @@ ConnectionBar::ConnectionBar(JamWideJuceProcessor& processor)
     browseButton.onClick = [this]() { if (onBrowseClicked) onBrowseClicked(); };
     addAndMakeVisible(browseButton);
 
-    // Status label
-    statusLabel.setFont(juce::FontOptions(13.0f).withStyle("Bold"));
-    statusLabel.setText("Disconnected", juce::dontSendNotification);
+    // Status label — match TextButton font (LookAndFeel_V4 uses 15pt plain for
+    // h=28 buttons via jmin(15, h-6)). Avoid .withStyle("Bold") because, with
+    // no typeface name specified, JUCE on Windows falls back to a serif face
+    // for the bold variant, which makes this label look mismatched against
+    // the sans-serif button text around it.
+    //
+    // For the normal Connected/Disconnected states the label is intentionally
+    // empty — the colored status dot painted to its left is the sole indicator
+    // (green = connected, grey = disconnected). Transient states and errors
+    // still get text: "Connecting..." in yellow, and the server's auth/connect
+    // error message in red.
+    statusLabel.setFont(juce::FontOptions(15.0f));
+    statusLabel.setText({}, juce::dontSendNotification);
     statusLabel.setColour(juce::Label::textColourId, juce::Colour(JamWideLookAndFeel::kTextSecondary));
     addAndMakeVisible(statusLabel);
 
@@ -225,8 +235,10 @@ void ConnectionBar::resized()
         x += 120 + gap;
     }
 
-    connectButton.setBounds(x, y, 90, h);
-    x += 90 + gap;
+    // 105px fits "Disconnect" at the 15pt button font without clipping.
+    // "Connect" also fits; the extra slack is visually balanced.
+    connectButton.setBounds(x, y, 105, h);
+    x += 105 + gap;
 
     browseButton.setBounds(x, y, 70, h);
     x += 70 + 16;  // 16px gap before status section
@@ -254,9 +266,11 @@ void ConnectionBar::resized()
         oscStatusDot->setBounds(rightX - 44, 0, 44, getHeight());
         rightX -= 44 + gap;
     }
-    // Video button (D-01: between OSC dot and Fit, UI-SPEC: 44x28)
-    videoButton.setBounds(rightX - 44, y, 44, h);
-    rightX -= 44 + gap;
+    // Video button — 54px so "Video" fits at the 15pt button font without
+    // JUCE drawFittedText horizontally squashing it. The original 44px spec
+    // was calibrated against a different font and clipped on Windows.
+    videoButton.setBounds(rightX - 54, y, 54, h);
+    rightX -= 54 + gap;
     fitButton.setBounds(rightX - 36, y, 36, h);
 }
 
@@ -328,7 +342,10 @@ void ConnectionBar::mouseDown(const juce::MouseEvent& e)
         menu.addItem(1, "1x",   true, juce::approximatelyEqual(processorRef.scaleFactor, 1.0f));
         menu.addItem(2, "1.5x", true, juce::approximatelyEqual(processorRef.scaleFactor, 1.5f));
         menu.addItem(3, "2x",   true, juce::approximatelyEqual(processorRef.scaleFactor, 2.0f));
-        menu.showMenuAsync(juce::PopupMenu::Options(),
+        // withParentComponent(this) inherits JamWideLookAndFeel AND lets the
+        // menu open at the mouse position (withTargetComponent would anchor
+        // it to the component's bounds — wrong for a right-click context).
+        menu.showMenuAsync(juce::PopupMenu::Options().withParentComponent(this),
             [this](int result) {
                 float newScale = 1.0f;
                 if (result == 2) newScale = 1.5f;
@@ -425,11 +442,14 @@ void ConnectionBar::updateStatus(int njcStatus, int /*numUsers*/)
 {
     currentStatus = njcStatus;
 
-    // Update status text
+    // Update status text. Normal Connected/Disconnected states render as an
+    // empty label — the colored dot to the left is the indicator. Transient
+    // "Connecting..." and error messages still get text so the user gets
+    // feedback that matters.
     switch (njcStatus)
     {
         case NJClient::NJC_STATUS_OK:
-            statusLabel.setText("Connected", juce::dontSendNotification);
+            statusLabel.setText({}, juce::dontSendNotification);
             statusLabel.setColour(juce::Label::textColourId, juce::Colour(JamWideLookAndFeel::kAccentConnect));
             processorRef.lastErrorMsg = {};  // Clear previous error on successful connect
             break;
@@ -454,7 +474,7 @@ void ConnectionBar::updateStatus(int njcStatus, int /*numUsers*/)
             break;
         }
         default:
-            statusLabel.setText("Disconnected", juce::dontSendNotification);
+            statusLabel.setText({}, juce::dontSendNotification);
             statusLabel.setColour(juce::Label::textColourId, juce::Colour(JamWideLookAndFeel::kTextSecondary));
             break;
     }

juce/ui/SessionInfoStrip.cpp

@@ -9,7 +9,7 @@ SessionInfoStrip::SessionInfoStrip()
 void SessionInfoStrip::update(int intervalCount, unsigned int elapsedMs,
                                int currentBeat, int totalBeats,
                                int syncState, bool isStandalone,
-                               int userCount)
+                               int userCount, int maxUsers)
 {
     intervalCount_ = intervalCount;
     elapsedMs_ = elapsedMs;
@@ -18,6 +18,7 @@ void SessionInfoStrip::update(int intervalCount, unsigned int elapsedMs,
     syncState_ = syncState;
     isStandalone_ = isStandalone;
     userCount_ = userCount;
+    maxUsers_ = maxUsers;
     repaint();
 }
 
@@ -77,15 +78,26 @@ void SessionInfoStrip::paint(juce::Graphics& g)
     else
         g.drawText("--/--", area.removeFromLeft(40), juce::Justification::centredLeft, false);
 
-    // Users section
+    // Users section — renders "N/M" when the server's max slot count is known
+    // (populated from the public server list cache by the editor), "N"
+    // otherwise. maxUsers_ == 0 means "unknown" — the NINJAM protocol itself
+    // doesn't expose max-slots, we only know it when the user has browsed the
+    // public list and the connected server appears there.
     area.removeFromLeft(16);  // gap
     g.setFont(labelFont);
     g.setColour(labelCol);
     g.drawText("Users: ", area.removeFromLeft(35), juce::Justification::centredRight, false);
     g.setFont(valueFont);
     g.setColour(valueCol);
-    g.drawText(connected ? juce::String(userCount_) : "--",
-               area.removeFromLeft(25), juce::Justification::centredLeft, false);
+    juce::String usersStr;
+    if (!connected)
+        usersStr = "--";
+    else if (maxUsers_ > 0)
+        usersStr = juce::String(userCount_) + "/" + juce::String(maxUsers_);
+    else
+        usersStr = juce::String(userCount_);
+    // 50px fits "NN/NN" comfortably at the 11pt value font.
+    g.drawText(usersStr, area.removeFromLeft(50), juce::Justification::centredLeft, false);
 
     // Sync section (hidden in standalone per D-07)
     if (!isStandalone_)

juce/ui/SessionInfoStrip.h

@@ -7,7 +7,7 @@ class SessionInfoStrip : public juce::Component
     SessionInfoStrip();
     void update(int intervalCount, unsigned int elapsedMs, int currentBeat,
                 int totalBeats, int syncState, bool isStandalone,
-                int userCount);
+                int userCount, int maxUsers);
     void paint(juce::Graphics& g) override;
 
 private:
@@ -18,6 +18,7 @@ class SessionInfoStrip : public juce::Component
     int syncState_ = 0;
     bool isStandalone_ = false;
     int userCount_ = 0;
+    int maxUsers_ = 0;  // 0 = unknown (not in server list cache) → show "N" only
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(SessionInfoStrip)
 };

src/build_number.h

@@ -1,2 +1,2 @@
 #pragma once
-#define JAMWIDE_BUILD_NUMBER 171
+#define JAMWIDE_BUILD_NUMBER 182