Bump to version 68.9

debian/changelog

@@ -1,3 +1,47 @@
+gnome-shell-extension-zorin-taskbar (68.9) noble; urgency=medium
+
+  * Rebased on upstream commit 44be0a739f26d872f27e81bd57928b6f61920476
+    and hid panel border settings
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Mon, 08 Sep 2025 21:39:56 +0100
+
+gnome-shell-extension-zorin-taskbar (68.8) noble; urgency=medium
+
+  * Fixed app grid icon styling and rebased on upstream commit
+    4787d12180462f0c1c90d3f38ece5921e7e31b7a
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Fri, 05 Sep 2025 17:44:41 +0100
+
+gnome-shell-extension-zorin-taskbar (68.7) noble; urgency=medium
+
+  * Adjusted window preview margin and rounding
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Thu, 04 Sep 2025 14:22:11 +0100
+
+gnome-shell-extension-zorin-taskbar (68.6) noble; urgency=medium
+
+  * Introduced keep gnome shell dash option
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Sat, 23 Aug 2025 15:04:05 +0100
+
+gnome-shell-extension-zorin-taskbar (68.5.3) noble; urgency=medium
+
+  * Added workaround for race condition
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Thu, 07 Aug 2025 00:09:07 +0100
+
+gnome-shell-extension-zorin-taskbar (68.5.2) noble; urgency=medium
+
+  * Fixed settings cache issues
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Wed, 06 Aug 2025 23:45:25 +0100
+
+gnome-shell-extension-zorin-taskbar (68.5.1) noble; urgency=medium
+
+  * Minor code cleanups
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Tue, 05 Aug 2025 22:47:20 +0100
+
 gnome-shell-extension-zorin-taskbar (68.5) noble; urgency=medium
 
   * Rebased on upstream commit 16e16c11ce08abc3c9f0bf922bbc08e17b2c1f08

metadata.json

@@ -3,7 +3,7 @@
   "uuid": "zorin-taskbar@zorinos.com",
   "name": "Zorin Taskbar",
   "description": "A taskbar extension for the Zorin OS desktop.",
-  "shell-version": [ "46", "47", "48" ],
+  "shell-version": [ "46", "47", "48", "49" ],
   "gettext-domain": "zorin-taskbar",
   "settings-schema": "org.gnome.shell.extensions.zorin-taskbar",
   "version": 68

schemas/org.gnome.shell.extensions.zorin-taskbar.gschema.xml

@@ -100,6 +100,11 @@
       <summary>Style of the running indicator (unfocused)</summary>
       <description>Style of the running indicator for the icon for applications which are not currently focused</description>
     </key>
+    <key type="b" name="stockgs-keep-dash">
+      <default>false</default>
+      <summary>Keep dash</summary>
+      <description>Whether to keep the stock gnome-shell dash while in overview</description>
+    </key>
     <key type="b" name="stockgs-keep-top-panel">
       <default>false</default>
       <summary>Keep top panel</summary>

src/extension.js

@@ -36,7 +36,6 @@ const ZORIN_DASH_UUID = 'zorin-dash@zorinos.com'
 export const ZORIN_TILING_SHELL_UUID = 'zorin-tiling-shell@zorinos.com'
 
 let panelManager
-let startupCompleteHandler
 let zorinDashDelayId = 0
 
 export let DTP_EXTENSION = null
@@ -59,6 +58,12 @@ export default class ZorinTaskbarExtension extends Extension {
   }
 
   async enable() {
+    // Workaround for race condition in GNOME Shell where enable() may be called multiple times
+    if (this._alreadyEnabled) {
+      return
+    }
+    this._alreadyEnabled = true
+
     DTP_EXTENSION = this
     SETTINGS = this.getSettings('org.gnome.shell.extensions.zorin-taskbar')
     try {
@@ -122,15 +127,20 @@ export default class ZorinTaskbarExtension extends Extension {
 
   disable() {
     if (zorinDashDelayId) GLib.Source.remove(zorinDashDelayId)
+    zorinDashDelayId = 0
 
-    panelManager.disable()
+    panelManager?.disable()
+    PanelSettings.clearCache()
 
     DTP_EXTENSION = null
     SETTINGS = null
+    TILINGSETTINGS = null
     SHELLSETTINGS = null
     DESKTOPSETTINGS = null
     TERMINALSETTINGS = null
+    NOTIFICATIONSSETTINGS = null
     panelManager = null
+    tracker = null
 
     delete global.zorinTaskbar
 
@@ -138,10 +148,7 @@ export default class ZorinTaskbarExtension extends Extension {
 
     AppIcons.resetRecentlyClickedApp()
 
-    if (startupCompleteHandler) {
+    this._alreadyEnabled = false
-      Main.layoutManager.disconnect(startupCompleteHandler)
-      startupCompleteHandler = null
-    }
   }
 
   resetGlobalStyles() {

src/overview.js

@@ -71,7 +71,7 @@ export const Overview = class {
 
     this._signalsHandler.add([
       SETTINGS,
-      ['changed::panel-sizes'],
+      ['changed::stockgs-keep-dash', 'changed::panel-sizes'],
       () => this.toggleDash(),
     ])
   }
@@ -91,7 +91,7 @@ export const Overview = class {
 
   toggleDash(visible) {
     if (visible === undefined) {
-      visible = false
+      visible = SETTINGS.get_boolean('stockgs-keep-dash')
     }
 
     let visibilityFunc = visible ? 'show' : 'hide'

src/panelManager.js

@@ -43,6 +43,7 @@ import Meta from 'gi://Meta'
 import Shell from 'gi://Shell'
 import St from 'gi://St'
 
+import * as AppDisplay from 'resource:///org/gnome/shell/ui/appDisplay.js'
 import * as BoxPointer from 'resource:///org/gnome/shell/ui/boxpointer.js'
 import * as LookingGlass from 'resource:///org/gnome/shell/ui/lookingGlass.js'
 import * as Main from 'resource:///org/gnome/shell/ui/main.js'
@@ -67,6 +68,11 @@ export const PanelManager = class {
     this.dtpPrimaryMonitor = Main.layoutManager.primaryMonitor // The real primary monitor should always have the main panel
     this.proximityManager = new Proximity.ProximityManager()
 
+    // g-s version 49 switched to clutter gestures
+    if (!AppDisplay.AppIcon.prototype._removeMenuTimeout)
+      AppDisplay.AppIcon.prototype._setPopupTimeout =
+        AppDisplay.AppIcon.prototype._removeMenuTimeout = this._emptyFunc
+
     if (this.dtpPrimaryMonitor) {
       this.primaryPanel = this._createPanel(
         this.dtpPrimaryMonitor,
@@ -413,6 +419,8 @@ export const PanelManager = class {
     )
   }
 
+  _emptyFunc() {}
+
   _setDesktopIconsMargins() {
     this._desktopIconsUsableArea?.resetMargins()
     this.allPanels.forEach((p) => {

src/panelSettings.js

@@ -45,6 +45,7 @@ export var availableMonitors = []
 
 export async function init(settings) {
   useCache = true
+  cache = {}
 
   await setMonitorsInfo(settings)
 }

src/prefs.js

@@ -881,7 +881,7 @@ const Preferences = class {
       })
 
     // Panel border
-    this._settings.bind(
+    /*this._settings.bind(
       'trans-use-border',
       this._builder.get_object('trans_border_switch'),
       'active',
@@ -934,7 +934,7 @@ const Preferences = class {
       .get_object('trans_border_width_spinbutton')
       .connect('value-changed', (widget) => {
         this._settings.set_int('trans-border-width', widget.get_value())
-      })
+      })*/
 
     this._settings.bind(
       'intellihide',
@@ -1774,6 +1774,13 @@ const Preferences = class {
       PanelSettings.getPanelLength(this._settings, this._currentMonitorIndex),
     )
 
+    this._settings.bind(
+      'stockgs-keep-dash',
+      this._builder.get_object('stockgs_dash_switch'),
+      'active',
+      Gio.SettingsBindFlags.DEFAULT,
+    )
+
     this._settings.bind(
       'stockgs-keep-top-panel',
       this._builder.get_object('stockgs_top_panel_switch'),

src/stylesheet.css

@@ -38,10 +38,6 @@
 	text-align: left;
 }
 
-.zorintaskbarMainPanel .dash-item-container .show-apps .overview-icon {
-	color: #FFF;
-}
-
 #zorintaskbarTaskbar .dash-item-container .overview-tile:hover,
 #zorintaskbarTaskbar .dash-item-container .overview-tile .dtp-container .overview-icon,
 .zorintaskbarMainPanel .dash-item-container .show-apps:hover .overview-icon {
@@ -137,7 +133,7 @@
 
 .preview-container,
 #preview-menu {
-	border-radius: 10px;
+	border-radius: 15px;
 }
 
 /* border radius, grrr no css variables in ST */

src/transparency.js

@@ -201,7 +201,6 @@ export const DynamicTransparency = class {
         this._backgroundStyle +
         this._borderStyle,
     )
-    console.log('Set DTP Panel style to', this._dtpPanel.panel.get_style())
   }
 
   _getThemeBackground(reload) {

src/windowPreview.js

@@ -48,7 +48,7 @@ const MIN_DIMENSION = 100
 const FOCUSED_COLOR_OFFSET = 24
 const FADE_SIZE = 36
 const PEEK_INDEX_PROP = '_dtpPeekInitialIndex'
-const MARGIN_SIZE = 8
+const MARGIN_SIZE = 4
 
 const SHOW_WINDOW_PREVIEWS_TIMEOUT = 400
 const LEAVE_TIMEOUT = 250

ui/SettingsAction.ui

@@ -100,6 +100,17 @@
     <child>
       <object class="AdwPreferencesGroup" id="finetune_group_gnome">
         <property name="title" translatable="yes">Gnome functionality</property>
+        <child>
+          <object class="AdwActionRow">
+            <property name="subtitle" translatable="yes">(overview)</property>
+            <property name="title" translatable="yes">Keep original gnome-shell dash</property>
+            <child>
+              <object class="GtkSwitch" id="stockgs_dash_switch">
+                <property name="valign">center</property>
+              </object>
+            </child>
+          </object>
+        </child>
         <child>
           <object class="AdwActionRow">
             <property name="title" translatable="yes">Keep original gnome-shell top panel</property>

ui/SettingsStyle.ui

@@ -15,7 +15,7 @@
     <property name="upper">100</property>
   </object>
 
-  <object class="GtkAdjustment" id="trans_border_opacity_adjustment">
+  <!--<object class="GtkAdjustment" id="trans_border_opacity_adjustment">
     <property name="upper">100</property>
     <property name="step_increment">5</property>
     <property name="page_increment">10</property>
@@ -26,7 +26,7 @@
     <property name="upper">10</property>
     <property name="step_increment">1</property>
     <property name="page_increment">2</property>
-  </object>
+  </object>-->
 
   <object class="AdwPreferencesPage" id="style">
     <property name="icon-name">applications-graphics-symbolic</property>
@@ -149,7 +149,7 @@
     </child>
 
     <!-- group dynamic trans4 -->
-    <child>
+<!--    <child>
       <object class="AdwPreferencesGroup" id="style_group_dynamic_trans4">
         <child>
           <object class="AdwActionRow">
@@ -191,7 +191,7 @@
           </object>
         </child>
       </object>
-    </child>
+    </child>-->
 
   </object>
   <object class="GtkAdjustment" id="global_border_radius_adjustment">