Bump version to 69.2

debian/changelog

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

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

@@ -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) {

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