From b185773daf9fd2b92a21389efacc988fffc315df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Tue, 1 Oct 2024 16:31:58 +0200
Subject: [PATCH 1/8] feat(pinned-tab-url-reset): add option to reset pinned
 tab to originally pinned url

Adds a new setting to enable or disable pinned tab url resetting on pressing close tab shortcut.

Persists pinned tab url and label on browser closing.
---
 src/browser/app/profile/zen-browser.js        |  1 +
 .../components/preferences/zen-settings.js    |  5 +++
 .../preferences/zenTabsManagement.inc.xhtml   |  4 +++
 .../tabbrowser/content/tabbrowser-js.patch    | 35 ++++++++++++++++---
 src/browser/themes/shared/zen-icons/icons.css |  3 +-
 5 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 7f9246f3e..b3d524e4e 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -111,6 +111,7 @@ pref('zen.themes.updated-value-observer', false);
 pref('zen.tab-unloader.enabled', true);
 pref('zen.tab-unloader.timeout-minutes', 20);
 pref('zen.tab-unloader.excluded-urls', "example.com,example.org");
+pref('zen.tab-unloader.reset-pinned-tab-on-close-shortcut', true);
 
 // Pref to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.enabled", true);
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 36d4de02e..def9b768c 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -1020,4 +1020,9 @@ Preferences.addAll([
     type: 'bool',
     default: false,
   },
+  {
+    id: 'zen.tab-unloader.reset-pinned-tab-on-close-shortcut',
+    type: 'bool',
+    default: true,
+  },
 ]);
diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index c2b41f34f..d5954db77 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -48,6 +48,10 @@
             data-l10n-id="zen-tabs-unloader-enabled"
             preference="zen.tab-unloader.enabled"/>
 
+      <checkbox id="zenPinnedTabResetOnCloseShortcutEnable"
+                data-l10n-id="zen-tabs-pinned-reset-close-shortcut-enabled"
+                preference="zen.tab-unloader.reset-pinned-tab-on-close-shortcut"/>
+
       <label><html:h2 data-l10n-id="zen-tabs-unloader-unload-delay"/></label>
       <hbox id="zenTabsUnloadDelayContainer">
             <description class="description-deemphasized" data-l10n-id="zen-tabs-unloader-unload-delay-description" />
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index bce895bac..92d12be37 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..807eb0c493f15643412b05d8dad81d36d7470155 100644
+index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b6835bdacdb 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -452,11 +452,26 @@
@@ -68,7 +68,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..807eb0c493f15643412b05d8dad81d36
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3297,6 +3328,13 @@
+@@ -3297,6 +3328,12 @@
              preferredRemoteType,
            });
  
@@ -78,11 +78,24 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..807eb0c493f15643412b05d8dad81d36
 +          if (tabData.zenDefaultUserContextId) {
 +            tab.setAttribute("zenDefaultUserContextId", "true");
 +          }
-+
            if (select) {
              tabToSelect = tab;
            }
-@@ -4184,6 +4222,7 @@
+@@ -3331,7 +3368,13 @@
+             this.tabContainer._invalidateCachedTabs();
+           }
+         }
++        if (tabData.zenPinnedUrl) {
++          tab.setAttribute("zen-pinned-url", tabData.zenPinnedUrl);
++        }
+ 
++        if (tabData.zenPinnedTitle) {
++          tab.setAttribute("zen-pinned-title", tabData.zenPinnedTitle);
++        }
+         tab.initialize();
+       }
+ 
+@@ -4184,6 +4227,7 @@
          isLastTab ||
          aTab.pinned ||
          aTab.hidden ||
@@ -90,7 +103,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..807eb0c493f15643412b05d8dad81d36
          this._removingTabs.size >
            3 /* don't want lots of concurrent animations */ ||
          !aTab.hasAttribute(
-@@ -5117,10 +5156,10 @@
+@@ -5117,10 +5161,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      },
  
@@ -103,3 +116,15 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..807eb0c493f15643412b05d8dad81d36
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
+@@ -7822,7 +7866,10 @@ var TabContextMenu = {
+     );
+     contextUnpinSelectedTabs.hidden =
+       !this.contextTab.pinned || !multiselectionContext;
+-
++    let contextResetPinnedTab = document.getElementById("context_zen-reset-pinned-tab");
++    if(contextResetPinnedTab) {
++      contextResetPinnedTab.hidden = !this.contextTab.pinned || !this.contextTab.getAttribute("zen-pinned-url") || multiselectionContext;
++    }
+     // Move Tab items
+     let contextMoveTabOptions = document.getElementById(
+       "context_moveTabOptions"
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 5c671b7d4..802abe4a9 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -773,7 +773,8 @@ menuitem[id='placesContext_deleteHost'],
 #context_reloadTab,
 #context_reloadSelectedTabs,
 #toolbar-context-reloadSelectedTab,
-#toolbar-context-reloadSelectedTabs {
+#toolbar-context-reloadSelectedTabs,
+#context_zen-reset-pinned-tab {
   --menu-image: url('reload.svg');
 }
 

From 43834e57f026784bf23c14264e8510a324c6b145 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Tue, 1 Oct 2024 18:11:27 +0200
Subject: [PATCH 2/8] feat(sessionstore): Add pinned url, and pinned title to
 tab state

Adds `zenPinnedUrl`, and `zenPinnedTitle` attributes to the tab state to persist pinned tab information. This allows users to restore their previous Zen pinned base url configuration upon restarting the browser.
---
 src/browser/components/sessionstore/TabState-sys-mjs.patch | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/browser/components/sessionstore/TabState-sys-mjs.patch b/src/browser/components/sessionstore/TabState-sys-mjs.patch
index 1d2056633..27af3b860 100644
--- a/src/browser/components/sessionstore/TabState-sys-mjs.patch
+++ b/src/browser/components/sessionstore/TabState-sys-mjs.patch
@@ -1,13 +1,15 @@
 diff --git a/browser/components/sessionstore/TabState.sys.mjs b/browser/components/sessionstore/TabState.sys.mjs
-index 26f5671c849d9b0a126d79b07bc7d3d7870826ec..26f80d69a28f1196096e67a0e628a69b5b367727 100644
+index 26f5671c849d9b0a126d79b07bc7d3d7870826ec..3726c8d89c9a8f797fda4ef3c18e4fa81f3ad130 100644
 --- a/browser/components/sessionstore/TabState.sys.mjs
 +++ b/browser/components/sessionstore/TabState.sys.mjs
-@@ -98,6 +98,9 @@ var TabStateInternal = {
+@@ -98,6 +98,11 @@ var TabStateInternal = {
        tabData.muteReason = tab.muteReason;
      }
  
 +    tabData.zenWorkspace = tab.getAttribute("zen-workspace-id");
 +    tabData.zenDefaultUserContextId = tab.getAttribute("zenDefaultUserContextId");
++    tabData.zenPinnedUrl = tab.getAttribute("zen-pinned-url");
++    tabData.zenPinnedTitle = tab.getAttribute("zen-pinned-title");
 +
      tabData.searchMode = tab.ownerGlobal.gURLBar.getSearchMode(browser, true);
  

From 6dcff571d2bc3d473166b0a1070fef9a06ad728e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Mon, 7 Oct 2024 16:58:01 +0200
Subject: [PATCH 3/8] feat(zen-pinned-tab-manager): Add pinned tab management
 functionality

This commit introduces a new feature: pinned tab management. It allows users to pin tabs and define whether to reset pinned tabs on close.

- Adds a new `ZenPinnedTabManager` component to manage pinned tabs.
- Updates `zen-assets.inc.xhtml` and `zen-assets.jar.inc.mn` to include the new component.
- Modifies the `ZenStartup.mjs` file to initialize the new manager.
- Introduces a new preference `zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut` to control the behavior of pinned tabs on close.
- Updates the settings UI to reflect the new pinned tab management functionality.
- Refactors related preferences from `zen.tab-unloader.*` to `zen.pinned-tab-manager.*`.

This feature enhances Zen's tab management capabilities by providing users with more control over their pinned tabs.
---
 src/browser/app/profile/zen-browser.js        |  3 ++-
 src/browser/base/content/ZenStartup.mjs       |  1 +
 src/browser/base/content/zen-assets.inc.xhtml |  1 +
 .../base/content/zen-assets.jar.inc.mn        |  1 +
 .../components/preferences/zen-settings.js    |  2 +-
 .../preferences/zenTabsManagement.inc.xhtml   | 19 ++++++++++++++++---
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index b3d524e4e..b2713aa9e 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -111,7 +111,8 @@ pref('zen.themes.updated-value-observer', false);
 pref('zen.tab-unloader.enabled', true);
 pref('zen.tab-unloader.timeout-minutes', 20);
 pref('zen.tab-unloader.excluded-urls', "example.com,example.org");
-pref('zen.tab-unloader.reset-pinned-tab-on-close-shortcut', true);
+
+pref('zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut', true);
 
 // Pref to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.enabled", true);
diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index c9fc37e71..505793fd8 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -39,6 +39,7 @@
         gZenUIManager.init();
         gZenVerticalTabsManager.init();
         gZenCompactModeManager.init();
+        gZenPinnedTabManager.init();
 
         function throttle(f, delay) {
           let timer = 0;
diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 74d0d6af7..737eab480 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -31,6 +31,7 @@
 <script src="chrome://browser/content/ZenUIManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenSidebarManager.mjs"/>
 <script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" />
+<script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspaces.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspacesSync.mjs" />
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index 582dfb14f..e8525521d 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -16,6 +16,7 @@
         content/browser/zen-components/ZenThemeBuilder.mjs      (content/zen-components/src/ZenThemeBuilder.mjs)
         content/browser/zen-components/ZenThemesImporter.mjs    (content/zen-components/src/ZenThemesImporter.mjs)
         content/browser/zen-components/ZenTabUnloader.mjs       (content/zen-components/src/ZenTabUnloader.mjs)
+        content/browser/zen-components/ZenPinnedTabManager.mjs  (content/zen-components/src/ZenPinnedTabManager.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs       (content/zen-components/src/ZenCommonUtils.mjs)
         content/browser/zen-components/ZenGradientGenerator.mjs (content/zen-components/src/ZenGradientGenerator.mjs)
 
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index def9b768c..c6aca5c6f 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -1021,7 +1021,7 @@ Preferences.addAll([
     default: false,
   },
   {
-    id: 'zen.tab-unloader.reset-pinned-tab-on-close-shortcut',
+    id: 'zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut',
     type: 'bool',
     default: true,
   },
diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index d5954db77..115331a66 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -48,9 +48,6 @@
             data-l10n-id="zen-tabs-unloader-enabled"
             preference="zen.tab-unloader.enabled"/>
 
-      <checkbox id="zenPinnedTabResetOnCloseShortcutEnable"
-                data-l10n-id="zen-tabs-pinned-reset-close-shortcut-enabled"
-                preference="zen.tab-unloader.reset-pinned-tab-on-close-shortcut"/>
 
       <label><html:h2 data-l10n-id="zen-tabs-unloader-unload-delay"/></label>
       <hbox id="zenTabsUnloadDelayContainer">
@@ -63,6 +60,22 @@
       </hbox>
 </groupbox>
 
+<hbox id="zenPinnedTabsManagerCategory"
+      class="subcategory"
+      hidden="true"
+      data-category="paneZenTabManagement">
+      <html:h1 data-l10n-id="pane-zen-pinned-tab-manager-title"/>
+</hbox>
+
+<groupbox id="zenPinnedTabsManagerGroup" data-category="paneZenTabManagement" hidden="true" class="highlighting-group">
+      <label><html:h2 data-l10n-id="zen-pinned-tab-manager-header"/></label>
+      <description class="description-deemphasized" data-l10n-id="zen-pinned-tab-manager-description" />
+
+      <checkbox id="zenPinnedTabResetOnCloseShortcutEnable"
+                data-l10n-id="zen-pinned-tab-manager-reset-close-shortcut-enabled"
+                preference="zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut"/>
+</groupbox>
+
 </html:template>
 
 

From 8c42614427b0d376a7714c3aaffef38d2d58f4fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Mon, 7 Oct 2024 20:03:29 +0200
Subject: [PATCH 4/8] feat(pinned-tab-manager): Add restore pinned tabs to
 pinned url option

This commit introduces a new option to the pinned tab manager that allows users to restore pinned tabs to their pinned URL and title, even if the current tab has a different URL.

- Adds a new preference `zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url` to control this behavior.
- Updates the tab browser, tab state, and preferences code to support the new option.
- Adds a new UI element in the settings to allow users to enable/disable this feature.

This feature enhances the pinned tab manager by providing more control over how pinned tabs are restored when the browser is restarted.
---
 src/browser/app/profile/zen-browser.js        |  3 +-
 .../components/preferences/zen-settings.js    |  5 +++
 .../preferences/zenTabsManagement.inc.xhtml   |  4 ++
 .../sessionstore/TabState-sys-mjs.patch       |  5 ++-
 .../tabbrowser/content/tabbrowser-js.patch    | 42 ++++++++++++++-----
 5 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index b2713aa9e..097df3e05 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -112,7 +112,8 @@ pref('zen.tab-unloader.enabled', true);
 pref('zen.tab-unloader.timeout-minutes', 20);
 pref('zen.tab-unloader.excluded-urls', "example.com,example.org");
 
-pref('zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut', true);
+pref('zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut', false);
+pref('zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url', false);
 
 // Pref to enable the new profiles (TODO: Check this out!)
 //pref("browser.profiles.enabled", true);
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index c6aca5c6f..4421d6674 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -1025,4 +1025,9 @@ Preferences.addAll([
     type: 'bool',
     default: true,
   },
+  {
+    id: 'zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url',
+    type: 'bool',
+    default: true,
+  },
 ]);
diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index 115331a66..c85d69c80 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -74,6 +74,10 @@
       <checkbox id="zenPinnedTabResetOnCloseShortcutEnable"
                 data-l10n-id="zen-pinned-tab-manager-reset-close-shortcut-enabled"
                 preference="zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut"/>
+
+      <checkbox id="zenPinnedTabRestorePinnedTabsToPinnedUrl"
+                data-l10n-id="zen-pinned-tab-manager-restore-pinned-tabs-to-pinned-url"
+                preference="zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url"/>
 </groupbox>
 
 </html:template>
diff --git a/src/browser/components/sessionstore/TabState-sys-mjs.patch b/src/browser/components/sessionstore/TabState-sys-mjs.patch
index 27af3b860..a9793795d 100644
--- a/src/browser/components/sessionstore/TabState-sys-mjs.patch
+++ b/src/browser/components/sessionstore/TabState-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/sessionstore/TabState.sys.mjs b/browser/components/sessionstore/TabState.sys.mjs
-index 26f5671c849d9b0a126d79b07bc7d3d7870826ec..3726c8d89c9a8f797fda4ef3c18e4fa81f3ad130 100644
+index 26f5671c849d9b0a126d79b07bc7d3d7870826ec..5e356a35639c802fcf6d95d42993d5bd5cda514a 100644
 --- a/browser/components/sessionstore/TabState.sys.mjs
 +++ b/browser/components/sessionstore/TabState.sys.mjs
-@@ -98,6 +98,11 @@ var TabStateInternal = {
+@@ -98,6 +98,12 @@ var TabStateInternal = {
        tabData.muteReason = tab.muteReason;
      }
  
@@ -10,6 +10,7 @@ index 26f5671c849d9b0a126d79b07bc7d3d7870826ec..3726c8d89c9a8f797fda4ef3c18e4fa8
 +    tabData.zenDefaultUserContextId = tab.getAttribute("zenDefaultUserContextId");
 +    tabData.zenPinnedUrl = tab.getAttribute("zen-pinned-url");
 +    tabData.zenPinnedTitle = tab.getAttribute("zen-pinned-title");
++    tabData.zenPinnedIcon = tab.getAttribute("zen-pinned-icon");
 +
      tabData.searchMode = tab.ownerGlobal.gURLBar.getSearchMode(browser, true);
  
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 92d12be37..68f0aabd2 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b6835bdacdb 100644
+index c89ae2cbb978d6218bd56a059c5ca1e371231607..6608e0d7df1092a7398979abb166895e0b4fb66b 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -452,11 +452,26 @@
+@@ -456,11 +456,26 @@
        return duplicateTabs;
      },
  
@@ -31,7 +31,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b68
        }
        return i;
      },
-@@ -2704,6 +2719,11 @@
+@@ -2705,6 +2720,11 @@
          );
        }
  
@@ -43,7 +43,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b68
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2771,6 +2791,9 @@
+@@ -2773,6 +2793,9 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -53,7 +53,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b68
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -3248,6 +3271,14 @@
+@@ -3262,6 +3285,14 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -68,7 +68,21 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b68
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3297,6 +3328,12 @@
+@@ -3283,6 +3314,13 @@
+             url = tabData.entries[activeIndex].url;
+           }
+ 
++          if(Services.prefs.getBoolPref("zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url", false) && tabData.pinned && tabData.zenPinnedUrl) {
++            tabData.entries = [{url: tabData.zenPinnedUrl, title: tabData.zenPinnedTitle}];
++            tabData.image = tabData.zenPinnedIcon;
++            tabData.index = 0;
++            url = tabData.zenPinnedUrl;
++          }
++
+           let preferredRemoteType = E10SUtils.getRemoteTypeForURI(
+             url,
+             gMultiProcessBrowser,
+@@ -3311,6 +3349,12 @@
              preferredRemoteType,
            });
  
@@ -81,7 +95,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b68
            if (select) {
              tabToSelect = tab;
            }
-@@ -3331,7 +3368,13 @@
+@@ -3345,7 +3389,17 @@
              this.tabContainer._invalidateCachedTabs();
            }
          }
@@ -91,11 +105,15 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b68
  
 +        if (tabData.zenPinnedTitle) {
 +          tab.setAttribute("zen-pinned-title", tabData.zenPinnedTitle);
++        }
++
++        if(tabData.zenPinnedIcon) {
++          tab.setAttribute("zen-pinned-icon", tabData.zenPinnedIcon);
 +        }
          tab.initialize();
        }
  
-@@ -4184,6 +4227,7 @@
+@@ -4198,6 +4252,7 @@
          isLastTab ||
          aTab.pinned ||
          aTab.hidden ||
@@ -103,7 +121,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b68
          this._removingTabs.size >
            3 /* don't want lots of concurrent animations */ ||
          !aTab.hasAttribute(
-@@ -5117,10 +5161,10 @@
+@@ -5131,10 +5186,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      },
  
@@ -116,7 +134,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b68
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -7822,7 +7866,10 @@ var TabContextMenu = {
+@@ -7870,7 +7925,14 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -124,6 +142,10 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7ffa8f7d64f2ed13018e3f32f94e7b68
 +    let contextResetPinnedTab = document.getElementById("context_zen-reset-pinned-tab");
 +    if(contextResetPinnedTab) {
 +      contextResetPinnedTab.hidden = !this.contextTab.pinned || !this.contextTab.getAttribute("zen-pinned-url") || multiselectionContext;
++    }
++    let contextReplacePinnedUrlWithCurrent = document.getElementById("context_zen-replace-pinned-url-with-current");
++    if(contextReplacePinnedUrlWithCurrent) {
++      contextReplacePinnedUrlWithCurrent.hidden = !this.contextTab.pinned || !this.contextTab.getAttribute("zen-pinned-url") || multiselectionContext;
 +    }
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(

From 9df773dde2fc0211a63e8bc09f3b027ed59d8adf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Mon, 7 Oct 2024 22:24:29 +0200
Subject: [PATCH 5/8] Add pin icon for replace pinned url with current context
 item

---
 src/browser/themes/shared/zen-icons/icons.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 802abe4a9..b8c89a34b 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -873,7 +873,8 @@ menuitem[contexttype='fullscreen'][label*='Exit'] {
 #context_unpinTab,
 #context_pinSelectedTabs,
 #context_unpinSelectedTabs,
-.customize-context-moveToPanel {
+.customize-context-moveToPanel,
+#context_zen-replace-pinned-url-with-current {
   --menu-image: url('pin.svg');
 }
 

From fdd99cb8d6e8f05ea9c70a8fc41ac85daf9d91f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Tue, 8 Oct 2024 14:15:50 +0200
Subject: [PATCH 6/8] Fix: Refactor pinned tab management and remove
 unnecessary attribute checks

This commit refactors the pinned tab management code to improve clarity and reduce redundant checks.

The following changes were made:

- Moved pinned tab logic to a dedicated `gZenPinnedTabManager` class.
- Removed unnecessary attribute checks for `zen-pinned-url`, `zen-pinned-title`, and `zen-pinned-icon` as these are now handled by the `gZenPinnedTabManager` class.
- Simplified session restore logic for pinned tabs.
- Updated the pinned tab context menu logic to utilize the `gZenPinnedTabManager` class.
- Removed unnecessary code blocks related to pinned tabs.

These changes improve the overall readability and maintainability of the pinned tab management code.
---
 .../tabbrowser/content/tabbrowser-js.patch    | 54 ++++++-------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 68f0aabd2..81626a1ad 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index c89ae2cbb978d6218bd56a059c5ca1e371231607..6608e0d7df1092a7398979abb166895e0b4fb66b 100644
+index c89ae2cbb978d6218bd56a059c5ca1e371231607..ab88ba4024bf5d069ef4ca613024f422ad513405 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -456,11 +456,26 @@
@@ -68,21 +68,17 @@ index c89ae2cbb978d6218bd56a059c5ca1e371231607..6608e0d7df1092a7398979abb166895e
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3283,6 +3314,13 @@
-             url = tabData.entries[activeIndex].url;
-           }
+@@ -3275,6 +3306,9 @@
+             restoreTabsLazily && !select && !tabData.pinned;
  
-+          if(Services.prefs.getBoolPref("zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url", false) && tabData.pinned && tabData.zenPinnedUrl) {
-+            tabData.entries = [{url: tabData.zenPinnedUrl, title: tabData.zenPinnedTitle}];
-+            tabData.image = tabData.zenPinnedIcon;
-+            tabData.index = 0;
-+            url = tabData.zenPinnedUrl;
-+          }
+           let url = "about:blank";
 +
-           let preferredRemoteType = E10SUtils.getRemoteTypeForURI(
-             url,
-             gMultiProcessBrowser,
-@@ -3311,6 +3349,12 @@
++          gZenPinnedTabManager.resetPinnedTabData(tabData);
++
+           if (tabData.entries?.length) {
+             let activeIndex = (tabData.index || tabData.entries.length) - 1;
+             // Ensure the index is in bounds.
+@@ -3311,6 +3345,12 @@
              preferredRemoteType,
            });
  
@@ -95,25 +91,16 @@ index c89ae2cbb978d6218bd56a059c5ca1e371231607..6608e0d7df1092a7398979abb166895e
            if (select) {
              tabToSelect = tab;
            }
-@@ -3345,7 +3389,17 @@
+@@ -3345,7 +3385,7 @@
              this.tabContainer._invalidateCachedTabs();
            }
          }
-+        if (tabData.zenPinnedUrl) {
-+          tab.setAttribute("zen-pinned-url", tabData.zenPinnedUrl);
-+        }
- 
-+        if (tabData.zenPinnedTitle) {
-+          tab.setAttribute("zen-pinned-title", tabData.zenPinnedTitle);
-+        }
-+
-+        if(tabData.zenPinnedIcon) {
-+          tab.setAttribute("zen-pinned-icon", tabData.zenPinnedIcon);
-+        }
+-
++        gZenPinnedTabManager.updatePinnedTabForSessionRestore(tabData, tab);
          tab.initialize();
        }
  
-@@ -4198,6 +4252,7 @@
+@@ -4198,6 +4238,7 @@
          isLastTab ||
          aTab.pinned ||
          aTab.hidden ||
@@ -121,7 +108,7 @@ index c89ae2cbb978d6218bd56a059c5ca1e371231607..6608e0d7df1092a7398979abb166895e
          this._removingTabs.size >
            3 /* don't want lots of concurrent animations */ ||
          !aTab.hasAttribute(
-@@ -5131,10 +5186,10 @@
+@@ -5131,10 +5172,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      },
  
@@ -134,19 +121,12 @@ index c89ae2cbb978d6218bd56a059c5ca1e371231607..6608e0d7df1092a7398979abb166895e
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -7870,7 +7925,14 @@ var TabContextMenu = {
+@@ -7870,7 +7911,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
 -
-+    let contextResetPinnedTab = document.getElementById("context_zen-reset-pinned-tab");
-+    if(contextResetPinnedTab) {
-+      contextResetPinnedTab.hidden = !this.contextTab.pinned || !this.contextTab.getAttribute("zen-pinned-url") || multiselectionContext;
-+    }
-+    let contextReplacePinnedUrlWithCurrent = document.getElementById("context_zen-replace-pinned-url-with-current");
-+    if(contextReplacePinnedUrlWithCurrent) {
-+      contextReplacePinnedUrlWithCurrent.hidden = !this.contextTab.pinned || !this.contextTab.getAttribute("zen-pinned-url") || multiselectionContext;
-+    }
++    gZenPinnedTabManager.updatePinnedTabContextMenu(this.contextTab);
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"

From 948cfc4034199a48b6b9ccde48f1b1fe74fd7b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Tue, 8 Oct 2024 17:47:19 +0200
Subject: [PATCH 7/8] feat: Add new settings for close shortcut behavior of
 pinned tabs

This commit introduces new settings for the behavior of closing pinned tabs using the close shortcut.

The following options are now available:

- **Reset pinned tab on close shortcut**: Reset the tab to the pinned URL.
- **Unload pinned tab on close shortcut**: Unload the tab.
- **Change pinned tab on close shortcut**: Change the pinned tab.
- **Close pinned tab on close shortcut**: Close the tab.

This provides more granular control over how pinned tabs are handled when the close shortcut is used, allowing users to customize the behavior to their specific needs.
---
 .../preferences/zenTabsManagement.inc.xhtml   | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index c85d69c80..76c5ab74f 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -71,13 +71,26 @@
       <label><html:h2 data-l10n-id="zen-pinned-tab-manager-header"/></label>
       <description class="description-deemphasized" data-l10n-id="zen-pinned-tab-manager-description" />
 
-      <checkbox id="zenPinnedTabResetOnCloseShortcutEnable"
-                data-l10n-id="zen-pinned-tab-manager-reset-close-shortcut-enabled"
-                preference="zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut"/>
-
       <checkbox id="zenPinnedTabRestorePinnedTabsToPinnedUrl"
                 data-l10n-id="zen-pinned-tab-manager-restore-pinned-tabs-to-pinned-url"
                 preference="zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url"/>
+
+      <label><html:h2 data-l10n-id="zen-pinned-tab-manager-close-shortcut-behavior-header"/></label>
+      <description class="description-deemphasized" data-l10n-id="zen-pinned-tab-manager-close-shortcut-behavior-description" />
+      <vbox class="indent">
+            <checkbox id="zenPinnedTabResetOnCloseShortcutEnable"
+                      data-l10n-id="zen-pinned-tab-manager-reset-close-shortcut-enabled"
+                      preference="zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut"/>
+            <checkbox id="zenPinnedTabUnloadOnCloseShortcutEnable"
+                      data-l10n-id="zen-pinned-tab-manager-unload-close-shortcut-enabled"
+                      preference="zen.pinned-tab-manager.unload-pinned-tab-on-close-shortcut"/>
+            <checkbox id="zenPinnedTabChangeOnCloseShortcutEnable"
+                      data-l10n-id="zen-pinned-tab-manager-change-close-shortcut-enabled"
+                      preference="zen.pinned-tab-manager.change-pinned-tab-on-close-shortcut"/>
+            <checkbox id="zenPinnedTabCloseOnCloseShortcutEnable"
+                      data-l10n-id="zen-pinned-tab-manager-close-close-shortcut-enabled"
+                      preference="zen.pinned-tab-manager.close-pinned-tab-on-close-shortcut"/>
+      </vbox>
 </groupbox>
 
 </html:template>

From 8c04cda18bae25d1d4396c9dfbee687800aacf63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= <kriba13@gmail.com>
Date: Tue, 8 Oct 2024 21:07:06 +0200
Subject: [PATCH 8/8] feat: Replace close shortcut options for pinned tabs with
 a single menulist

This commit replaces the four separate checkboxes for close shortcut options for pinned tabs with a single menulist. This makes the UI more streamlined and user-friendly, as users can now easily select from a list of available options instead of having to check or uncheck multiple boxes.

The new menulist offers the following options:

- reset-unload-switch: Resets the tab if it was changed, otherwise unloads it.
- unload-switch: Unloads the tab if it was changed, otherwise does nothing.
- reset-switch: Resets the tab if it was changed, otherwise switches to it.
- switch: Switches to the tab.
- reset: Resets the tab.
- close: Closes the tab.

This provides a more comprehensive and flexible set of options for managing pinned tabs, making the experience more intuitive and customizable.
---
 .../components/preferences/zen-settings.js    | 10 +++----
 .../preferences/zenTabsManagement.inc.xhtml   | 29 +++++++++----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 4421d6674..2a70e8e57 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -1020,14 +1020,14 @@ Preferences.addAll([
     type: 'bool',
     default: false,
   },
-  {
-    id: 'zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut',
-    type: 'bool',
-    default: true,
-  },
   {
     id: 'zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url',
     type: 'bool',
     default: true,
   },
+  {
+    id: 'zen.pinned-tab-manager.close-shortcut-behavior',
+    type: 'string',
+    default: 'switch',
+  },
 ]);
diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index 76c5ab74f..0b9ffda98 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -75,22 +75,19 @@
                 data-l10n-id="zen-pinned-tab-manager-restore-pinned-tabs-to-pinned-url"
                 preference="zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url"/>
 
-      <label><html:h2 data-l10n-id="zen-pinned-tab-manager-close-shortcut-behavior-header"/></label>
-      <description class="description-deemphasized" data-l10n-id="zen-pinned-tab-manager-close-shortcut-behavior-description" />
-      <vbox class="indent">
-            <checkbox id="zenPinnedTabResetOnCloseShortcutEnable"
-                      data-l10n-id="zen-pinned-tab-manager-reset-close-shortcut-enabled"
-                      preference="zen.pinned-tab-manager.reset-pinned-tab-on-close-shortcut"/>
-            <checkbox id="zenPinnedTabUnloadOnCloseShortcutEnable"
-                      data-l10n-id="zen-pinned-tab-manager-unload-close-shortcut-enabled"
-                      preference="zen.pinned-tab-manager.unload-pinned-tab-on-close-shortcut"/>
-            <checkbox id="zenPinnedTabChangeOnCloseShortcutEnable"
-                      data-l10n-id="zen-pinned-tab-manager-change-close-shortcut-enabled"
-                      preference="zen.pinned-tab-manager.change-pinned-tab-on-close-shortcut"/>
-            <checkbox id="zenPinnedTabCloseOnCloseShortcutEnable"
-                      data-l10n-id="zen-pinned-tab-manager-close-close-shortcut-enabled"
-                      preference="zen.pinned-tab-manager.close-pinned-tab-on-close-shortcut"/>
-      </vbox>
+      <hbox align="center">
+            <label id="zenPinnedTabCloseShortcutBehaviorLabel" data-l10n-id="zen-pinned-tab-manager-close-shortcut-behavior-label"/>
+            <menulist id="zenPinnedTabCloseShortcutBehavior" preference="zen.pinned-tab-manager.close-shortcut-behavior">
+                  <menupopup>
+                        <menuitem data-l10n-id="zen-pinned-tab-manager-reset-unload-switch-close-shortcut-option" value="reset-unload-switch"/>
+                        <menuitem data-l10n-id="zen-pinned-tab-manager-unload-switch-close-shortcut-option" value="unload-switch"/>
+                        <menuitem data-l10n-id="zen-pinned-tab-manager-reset-switch-close-shortcut-option" value="reset-switch"/>
+                        <menuitem data-l10n-id="zen-pinned-tab-manager-switch-close-shortcut-option" value="switch"/>
+                        <menuitem data-l10n-id="zen-pinned-tab-manager-reset-close-shortcut-option" value="reset"/>
+                        <menuitem data-l10n-id="zen-pinned-tab-manager-close-close-shortcut-option" value="close"/>
+                  </menupopup>
+            </menulist>
+      </hbox>
 </groupbox>
 
 </html:template>