From 39face99579698ae1cb40fbea1cbc35819182e98 Mon Sep 17 00:00:00 2001 From: Julian Schacher Date: Sun, 5 Feb 2023 17:49:55 +0100 Subject: [PATCH] Fix: Also interact with the panel, if the parent session mode is "user" Top Bar Organizer used to only interact with the panel, when the current session mode is "user". However Ubuntu uses "ubuntu" as its session mode, which made Top Bar Organizer not work. Fix this by also interacting with the panel, if the parent session mode is "user". See here for some docs on session modes: https://gjs.guide/extensions/topics/session-modes.html --- src/extension.js | 10 ++++++---- src/extensionModules/BoxOrderManager.js | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/extension.js b/src/extension.js index 73bfd24..dad434c 100644 --- a/src/extension.js +++ b/src/extension.js @@ -94,8 +94,9 @@ class Extension { * @param {string} box - The box to order. */ #orderTopBarItems(box) { - // Only run, when in "user" session mode. - if(Main.sessionMode.currentMode !== "user") { + // Only run, when the session mode is "user" or the parent session mode + // is "user". + if(Main.sessionMode.currentMode !== "user" && Main.sessionMode.parentMode !== "user") { return; } @@ -152,8 +153,9 @@ class Extension { * orders the items of all top bar boxes. */ #handleNewItemsAndOrderTopBar() { - // Only run, when in "user" session mode. - if(Main.sessionMode.currentMode !== "user") { + // Only run, when the session mode is "user" or the parent session mode + // is "user". + if(Main.sessionMode.currentMode !== "user" && Main.sessionMode.parentMode !== "user") { return; } diff --git a/src/extensionModules/BoxOrderManager.js b/src/extensionModules/BoxOrderManager.js index 19a0535..a206739 100644 --- a/src/extensionModules/BoxOrderManager.js +++ b/src/extensionModules/BoxOrderManager.js @@ -184,8 +184,9 @@ var BoxOrderManager = GObject.registerClass({ * bar to the correct box orders. */ saveNewTopBarItems() { - // Only run, when in "user" session mode. - if(Main.sessionMode.currentMode !== "user") { + // Only run, when the session mode is "user" or the parent session mode + // is "user". + if(Main.sessionMode.currentMode !== "user" && Main.sessionMode.parentMode !== "user") { return; }