diff --git a/extension.js b/extension.js index 06187b4..412eb95 100644 --- a/extension.js +++ b/extension.js @@ -33,7 +33,6 @@ const UBUNTU_DOCK_UUID = 'ubuntu-dock@ubuntu.com'; let panelManager; let extensionChangedHandler; let startupCompleteHandler; -let disabledUbuntuDock; let extensionSystem = Main.extensionManager; export let DTP_EXTENSION = null; @@ -81,12 +80,6 @@ export default class DashToPanelExtension extends Extension { if (!reset) { extensionSystem.disconnect(extensionChangedHandler); - - if (disabledUbuntuDock) { - disabledUbuntuDock = false; - extensionSystem.enableExtension(UBUNTU_DOCK_UUID); - } - delete global.dashToPanel; AppIcons.resetRecentlyClickedApp(); @@ -104,13 +97,11 @@ export default class DashToPanelExtension extends Extension { function _enable(extension) { let enabled = global.settings.get_strv('enabled-extensions'); - if (enabled?.indexOf(UBUNTU_DOCK_UUID) >= 0) { - disabledUbuntuDock = true; + if (enabled?.indexOf(UBUNTU_DOCK_UUID) >= 0) extensionSystem.disableExtension(UBUNTU_DOCK_UUID); - } if (panelManager) - return panelManager.toggleDash(); // already initialized but ubuntu dock restored the original dash on disable + return SETTINGS = extension.getSettings('org.gnome.shell.extensions.dash-to-panel'); DESKTOPSETTINGS = new Gio.Settings({schema_id: 'org.gnome.desktop.interface'}); diff --git a/panelManager.js b/panelManager.js index 43e93b4..9073739 100755 --- a/panelManager.js +++ b/panelManager.js @@ -296,10 +296,6 @@ export const PanelManager = class { this._desktopIconsUsableArea = null; } - toggleDash() { - this.overview.toggleDash(); - } - _setDesktopIconsMargins() { this._desktopIconsUsableArea?.resetMargins(); this.allPanels.forEach(p => {