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

Merge branch 'home-sweet-gnome:master' into panel-border

Browse Source
This commit is contained in:
Hirnmoder
2024-12-02 09:45:34 +01:00
committed by GitHub
parent eb7c67cb1d a6653f6f8b
commit cfbe7e529c
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
appIcons.js
View File

@@ -1818,7 +1818,7 @@ export const MyShowAppsIconMenu = class extends PopupMenu.PopupMenu {
this._appendItem({
title: _('Extensions'),
cmd: ['gnome-shell-extension-prefs']
cmd: ['gnome-extensions-app']
});
this._appendItem({

14
extension.js
View File

@@ -33,6 +33,7 @@ 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;
@@ -80,7 +81,11 @@ export default class DashToPanelExtension extends Extension {
if (!reset) {
extensionSystem.disconnect(extensionChangedHandler);
extensionSystem.enableExtension(UBUNTU_DOCK_UUID);
if (disabledUbuntuDock) {
disabledUbuntuDock = false;
extensionSystem.enableExtension(UBUNTU_DOCK_UUID);
}
delete global.dashToPanel;
@@ -97,7 +102,12 @@ export default class DashToPanelExtension extends 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)
return panelManager.toggleDash(); // already initialized but ubuntu dock restored the original dash on disable