Bump to version 70

debian/changelog

@@ -1,3 +1,42 @@
+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

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

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"

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',
@@ -413,6 +419,8 @@ export const PanelManager = class {
     )
   }
 
+  _emptyFunc() {}
+
   _setDesktopIconsMargins() {
     this._desktopIconsUsableArea?.resetMargins()
     this.allPanels.forEach((p) => {
@@ -663,10 +671,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,11 +682,20 @@ 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,
     })
 
+    Main.layoutManager.trackChrome(panelBox, {
+      trackFullscreen: true,
+      affectsStruts: true,
+    })
+
     panelBox._dtpIndex = monitor.index
     panelBox.set_position(0, 0)
     panelBox.set_width(-1)

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',
@@ -1855,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 {

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._setBackground()
-    this._setStyle()
+    this._setBorder()
   }
 
   _updateAlphaAndSet() {
     this._updateAlpha()
-    this._updateBackground()
+    this._setBackground()
-    this._setStyle()
   }
 
   _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() {
+  _setBorder() {
-    const transition = 'transition-duration: 300ms;'
-
     this._dtpPanel.panel.set_style(
-      transition +
+      'background: none; ' +
-        this._backgroundStyle +
+        'border-image: none; ' +
-        this._borderStyle,
+        '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

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