Stop re-enabling ubuntu dock

This commit is contained in:
Charles Gagnon
2025-01-26 14:03:53 -05:00
parent d851bd7687
commit 4d61b95c83
2 changed files with 2 additions and 15 deletions

View File

@@ -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'});

View File

@@ -296,10 +296,6 @@ export const PanelManager = class {
this._desktopIconsUsableArea = null;
}
toggleDash() {
this.overview.toggleDash();
}
_setDesktopIconsMargins() {
this._desktopIconsUsableArea?.resetMargins();
this.allPanels.forEach(p => {