mirror of
https://github.com/morgan9e/dash-to-panel
synced 2026-04-14 00:04:17 +09:00
Stop re-enabling ubuntu dock
This commit is contained in:
13
extension.js
13
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'});
|
||||
|
||||
@@ -296,10 +296,6 @@ export const PanelManager = class {
|
||||
this._desktopIconsUsableArea = null;
|
||||
}
|
||||
|
||||
toggleDash() {
|
||||
this.overview.toggleDash();
|
||||
}
|
||||
|
||||
_setDesktopIconsMargins() {
|
||||
this._desktopIconsUsableArea?.resetMargins();
|
||||
this.allPanels.forEach(p => {
|
||||
|
||||
Reference in New Issue
Block a user