pin-unpin-panel@anaximeno: Version 0.2.2 (#6473)

* Guarantee that keybinding works correctly on multi-instance setups

Author: anaximeno

pin-unpin-panel@anaximeno/files/pin-unpin-panel@anaximeno/5.4/applet.js

@@ -26,15 +26,12 @@ const SignalManager = imports.misc.signalManager;
 const GLib = imports.gi.GLib;
 
 const UUID = "pin-unpin-panel@anaximeno";
+
 // XXX: Sync With Panel.PANEL_AUTOHIDE_KEY. Not using that directly because
 // the ES6 standard doesn't support direct import of values declared with const or let
 // from modules.
 const PANEL_AUTOHIDE_KEY = "panels-autohide";
 
-// Bindinds Keys
-const TOGGLE_PANEL_PIN_KEYBINDIND_KEY = `${UUID}-toggle-panel-pin-binding-keys`;
-const PANEL_PIN_KEYBINDIND_KEY = `${UUID}-peek-panel-bindind-keys`;
-
 
 Gettext.bindtextdomain(UUID, GLib.get_home_dir() + "/.local/share/locale");
 
@@ -48,16 +45,21 @@ function _(text) {
 class PinUnpinPanelApplet extends Applet.IconApplet {
 	constructor(metadata, orientation, panelHeight, instanceId) {
 		super(orientation, panelHeight, instanceId);
+		this.instanceId = instanceId;
 		this.metadata = metadata;
+
 		this.settings = this._setup_settings(metadata.uuid, instanceId);
 
 		this.pinned = true;
 
 		this.signalsManager = new SignalManager.SignalManager(null);
-        this.signalsManager.connect(global.settings, "changed::" + PANEL_AUTOHIDE_KEY, this.on_panels_autohide_state_changed, this);
+		this.signalsManager.connect(global.settings, "changed::" + PANEL_AUTOHIDE_KEY, this.on_panels_autohide_state_changed, this);
+
+		this._default_pin_icon_path = `${metadata.path}/../icons/pin-symbolic.svg`;
+		this._default_unpin_icon_path = `${metadata.path}/../icons/unpin-symbolic.svg`;
 
-		this.default_pin_icon_path = `${metadata.path}/../icons/pin-symbolic.svg`;
-		this.default_unpin_icon_path = `${metadata.path}/../icons/unpin-symbolic.svg`;
+		this._toggle_panel_pin_binding_id = `${metadata.uuid}-toggle-panel-pin-binding-keys-${this.instanceId}`;
+		this._panel_peek_binding_id = `${metadata.uuid}-peek-panel-bindind-keys-${this.instanceId}`;
 
 		this.set_toggle_panel_pin_keydind();
 		this.set_peek_panek_keybind();
@@ -131,12 +133,15 @@ class PinUnpinPanelApplet extends Applet.IconApplet {
 
 	update_panel_applet_ui_state() {
 		if (this.use_custom_icons) {
-			this.set_applet_icon_name(this.pinned ? this.custom_unpin_icon : this.custom_pin_icon);
+			let icon = this.pinned ? this.custom_unpin_icon : this.custom_pin_icon;
+			icon.endsWith('-symbolic') ? this.set_applet_icon_symbolic_name(icon) : this.set_applet_icon_name(icon);
 		} else {
-			this.set_applet_icon_symbolic_path(this.pinned ? this.default_unpin_icon_path : this.default_pin_icon_path);
+			let icon = this.pinned ? this._default_unpin_icon_path : this._default_pin_icon_path;
+			this.set_applet_icon_symbolic_path(icon);
 		}
 
-		this.set_applet_tooltip(this.pinned ? _("Click to Unpin the Panel") : _("Click to Pin the Panel"));
+		let tooltip = this.pinned ? _("Click to Unpin the Panel") : _("Click to Pin the Panel");
+		this.set_applet_tooltip(tooltip);
 	}
 
 	get_panel_autohide_state() {
@@ -178,23 +183,23 @@ class PinUnpinPanelApplet extends Applet.IconApplet {
 
 	set_toggle_panel_pin_keydind() {
 		this.set_keybinding(
-			TOGGLE_PANEL_PIN_KEYBINDIND_KEY,
+			this._toggle_panel_pin_binding_id,
 			this.toggle_panel_pin_binding_keys,
 			this.toggle_panel_pin_state.bind(this),
 		);
 	}
 
 	set_peek_panek_keybind() {
 		this.set_keybinding(
-			PANEL_PIN_KEYBINDIND_KEY,
+			this._panel_peek_binding_id,
 			this.peek_panel_bindind_keys,
 			this.peek_panel.bind(this),
 		);
 	}
 
 	set_keybinding(id, keys, cb) {
 		this.unset_keybinding(id);
-        Main.keybindingManager.addHotKey(id, keys, cb);
+		Main.keybindingManager.addHotKey(id, keys, cb);
 	}
 
 	unset_keybinding(id) {
@@ -204,8 +209,8 @@ class PinUnpinPanelApplet extends Applet.IconApplet {
 	destroy() {
 		this.signalsManager.disconnectAllSignals();
 		this.settings.finalize();
-		this.unset_keybinding(TOGGLE_PANEL_PIN_KEYBINDIND_KEY);
-		this.unset_keybinding(PANEL_PIN_KEYBINDIND_KEY);
+		this.unset_keybinding(this._toggle_panel_pin_binding_id);
+		this.unset_keybinding(this._panel_peek_binding_id);
 	}
 }
 

pin-unpin-panel@anaximeno/files/pin-unpin-panel@anaximeno/metadata.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.2.1",
+    "version": "0.2.2",
     "uuid": "pin-unpin-panel@anaximeno",
     "name": "Pin-Unpin the Panel",
     "multiversion": true,