morgan/dash-to-panel
1
0
Fork 0
mirror of https://github.com/morgan9e/dash-to-panel synced 2026-04-14 00:04:17 +09:00
Code Issues Packages Projects Releases Wiki Activity

Only enable ubuntu dock if dtp disabled it

Browse Source
This commit is contained in:
Charles Gagnon
2024-12-01 09:58:12 -05:00
parent db12bbf371
commit a6653f6f8b
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
extension.js
View File

@@ -33,6 +33,7 @@ const UBUNTU_DOCK_UUID = 'ubuntu-dock@ubuntu.com';
let panelManager; let panelManager;
let extensionChangedHandler; let extensionChangedHandler;
let startupCompleteHandler; let startupCompleteHandler;
let disabledUbuntuDock;
let extensionSystem = Main.extensionManager; let extensionSystem = Main.extensionManager;
export let DTP_EXTENSION = null; export let DTP_EXTENSION = null;
@@ -80,7 +81,11 @@ export default class DashToPanelExtension extends Extension {
if (!reset) { if (!reset) {
extensionSystem.disconnect(extensionChangedHandler); extensionSystem.disconnect(extensionChangedHandler);
extensionSystem.enableExtension(UBUNTU_DOCK_UUID);
if (disabledUbuntuDock) {
disabledUbuntuDock = false;
extensionSystem.enableExtension(UBUNTU_DOCK_UUID);
}
delete global.dashToPanel; delete global.dashToPanel;
@@ -97,7 +102,12 @@ export default class DashToPanelExtension extends Extension {
} }
function _enable(extension) { function _enable(extension) {
extensionSystem.disableExtension(UBUNTU_DOCK_UUID); let enabled = global.settings.get_strv('enabled-extensions');
if (enabled?.indexOf(UBUNTU_DOCK_UUID) >= 0) {
disabledUbuntuDock = true;
extensionSystem.disableExtension(UBUNTU_DOCK_UUID);
}
if (panelManager) if (panelManager)
return panelManager.toggleDash(); // already initialized but ubuntu dock restored the original dash on disable return panelManager.toggleDash(); // already initialized but ubuntu dock restored the original dash on disable