Bump to version 70.1.1

Makefile

@@ -21,7 +21,7 @@ INSTALLNAME = zorin-taskbar@zorinos.com
 # in the metadata and in the generated zip-file.
 ifdef VERSION
 else
-	VERSION = 65
+	VERSION = 70
 endif
 
 ifdef TARGET

debian/changelog

@@ -1,3 +1,84 @@
+gnome-shell-extension-zorin-taskbar (70.1.1) noble; urgency=medium
+
+  * Fixed bugs
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Mon, 29 Sep 2025 18:08:55 +0100
+
+gnome-shell-extension-zorin-taskbar (70.1) noble; urgency=medium
+
+  * Rebased on upstream commit 1ac39b72b88110681203701728e18468b24151c3
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Mon, 29 Sep 2025 17:53:47 +0100
+
+gnome-shell-extension-zorin-taskbar (70) noble; urgency=medium
+
+  * Rebased on upstream commit 134f6f991126b96738efef303572f1db9bdec9bd
+    but without commit 114d87149872da003af947315d4da2f0e40d41c9
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Sat, 27 Sep 2025 23:17:10 +0100
+
+gnome-shell-extension-zorin-taskbar (69.2) noble; urgency=medium
+
+  * Adjusted app icon margin
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Tue, 16 Sep 2025 16:03:52 +0100
+
+gnome-shell-extension-zorin-taskbar (69.1) noble; urgency=medium
+
+  * Set prefs window width
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Mon, 15 Sep 2025 16:44:10 +0100
+
+gnome-shell-extension-zorin-taskbar (69) noble; urgency=medium
+
+  * Re-based on upstream version 69
+
+ -- Artyom Zorin <azorin@zoringroup.com>  Fri, 12 Sep 2025 14:14:35 +0100
+
+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,8 +3,8 @@
   "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
+  "version": 70
 }

po/it.po

@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Dash to Panel package.
 # Enrico Bella <enricobe@hotmail.com>, 2018.
 # Kowalski7cc <kowalski.7cc@gmail.com>, 2020.
-# Albano Battistella <albanobattistella@gmail.com>, 2023.
+# Albano Battistella <albanobattistella@gmail.com>, 2023,2025.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-02-08 08:31-0500\n"
-"PO-Revision-Date: 2023-12-22 20:38+0200\n"
+"PO-Revision-Date: 2025-09-14 13:38+0200\n"
 "Last-Translator: Albano Battistella <albanoattistella@gmail.com>\n"
 "Language-Team: Italian\n"
 "Language: it\n"
@@ -262,9 +262,8 @@ msgid "Windows"
 msgstr "Finestre"
 
 #: appIcons.js:1786
-#, fuzzy
 msgid "Power options"
-msgstr "Altre opzioni"
+msgstr "Opzioni di alimentazione"
 
 #: appIcons.js:1791
 msgid "Event logs"

po/pl.po

@@ -1899,7 +1899,7 @@ msgstr "Opcje zasilania"
 
 #: src/appIcons.js:2276
 msgid "Event logs"
-msgstr "Dzinnik zdarzeń"
+msgstr "Dziennik zdarzeń"
 
 #: src/appIcons.js:2281
 msgid "System"

po/pt_BR.po

@@ -709,7 +709,7 @@ msgstr "p.e. <Super>i"
 #: ui/BoxOverlayShortcut.ui.h:14
 #, fuzzy
 msgid "Show window previews on hotkey"
-msgstr "Mostrar pré-visulização da janela ao pairar"
+msgstr "Mostrar pré-visualização da janela ao pairar"
 
 #: ui/BoxOverlayShortcut.ui.h:15
 msgid "Show previews when the application have multiple instances"
@@ -824,11 +824,11 @@ msgstr "Usar o botão do meio na visualização para fechar a janela "
 
 #: ui/BoxWindowPreviewOptions.ui.h:8
 msgid "Window previews preferred size (px)"
-msgstr "Tamanho preferido da pré-visulização da janela (px)"
+msgstr "Tamanho preferido da pré-visualização da janela (px)"
 
 #: ui/BoxWindowPreviewOptions.ui.h:9
 msgid "Window previews aspect ratio X (width)"
-msgstr "Proporção da pré-visulização da janela no eixto X (comprimento)"
+msgstr "Proporção da pré-visualização da janela no eixto X (comprimento)"
 
 #: ui/BoxWindowPreviewOptions.ui.h:10
 msgid "1"
@@ -920,11 +920,11 @@ msgstr "Fixo"
 
 #: ui/BoxWindowPreviewOptions.ui.h:32
 msgid "Window previews aspect ratio Y (height)"
-msgstr "Proporção da pré-visulização da janela no eixto Y (altura)"
+msgstr "Proporção da pré-visualização da janela no eixto Y (altura)"
 
 #: ui/BoxWindowPreviewOptions.ui.h:33
 msgid "Window previews padding (px)"
-msgstr "Preenchimento da pré-visulização de janela (px)"
+msgstr "Preenchimento da pré-visualização de janela (px)"
 
 #: ui/BoxWindowPreviewOptions.ui.h:34
 msgid "Use custom opacity for the previews background"
@@ -1167,12 +1167,12 @@ msgstr ""
 
 #: ui/SettingsBehavior.ui.h:8
 msgid "Show window previews on hover"
-msgstr "Mostrar pré-visulização da janela ao pairar"
+msgstr "Mostrar pré-visualização da janela ao pairar"
 
 #: ui/SettingsBehavior.ui.h:9
 #, fuzzy
 msgid "Show tooltip on hover"
-msgstr "Mostrar pré-visulização da janela ao pairar"
+msgstr "Mostrar pré-visualização da janela ao pairar"
 
 #: ui/SettingsBehavior.ui.h:10
 msgid "Isolate"

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) {
-      Main.layoutManager.disconnect(startupCompleteHandler)
-      startupCompleteHandler = null
-    }
+    this._alreadyEnabled = false
   }
 
   resetGlobalStyles() {

src/intellihide.js

@@ -83,6 +83,9 @@ export const Intellihide = class {
     )
 
     this.enabled = false
+  }
+
+  init() {
     this._changeEnabledStatus()
   }
 

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/panel.js

@@ -732,6 +732,8 @@ export const Panel = GObject.registerClass(
       this.taskbar.resetAppIcons(true)
       this.dynamicTransparency.updateExternalStyle()
 
+      if (this.intellihide?.enabled) this.intellihide.reset()
+
       if (this.geom.vertical) {
         this.showAppsIconWrapper.realShowAppsIcon.toggleButton.set_width(
           this.geom.innerSize,

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,19 @@ 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
+
+    Main.layoutManager.findIndexForActor = (actor) =>
+      '_dtpIndex' in actor
+        ? actor._dtpIndex
+        : Layout.LayoutManager.prototype.findIndexForActor.call(
+            Main.layoutManager,
+            actor,
+          )
+
     if (this.dtpPrimaryMonitor) {
       this.primaryPanel = this._createPanel(
         this.dtpPrimaryMonitor,
@@ -118,14 +132,6 @@ export const PanelManager = class {
     )
     Main.layoutManager._updateHotCorners()
 
-    Main.layoutManager.findIndexForActor = (actor) =>
-      '_dtpIndex' in actor
-        ? actor._dtpIndex
-        : Layout.LayoutManager.prototype.findIndexForActor.call(
-            Main.layoutManager,
-            actor,
-          )
-
     if (Main.layoutManager._interfaceSettings) {
       this._enableHotCornersId = Main.layoutManager._interfaceSettings.connect(
         'changed::enable-hot-corners',
@@ -305,6 +311,11 @@ export const PanelManager = class {
     this.primaryPanel && this.overview.disable()
     this.proximityManager.destroy()
 
+    if (AppDisplay.AppIcon.prototype._removeMenuTimeout == this._emptyFunc) {
+      delete AppDisplay.AppIcon.prototype._setPopupTimeout
+      delete AppDisplay.AppIcon.prototype._removeMenuTimeout
+    }
+
     this.allPanels.forEach((p) => {
       p.taskbar.iconAnimator.pause()
 
@@ -413,6 +424,8 @@ export const PanelManager = class {
     )
   }
 
+  _emptyFunc() {}
+
   _setDesktopIconsMargins() {
     this._desktopIconsUsableArea?.resetMargins()
     this.allPanels.forEach((p) => {
@@ -663,10 +676,6 @@ export const PanelManager = class {
 
     Main.layoutManager.addChrome(clipContainer, { affectsInputRegion: false })
     clipContainer.add_child(panelBox)
-    Main.layoutManager.trackChrome(panelBox, {
-      trackFullscreen: true,
-      affectsStruts: true,
-    })
 
     panel = new Panel.Panel(
       this,
@@ -678,14 +687,22 @@ export const PanelManager = class {
     panelBox.add_child(panel)
     panel.enable()
 
+    panelBox._dtpIndex = monitor.index
+    panelBox.set_position(0, 0)
+    panelBox.set_width(-1)
+
     Main.layoutManager.trackChrome(panel, {
       affectsInputRegion: true,
       affectsStruts: false,
     })
 
-    panelBox._dtpIndex = monitor.index
-    panelBox.set_position(0, 0)
-    panelBox.set_width(-1)
+    Main.layoutManager.trackChrome(panelBox, {
+      trackFullscreen: true,
+      affectsStruts: true,
+    })
+
+    // intellihide changes the chrome when enabled, so init after setting initial chrome params
+    panel.intellihide.init()
 
     this._findPanelMenuButtons(panelBox).forEach((pmb) =>
       this._adjustPanelMenuButton(pmb, monitor, panel.geom.position),

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'),
@@ -1848,7 +1855,7 @@ export default class ZorinTaskbarPreferences extends ExtensionPreferences {
     })
 
     // use default width or window
-    window.set_default_size(0, 625)
+    window.set_default_size(600, 625)
 
     new Preferences(window, window._settings, window._gnomeInterfaceSettings, this.path)
   }

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/taskbar.js

@@ -50,7 +50,7 @@ export var hotkeyAppNumbers = {}
 export const DASH_ANIMATION_TIME = 0.2 // Dash.DASH_ANIMATION_TIME is now private
 const DASH_ITEM_HOVER_TIMEOUT = 0.3 // Dash.DASH_ITEM_HOVER_TIMEOUT is now private
 export const MIN_ICON_SIZE = 4
-export const APPICON_MARGIN = 6
+export const APPICON_MARGIN = 4
 export const APPICON_PADDING = 8
 
 const T1 = 'ensureAppIconVisibilityTimeout'

src/transparency.js

@@ -52,7 +52,7 @@ export const DynamicTransparency = class {
   }
 
   updateExternalStyle() {
-    this._setStyle()
+    this._setBackground()
   }
 
   _bindSignals() {
@@ -120,19 +120,18 @@ export const DynamicTransparency = class {
     this._updateColor(themeBackground)
     this._updateAlpha(themeBackground)
     this._updateBorder()
-    this._updateBackground()
-    this._setStyle()
+    this._setBackground()
+    this._setBorder()
   }
 
   _updateAlphaAndSet() {
     this._updateAlpha()
-    this._updateBackground()
-    this._setStyle()
+    this._setBackground()
   }
 
   _updateBorderAndSet() {
     this._updateBorder()
-    this._setStyle()
+    this._setBorder()
   }
 
   _updateColor(themeBackground) {
@@ -180,28 +179,31 @@ export const DynamicTransparency = class {
       borderPosition = 'top'
     }
 
-    const style = `border: 0 solid ${rgba}; border-${borderPosition}-width:${borderWidth}px; `
+    const style = `border: 0 solid ${rgba}; border-${borderPosition}-width:${borderWidth}px;`
     this._borderStyle = showBorder ? style : ''
   }
 
-  _updateBackground() {
+  _setBackground() {
     this.currentBackgroundColor = Utils.getrgbaColor(
       this.backgroundColorRgb,
       this.alpha,
     )
 
-    this._backgroundStyle = `background-color: ${this.currentBackgroundColor}`
+    let transition = 'transition-duration: 300ms;'
+
+    this._dtpPanel.set_style(
+      'background-color: ' + this.currentBackgroundColor + transition,
+    )
   }
 
-  _setStyle() {
-    const transition = 'transition-duration: 300ms;'
-
+  _setBorder() {
     this._dtpPanel.panel.set_style(
-      transition +
-        this._backgroundStyle +
-        this._borderStyle,
+      'background: none; ' +
+        'border-image: none; ' +
+        'background-image: none; ' +
+        this._borderStyle +
+        'transition-duration: 300ms;'
     )
-    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
@@ -1328,7 +1328,7 @@ export const Preview = GObject.registerClass(
       let size = SETTINGS.get_int('window-preview-size') * scaleFactor
       let w, h
 
-      if (this._previewMenu.isVertical) {
+      if (this._previewMenu.panel.geom.vertical) {
         w = size
         h = (w * aspectRatio.y.size) / aspectRatio.x.size
       } else {

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">