Make the panel position and the label width settings
Two things that were constants and had no business being constants. Placement: the box (left, centre, right) and the index within it. The default is unchanged -- centre, index 1, immediately right of the clock -- and an index past the end of a box lands at the end, so a large one means "last". Applied at once, no reload. Moving is done by rebuilding the indicator rather than by moving the actor. addToStatusArea is what registers it under the uuid and there is no documented call to move one between boxes; everything else reaches into Main.panel's private boxes. It costs one re-read of a few small state files and only when the setting is touched. Label width: three characters by default, settable up to ten, not down. Three is enough to keep initials apart and narrow enough not to shove the clock about; below three, distinct projects start sharing a label. A wider label takes more initials rather than a longer prefix -- a prefix collapses dev-skills and dev-conventions at any width -- so dev-skills stays "ds" however wide the setting, while claude-code-gnome-extension becomes "ccge" at four. A disambiguating digit still eats into the label instead of extending past the width, so a chip that gains one does not push the row. Sticky labels work against that setting: kept labels are kept whatever width they were cut at, so widening would leave every session on screen at its old width until it ended. The width is therefore the one thing that discards the map -- a relabelling that was asked for is not a label moving under your hand. The combo row is bound by hand: Gio.Settings.bind maps a boolean to 'active' and an int to 'value', but a string to a selected index needs bind_with_mapping, which is not introspectable. Only the write direction is wired up, and the test covers it, because a row that stores its index instead of its value looks fine until the shell reads the key. Fixed on the way, found by watching the centre box grow 2 -> 3 -> 4 -> 5 across four moves: PanelMenu.ButtonBox connects `this._onDestroy.bind(this)` in its _init, and its _onDestroy is what destroys the container -- the St.Bin the panel box actually holds. The name resolves through the prototype chain, so this extension's own _onDestroy had been silently replacing the shell's since the beginning, leaving an empty container in the panel on every teardown. Renamed to _teardown; the box now stays at two children across moves and across enable/disable cycles. Verified in a nested shell on a copy of the extension carrying temporary logging, since the shell refuses screenshots to non-portal callers: every box, indices 0, 1 and 9, and widths 3, 5, 8, 10 and back, with no JS errors and no leftover actors.
This commit is contained in:
+34
-6
@@ -36,10 +36,13 @@ const schemas = Gio.SettingsSchemaSource.new_from_directory(
|
||||
const { default: Prefs } = await import(`file://${tmp}/prefs.js`);
|
||||
const prefs = new Prefs();
|
||||
Object.defineProperty(prefs, 'path', { value: EXT }); // a getter upstream
|
||||
prefs.getSettings = () => new Gio.Settings({
|
||||
settings_schema: schemas.lookup(
|
||||
'org.gnome.shell.extensions.claude-code-status', true),
|
||||
});
|
||||
// A memory backend, not the default one: the test writes a key to check the
|
||||
// hand-rolled combo binding, and it has no business touching the settings of
|
||||
// whoever is running it.
|
||||
const backend = Gio.memory_settings_backend_new();
|
||||
prefs.getSettings = () => Gio.Settings.new_full(
|
||||
schemas.lookup('org.gnome.shell.extensions.claude-code-status', true),
|
||||
backend, '/org/gnome/shell/extensions/claude-code-status/');
|
||||
|
||||
const window = new Adw.PreferencesWindow();
|
||||
prefs.fillPreferencesWindow(window);
|
||||
@@ -48,7 +51,8 @@ const rows = [];
|
||||
const walk = widget => {
|
||||
for (let c = widget.get_first_child?.(); c; c = c.get_next_sibling()) {
|
||||
const type = c.constructor.$gtype.name;
|
||||
if (type === 'AdwSwitchRow' || type === 'AdwSpinRow' || type === 'AdwActionRow')
|
||||
if (type === 'AdwSwitchRow' || type === 'AdwSpinRow' ||
|
||||
type === 'AdwComboRow' || type === 'AdwActionRow')
|
||||
rows.push({ type, title: c.title, subtitle: c.subtitle });
|
||||
walk(c);
|
||||
}
|
||||
@@ -70,9 +74,33 @@ for (const row of rows)
|
||||
const keys = schemas.lookup('org.gnome.shell.extensions.claude-code-status', true)
|
||||
.list_keys().length;
|
||||
const controls = rows.filter(
|
||||
r => r.type === 'AdwSwitchRow' || r.type === 'AdwSpinRow').length;
|
||||
r => r.type === 'AdwSwitchRow' || r.type === 'AdwSpinRow' ||
|
||||
r.type === 'AdwComboRow').length;
|
||||
check('a control for every settings key', controls === keys, `${controls} of ${keys}`);
|
||||
|
||||
// The combo is bound by hand rather than through Gio.Settings.bind, so the
|
||||
// binding is worth a test: it must start on the stored value and write back
|
||||
// the value, not the row index.
|
||||
const combo = [];
|
||||
const findCombos = widget => {
|
||||
for (let c = widget.get_first_child?.(); c; c = c.get_next_sibling()) {
|
||||
if (c.constructor.$gtype.name === 'AdwComboRow')
|
||||
combo.push(c);
|
||||
findCombos(c);
|
||||
}
|
||||
};
|
||||
findCombos(window);
|
||||
const settings = prefs.getSettings();
|
||||
check('the panel box row exists', combo.length === 1, `${combo.length} combo rows`);
|
||||
if (combo.length) {
|
||||
check('starts on the stored value',
|
||||
combo[0].selected === 1, `selected ${combo[0].selected}`); // 'center'
|
||||
combo[0].selected = 2;
|
||||
check('writing back stores the value, not the index',
|
||||
settings.get_string('panel-box') === 'right',
|
||||
settings.get_string('panel-box'));
|
||||
}
|
||||
|
||||
// The hook status line is the reason this page is worth opening at all: a
|
||||
// silent panel looks the same whether nothing runs or nothing is installed.
|
||||
const status = rows.find(r => r.title === 'Status');
|
||||
|
||||
Reference in New Issue
Block a user