From 388febf2fd6327ebbbe154ab89c532f53464aa12 Mon Sep 17 00:00:00 2001
From: Artyom Zorin <azorin@zoringroup.com>
Date: Mon, 8 Sep 2025 21:42:14 +0100
Subject: [PATCH] Bump to version 68.9

---
 debian/changelog    |  7 +++++++
 src/panelManager.js | 12 +++++++-----
 src/prefs.js        |  4 ++--
 ui/SettingsStyle.ui |  8 ++++----
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f8e1ddd..74cd81c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
diff --git a/src/panelManager.js b/src/panelManager.js
index 9991a2d..833ceab 100644
--- a/src/panelManager.js
+++ b/src/panelManager.js
@@ -64,15 +64,15 @@ export const PanelManager = class {
   }
 
   enable(reset) {
-    // g-s version 49 switched to clutter gestures
-    if (!AppDisplay.AppIcon.prototype._removeMenuTimeout)
-      AppDisplay.AppIcon.prototype._setPopupTimeout =
-        AppDisplay.AppIcon.prototype._removeMenuTimeout = () => {}
-
     this.allPanels = []
     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,
@@ -419,6 +419,8 @@ export const PanelManager = class {
     )
   }
 
+  _emptyFunc() {}
+
   _setDesktopIconsMargins() {
     this._desktopIconsUsableArea?.resetMargins()
     this.allPanels.forEach((p) => {
diff --git a/src/prefs.js b/src/prefs.js
index cd73538..d219bdc 100644
--- a/src/prefs.js
+++ b/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',
diff --git a/ui/SettingsStyle.ui b/ui/SettingsStyle.ui
index 1fba66d..f3b2444 100644
--- a/ui/SettingsStyle.ui
+++ b/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">