termdock 1.4.120 → 1.4.122

package/.desktop-dist/main.js

@@ -8,7 +8,7 @@ import os from 'node:os';
 import path from 'node:path';
 import { promisify } from 'node:util';
 import { fileURLToPath } from 'node:url';
-import { desktopStatusTooltip, formatCompactDesktopStatus, mergeServiceActivity, nextServiceOrigin, normalizeServiceActivity, summarizeServiceActivity, } from './activityStatus.js';
+import { desktopStatusTooltip, formatCompactDesktopStatus, menuBarStatusRows, mergeServiceActivity, nextServiceOrigin, normalizeServiceActivity, summarizeServiceActivity, } from './activityStatus.js';
 import { checkForDesktopUpdates, configureDesktopUpdater, ensureLatestRuntime, getDesktopUpdateState, installDownloadedDesktopUpdate, subscribeDesktopUpdateState, } from './updater.js';
 import { resolvePackagedRuntime, rollbackDownloadedRuntime, } from './runtime.js';
 import { isExternalLinkStagingUrl, isSafeExternalUrl } from './externalLinks.js';
@@ -223,17 +223,17 @@ function menuBarStatusImage(status) {
             });
         });
     };
-    // Three quiet, consistently aligned rows read much better at menu-bar size
-    // than squeezing two metrics beside each other. The ordering mirrors the
-    // floating widget: running, review, then connected services.
-    const rows = [
-        { value: status.runningCount, y: 0, icon: [[0, 0], [0, 1], [1, 1], [0, 2], [1, 2], [2, 2], [3, 2], [0, 3], [1, 3], [0, 4]] },
-        { value: status.reviewCount, y: 6, icon: [[2, 0], [1, 1], [3, 1], [0, 2], [4, 2], [1, 3], [3, 3], [2, 4]] },
-        { value: status.serviceCount, y: 12, icon: [[0, 0], [1, 0], [3, 0], [4, 0], [1, 1], [3, 1], [2, 2], [2, 3], [1, 4], [2, 4], [3, 4]] },
-    ];
-    rows.forEach(({ value, y, icon }) => {
+    const icons = {
+        running: [[0, 0], [0, 1], [1, 1], [0, 2], [1, 2], [2, 2], [3, 2], [0, 3], [1, 3], [0, 4]],
+        review: [[2, 0], [1, 1], [3, 1], [0, 2], [4, 2], [1, 3], [3, 3], [2, 4]],
+        services: [[0, 0], [1, 0], [3, 0], [4, 0], [1, 1], [3, 1], [2, 2], [2, 3], [1, 4], [2, 4], [3, 4]],
+    };
+    // A single connection is the normal case, so its count is redundant. Give
+    // the two actionable activity rows more breathing room instead. Zero and
+    // multiple connections keep the service row because those states matter.
+    menuBarStatusRows(status).forEach(({ metric, value, y }) => {
         const alpha = value > 0 ? 255 : 96;
-        icon.forEach(([offsetX, offsetY]) => drawPixel(1 + offsetX, y + offsetY, alpha));
+        icons[metric].forEach(([offsetX, offsetY]) => drawPixel(1 + offsetX, y + offsetY, alpha));
         drawGlyph(value, 11, y, alpha);
     });
     // Template images are intentionally monochrome; macOS supplies the correct