From cf0662d0a4fb74baf3f40836e09048e09c359418 Mon Sep 17 00:00:00 2001
From: Vrezh Fedora <vrezhraiden@gmail.com>
Date: Thu, 27 Feb 2025 12:09:00 +0100
Subject: [PATCH 001/114] feat(glance): glance buttons fix overflow
---
src/browser/base/content/zen-glance.inc.xhtml | 8 +-
.../base/content/zen-styles/zen-glance.css | 11 +-
.../base/zen-components/ZenGlanceManager.mjs | 119 +++++++++++-------
3 files changed, 87 insertions(+), 51 deletions(-)
diff --git a/src/browser/base/content/zen-glance.inc.xhtml b/src/browser/base/content/zen-glance.inc.xhtml
index 64d5a0703..02a9b0c68 100644
--- a/src/browser/base/content/zen-glance.inc.xhtml
+++ b/src/browser/base/content/zen-glance.inc.xhtml
@@ -1,4 +1,6 @@
-<vbox id="zen-glance-sidebar-container" hidden="true">
- <toolbarbutton id="zen-glance-sidebar-close" class="toolbarbutton-1" oncommand="gZenGlanceManager.closeGlance({ onTabClose: true })"/>
- <toolbarbutton id="zen-glance-sidebar-open" class="toolbarbutton-1" oncommand="gZenGlanceManager.fullyOpenGlance()"/>
+<vbox id="glance-wrapper" style="position: relative; overflow: visible;">
+ <vbox id="zen-glance-sidebar-container" hidden="true">
+ <toolbarbutton id="zen-glance-sidebar-close" class="toolbarbutton-1" oncommand="gZenGlanceManager.closeGlance({ onTabClose: true })"/>
+ <toolbarbutton id="zen-glance-sidebar-open" class="toolbarbutton-1" oncommand="gZenGlanceManager.fullyOpenGlance()"/>
+ </vbox>
</vbox>
diff --git a/src/browser/base/content/zen-styles/zen-glance.css b/src/browser/base/content/zen-styles/zen-glance.css
index 4ea37f5db..7c175e75f 100644
--- a/src/browser/base/content/zen-styles/zen-glance.css
+++ b/src/browser/base/content/zen-styles/zen-glance.css
@@ -9,6 +9,12 @@
visibility: inherit;
}
+#glance-wrapper {
+ position: relative;
+ overflow: visible;
+ left: 2%;
+}
+
#zen-glance-sidebar-container {
position: absolute;
display: flex;
@@ -23,7 +29,6 @@
padding: 5px;
gap: 12px;
- left: 2%;
& toolbarbutton {
width: 32px;
@@ -49,6 +54,10 @@
}
}
+#zen-glance-sidebar-container[hidden='true'] {
+ display: none;
+}
+
.browserSidebarContainer.zen-glance-overlay {
box-shadow: none !important;
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 8040dd7c5..a0c963e92 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -11,36 +11,31 @@
window.addEventListener('TabClose', this.onTabClose.bind(this));
window.addEventListener('TabSelect', this.onLocationChange.bind(this));
+ ChromeUtils.defineLazyGetter(this, 'sidebarButtons', () => document.getElementById('zen-glance-sidebar-container'));
+ document.getElementById('tabbrowser-tabpanels').addEventListener('click', this.onOverlayClick.bind(this));
+ Services.obs.addObserver(this, 'quit-application-requested');
+
XPCOMUtils.defineLazyPreferenceGetter(
this._lazyPref,
'SHOULD_OPEN_EXTERNAL_TABS_IN_GLANCE',
'zen.glance.open-essential-external-links',
false
);
-
- ChromeUtils.defineLazyGetter(this, 'sidebarButtons', () => document.getElementById('zen-glance-sidebar-container'));
-
- document.getElementById('tabbrowser-tabpanels').addEventListener('click', this.onOverlayClick.bind(this));
-
- Services.obs.addObserver(this, 'quit-application-requested');
}
get #currentBrowser() {
return this.#glances.get(this.#currentGlanceID)?.browser;
}
-
get #currentTab() {
return this.#glances.get(this.#currentGlanceID)?.tab;
}
-
get #currentParentTab() {
return this.#glances.get(this.#currentGlanceID)?.parentTab;
}
+ // If the user presses Escape while a Glance is open, close it
onKeyDown(event) {
- if (event.defaultPrevented) {
- return;
- }
+ if (event.defaultPrevented) return;
if (event.key === 'Escape' && this.#currentGlanceID) {
event.preventDefault();
event.stopPropagation();
@@ -49,6 +44,7 @@
}
onOverlayClick(event) {
+ // If user clicks outside content area, close glance
if (event.target === this.overlay && event.originalTarget !== this.contentWrapper) {
this.closeGlance({ onTabClose: true });
}
@@ -63,16 +59,18 @@
}
onUnload() {
- // clear everything
+ // Clean up all open Glances
for (let [id, glance] of this.#glances) {
gBrowser.removeTab(glance.tab, { animate: false });
}
}
+ // Figure out where to insert new tabs
getTabPosition(tab) {
return Math.max(gBrowser._numVisiblePinTabs, tab._tPos);
}
+ // Create a new tab for Glance
createBrowserElement(url, currentTab, existingTab = null) {
const newTabOptions = {
userContextId: currentTab.getAttribute('usercontextid') || '',
@@ -82,15 +80,21 @@
index: this.getTabPosition(currentTab),
};
currentTab._selected = true;
+
const newUUID = gZenUIManager.generateUuidv4();
const newTab = existingTab ?? gBrowser.addTrustedTab(Services.io.newURI(url).spec, newTabOptions);
+
+ // Example: copy any context ID
if (currentTab.hasAttribute('zenDefaultUserContextId')) {
newTab.setAttribute('zenDefaultUserContextId', true);
}
+
+ // Insert the new tab as a child of the existing tab's content
currentTab.querySelector('.tab-content').appendChild(newTab);
newTab.setAttribute('zen-glance-tab', true);
newTab.setAttribute('glance-id', newUUID);
currentTab.setAttribute('glance-id', newUUID);
+
this.#glances.set(newUUID, {
tab: newTab,
parentTab: currentTab,
@@ -102,12 +106,14 @@
}
fillOverlay(browser) {
+ // Save references to the parent containers
this.overlay = browser.closest('.browserSidebarContainer');
this.browserWrapper = browser.closest('.browserContainer');
this.contentWrapper = browser.closest('.browserStack');
}
showSidebarButtons(animate = false) {
+ // Animate in if hidden
if (this.sidebarButtons.hasAttribute('hidden') && animate) {
gZenUIManager.motion.animate(
this.sidebarButtons.querySelectorAll('toolbarbutton'),
@@ -123,40 +129,57 @@
}
openGlance(data, existingTab = null, ownerTab = null) {
+ // If a glance is already open, do nothing
if (this.#currentBrowser) {
return;
}
+
+ // If the current parent tab is selected, switch to the glance tab
if (gBrowser.selectedTab === this.#currentParentTab) {
gBrowser.selectedTab = this.#currentTab;
return;
}
+
this.animatingOpen = true;
this._animating = true;
+ // Gather initial positions
const initialX = data.x;
const initialY = data.y;
const initialWidth = data.width;
const initialHeight = data.height;
+ // Clean up any leftover states
this.browserWrapper?.removeAttribute('animate');
this.browserWrapper?.removeAttribute('animate-end');
this.browserWrapper?.removeAttribute('animate-full');
this.browserWrapper?.removeAttribute('has-finished-animation');
this.overlay?.removeAttribute('post-fade-out');
+ // Create the new tab
const currentTab = ownerTab ?? gBrowser.selectedTab;
-
const browserElement = this.createBrowserElement(data.url, currentTab, existingTab);
+ // Fill references
this.fillOverlay(browserElement);
+ const container = document.getElementById('glance-wrapper');
+ if (container) {
+ container.appendChild(this.sidebarButtons);
+ }
+
+ // Start overlay
this.overlay.classList.add('zen-glance-overlay');
+ // Animate open
this.browserWrapper.removeAttribute('animate-end');
window.requestAnimationFrame(() => {
+ // "Quick open" logic
this.quickOpenGlance({ dontOpenButtons: true });
+ // Show the sidebar buttons
this.showSidebarButtons(true);
+ // Animate the parent container
gZenUIManager.motion.animate(
this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'),
{
@@ -170,9 +193,12 @@
bounce: 0.2,
}
);
+
+ // Start the transition
this.#currentBrowser.setAttribute('animate-glance-open', true);
this.overlay.removeAttribute('fade-out');
this.browserWrapper.setAttribute('animate', true);
+
const top = initialY + initialHeight / 2;
const left = initialX + initialWidth / 2;
this.browserWrapper.style.top = `${top}px`;
@@ -180,14 +206,19 @@
this.browserWrapper.style.width = `${initialWidth}px`;
this.browserWrapper.style.height = `${initialHeight}px`;
this.browserWrapper.style.opacity = 0.8;
+
+ // Save original position for closing animation
this.#glances.get(this.#currentGlanceID).originalPosition = {
top: this.browserWrapper.style.top,
left: this.browserWrapper.style.left,
width: this.browserWrapper.style.width,
height: this.browserWrapper.style.height,
};
+
this.browserWrapper.style.transform = 'translate(-50%, -50%)';
this.overlay.style.overflow = 'visible';
+
+ // Animate up to final size
gZenUIManager.motion
.animate(
this.browserWrapper,
@@ -231,24 +262,26 @@
this.closingGlance = true;
this._animating = true;
+ // Insert tab at correct index
gBrowser._insertTabAtIndex(this.#currentTab, {
index: this.getTabPosition(this.#currentParentTab),
});
- let quikcCloseZen = false;
if (onTabClose) {
- // Create new tab if no more ex
+ // If there's only one tab left, open a new one
if (gBrowser.tabs.length === 1) {
BrowserCommands.openTab();
return;
}
}
- // do NOT touch here, I don't know what it does, but it works...
+ // do NOT touch here, unknown but functional
this.#currentTab.style.display = 'none';
this.overlay.setAttribute('fade-out', true);
this.overlay.style.pointerEvents = 'none';
this.quickCloseGlance({ justAnimateParent: true, clearID: false });
+
+ // Animate the parent container
const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
gZenUIManager.motion
.animate(
@@ -267,6 +300,8 @@
.then(() => {
this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').removeAttribute('style');
});
+
+ // Animate the browser wrapper back
gZenUIManager.motion
.animate(
this.browserWrapper,
@@ -283,9 +318,8 @@
return;
}
- if (!onTabClose || quikcCloseZen) {
- this.quickCloseGlance({ clearID: false });
- }
+ // Final close
+ this.quickCloseGlance({ clearID: false });
this.overlay.removeAttribute('fade-out');
this.browserWrapper.removeAttribute('animate');
@@ -298,7 +332,7 @@
this.#currentParentTab._visuallySelected = false;
}
- // reset everything
+ // Reset everything
const prevOverlay = this.overlay;
this.browserWrapper = null;
this.overlay = null;
@@ -325,6 +359,10 @@
this._animating = false;
this.closingGlance = false;
+ // Hide the buttons globally whenever we close
+ this.hideSidebarButtons();
+
+ // If we had another Glance queued, open it
if (this.#currentGlanceID) {
this.quickOpenGlance();
}
@@ -344,6 +382,7 @@
parentBrowserContainer.classList.add('zen-glance-background');
parentBrowserContainer.classList.remove('zen-glance-overlay');
parentBrowserContainer.classList.add('deck-selected');
+
this.#currentParentTab.linkedBrowser.zenModeActive = true;
this.#currentParentTab.linkedBrowser.docShellIsActive = true;
this.#currentBrowser.zenModeActive = true;
@@ -360,7 +399,6 @@
quickCloseGlance({ closeCurrentTab = true, closeParentTab = true, justAnimateParent = false, clearID = true } = {}) {
const parentHasBrowser = !!this.#currentParentTab.linkedBrowser;
- this.hideSidebarButtons();
if (parentHasBrowser) {
this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
}
@@ -397,7 +435,7 @@
}
}
- // note: must be async to avoid timing issues
+ // If location changes to a tab with a different glance-id, close the old one
onLocationChange(event) {
const tab = event.target;
if (this.animatingFullOpen || this.closingGlance) {
@@ -440,7 +478,6 @@
return false;
}
this.closeGlance({ onTabClose: true, setNewID: isDifferent ? oldGlanceID : null, isDifferent });
- // only keep continueing tab close if we are not on the currently selected tab
return !isDifferent;
}
return false;
@@ -448,13 +485,9 @@
tabDomainsDiffer(tab1, url2) {
try {
- if (!tab1) {
- return true;
- }
+ if (!tab1) return true;
let url1 = tab1.linkedBrowser.currentURI.spec;
- if (url1.startsWith('about:')) {
- return true;
- }
+ if (url1.startsWith('about:')) return true;
return Services.io.newURI(url1).host !== url2.host;
} catch (e) {
return true;
@@ -476,9 +509,7 @@
onTabOpen(browser, uri) {
let tab = gBrowser.getTabForBrowser(browser);
- if (!tab) {
- return;
- }
+ if (!tab) return;
try {
if (this.shouldOpenTabInGlance(tab, uri)) {
const browserRect = gBrowser.tabbox.getBoundingClientRect();
@@ -512,9 +543,11 @@
this.#currentTab.removeAttribute('glance-id');
this.#currentParentTab.removeAttribute('glance-id');
gBrowser.selectedTab = this.#currentTab;
+
this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
this.#currentParentTab._visuallySelected = false;
this.hideSidebarButtons();
+
if (gReduceMotion) {
this.finishOpeningGlance();
return;
@@ -535,18 +568,11 @@
openGlanceForBookmark(event) {
const activationMethod = Services.prefs.getStringPref('zen.glance.activation-method', 'ctrl');
-
- if (activationMethod === 'ctrl' && !event.ctrlKey) {
- return;
- } else if (activationMethod === 'alt' && !event.altKey) {
- return;
- } else if (activationMethod === 'shift' && !event.shiftKey) {
- return;
- } else if (activationMethod === 'meta' && !event.metaKey) {
- return;
- } else if (activationMethod === 'mantain' || typeof activationMethod === 'undefined') {
- return;
- }
+ if (activationMethod === 'ctrl' && !event.ctrlKey) return;
+ if (activationMethod === 'alt' && !event.altKey) return;
+ if (activationMethod === 'shift' && !event.shiftKey) return;
+ if (activationMethod === 'meta' && !event.metaKey) return;
+ if (activationMethod === 'mantain' || typeof activationMethod === 'undefined') return;
event.preventDefault();
event.stopPropagation();
@@ -559,9 +585,7 @@
width: rect.width,
height: rect.height,
};
-
this.openGlance(data);
-
return false;
}
@@ -570,8 +594,10 @@
}
}
+ // Expose globally
window.gZenGlanceManager = new ZenGlanceManager();
+ // Register window actors if needed
function registerWindowActors() {
if (Services.prefs.getBoolPref('zen.glance.enabled', true)) {
gZenActorsManager.addJSWindowActor('ZenGlance', {
@@ -588,6 +614,5 @@
});
}
}
-
registerWindowActors();
}
From 7f6c5f7211325b6762ebd555ff46698db8dcaac3 Mon Sep 17 00:00:00 2001
From: Vrezh Fedora <vrezhraiden@gmail.com>
Date: Sat, 1 Mar 2025 22:23:49 +0100
Subject: [PATCH 002/114] revert some changes
---
src/browser/base/zen-components/ZenGlanceManager.mjs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index a0c963e92..4b9cdb50b 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -319,7 +319,10 @@
}
// Final close
- this.quickCloseGlance({ clearID: false });
+ if (!onTabClose || quikcCloseZen) {
+ this.quickCloseGlance({ clearID: false });
+ }
+
this.overlay.removeAttribute('fade-out');
this.browserWrapper.removeAttribute('animate');
@@ -359,9 +362,6 @@
this._animating = false;
this.closingGlance = false;
- // Hide the buttons globally whenever we close
- this.hideSidebarButtons();
-
// If we had another Glance queued, open it
if (this.#currentGlanceID) {
this.quickOpenGlance();
@@ -399,6 +399,7 @@
quickCloseGlance({ closeCurrentTab = true, closeParentTab = true, justAnimateParent = false, clearID = true } = {}) {
const parentHasBrowser = !!this.#currentParentTab.linkedBrowser;
+ this.hideSidebarButtons();
if (parentHasBrowser) {
this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
}
From c17779b6d4b815dd6b271a9b62966b4b92b4c4ac Mon Sep 17 00:00:00 2001
From: Vrezh Fedora <vrezhraiden@gmail.com>
Date: Sat, 1 Mar 2025 22:26:46 +0100
Subject: [PATCH 003/114] revert(var): bring back quikcCloseZen
---
src/browser/base/zen-components/ZenGlanceManager.mjs | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 4b9cdb50b..c10f68095 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -267,6 +267,7 @@
index: this.getTabPosition(this.#currentParentTab),
});
+ let quikcCloseZen = false;
if (onTabClose) {
// If there's only one tab left, open a new one
if (gBrowser.tabs.length === 1) {
From 02a860ba19c6bc05202a0b01e90d313b1e95bcd4 Mon Sep 17 00:00:00 2001
From: Vrezh Fedora <vrezhraiden@gmail.com>
Date: Fri, 14 Mar 2025 22:16:55 +0900
Subject: [PATCH 004/114] Remove inline styles from glance-wrapper element
---
src/browser/base/content/zen-glance.inc.xhtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/browser/base/content/zen-glance.inc.xhtml b/src/browser/base/content/zen-glance.inc.xhtml
index 02a9b0c68..bddab1b14 100644
--- a/src/browser/base/content/zen-glance.inc.xhtml
+++ b/src/browser/base/content/zen-glance.inc.xhtml
@@ -1,4 +1,4 @@
-<vbox id="glance-wrapper" style="position: relative; overflow: visible;">
+<vbox id="glance-wrapper">
<vbox id="zen-glance-sidebar-container" hidden="true">
<toolbarbutton id="zen-glance-sidebar-close" class="toolbarbutton-1" oncommand="gZenGlanceManager.closeGlance({ onTabClose: true })"/>
<toolbarbutton id="zen-glance-sidebar-open" class="toolbarbutton-1" oncommand="gZenGlanceManager.fullyOpenGlance()"/>
From c3d09c486c6ae1f2c1d20dce1f611b13066ed01a Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Sat, 22 Mar 2025 08:46:40 +0700
Subject: [PATCH 005/114] fix: import string to pip window
---
.../pictureinpicture/content/player-xhtml.patch | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/toolkit/components/pictureinpicture/content/player-xhtml.patch b/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
index 92d9b9543..6c0086210 100644
--- a/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
+++ b/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
@@ -1,8 +1,16 @@
diff --git a/toolkit/components/pictureinpicture/content/player.xhtml b/toolkit/components/pictureinpicture/content/player.xhtml
-index 440ce51e8e67e4d3a7bdcb78f38f2fb6684c9848..6b48a3178f9de460dd3b08728f5638ef2751de21 100644
+index 440ce51e8e67e4d3a7bdcb78f38f2fb6684c9848..3db687ff753c47faf2dac63183f025c5ff456250 100644
--- a/toolkit/components/pictureinpicture/content/player.xhtml
+++ b/toolkit/components/pictureinpicture/content/player.xhtml
-@@ -52,13 +52,22 @@
+@@ -14,6 +14,7 @@
+ <meta charset="utf-8"/>
+ <link rel="stylesheet" href="chrome://global/skin/pictureinpicture/player.css"/>
+ <link rel="localization" href="toolkit/pictureinpicture/pictureinpicture.ftl"/>
++ <link rel="localization" href="browser/zen-general.ftl"/>
+ <link rel="localization" href="browser/browserSets.ftl"/>
+ <script src="chrome://global/content/pictureinpicture/player.js"></script>
+ <title data-l10n-id="pictureinpicture-player-title"></title>
+@@ -52,13 +53,22 @@
tabindex="10"
#endif
/>
From c2f2a589ed1591009f7e8b30352f2de11d23d5a3 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Sat, 22 Mar 2025 08:52:39 +0700
Subject: [PATCH 006/114] shorter export
---
.../pictureinpicture/content/player-xhtml.patch | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/toolkit/components/pictureinpicture/content/player-xhtml.patch b/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
index 6c0086210..ff25ccce3 100644
--- a/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
+++ b/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
@@ -1,15 +1,15 @@
diff --git a/toolkit/components/pictureinpicture/content/player.xhtml b/toolkit/components/pictureinpicture/content/player.xhtml
-index 440ce51e8e67e4d3a7bdcb78f38f2fb6684c9848..3db687ff753c47faf2dac63183f025c5ff456250 100644
+index 440ce51e8e67e4d3a7bdcb78f38f2fb6684c9848..38912579310314a13d516328ec770db6b589d243 100644
--- a/toolkit/components/pictureinpicture/content/player.xhtml
+++ b/toolkit/components/pictureinpicture/content/player.xhtml
-@@ -14,6 +14,7 @@
- <meta charset="utf-8"/>
- <link rel="stylesheet" href="chrome://global/skin/pictureinpicture/player.css"/>
- <link rel="localization" href="toolkit/pictureinpicture/pictureinpicture.ftl"/>
-+ <link rel="localization" href="browser/zen-general.ftl"/>
+@@ -17,6 +17,7 @@
<link rel="localization" href="browser/browserSets.ftl"/>
<script src="chrome://global/content/pictureinpicture/player.js"></script>
<title data-l10n-id="pictureinpicture-player-title"></title>
++ <link rel="localization" href="browser/zen-general.ftl"/>
+ </head>
+
+ <body>
@@ -52,13 +53,22 @@
tabindex="10"
#endif
From d9d8437b6dd9aa581e3b101ed54a5b1b8e880be1 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Sat, 22 Mar 2025 09:46:20 +0700
Subject: [PATCH 007/114] fix(MediaController): recheck overflow on metadata
change
---
src/browser/base/zen-components/ZenMediaController.mjs | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/browser/base/zen-components/ZenMediaController.mjs b/src/browser/base/zen-components/ZenMediaController.mjs
index 067451a36..19c28220a 100644
--- a/src/browser/base/zen-components/ZenMediaController.mjs
+++ b/src/browser/base/zen-components/ZenMediaController.mjs
@@ -396,6 +396,13 @@ class ZenMediaController {
const metadata = event.target.getMetadata();
this.mediaTitle.textContent = metadata.title || '';
this.mediaArtist.textContent = metadata.artist || '';
+
+ const mediaInfoElements = [this.mediaTitle, this.mediaArtist];
+ for (const element of mediaInfoElements) {
+ element.removeAttribute('overflow');
+ }
+
+ this.addLabelOverflows(mediaInfoElements);
}
_onPictureInPictureModeChange(event) {
From 8959adf9e094fd7897a6f4ce90b4228a28b5aa92 Mon Sep 17 00:00:00 2001
From: NOCanoa <158103554+nocanoa@users.noreply.github.com>
Date: Sat, 22 Mar 2025 22:30:19 +0000
Subject: [PATCH 008/114] Update README.md to set user expectations
Signed-off-by: NOCanoa <158103554+nocanoa@users.noreply.github.com>
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index d1ed17ff0..961798cef 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
[](https://crowdin.com/project/zen-browser)
[](https://github.com/zen-browser/desktop/actions/workflows/build.yml)
-✨ Experience tranquillity while browsing the web without people tracking you! Zen is a privacy-focused browser that blocks trackers, ads, and other unwanted content while offering the best browsing experience!
+✨ Experience tranquillity while browsing the internet with Zen! Our mission is to give you a balance between speed, privacy and productivity
<div flex="true">
<a href="https://zen-browser.app/download">
From d1505287b2750ec3e8895675025cd2fb9ff4b086 Mon Sep 17 00:00:00 2001
From: NOCanoa <158103554+nocanoa@users.noreply.github.com>
Date: Sat, 22 Mar 2025 22:30:56 +0000
Subject: [PATCH 009/114] Forgot ! xP
Signed-off-by: NOCanoa <158103554+nocanoa@users.noreply.github.com>
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 961798cef..bd43bbb45 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
[](https://crowdin.com/project/zen-browser)
[](https://github.com/zen-browser/desktop/actions/workflows/build.yml)
-✨ Experience tranquillity while browsing the internet with Zen! Our mission is to give you a balance between speed, privacy and productivity
+✨ Experience tranquillity while browsing the internet with Zen! Our mission is to give you a balance between speed, privacy and productivity!
<div flex="true">
<a href="https://zen-browser.app/download">
From 796a52625ef7889a483c74c704bc8aa60abee01d Mon Sep 17 00:00:00 2001
From: Jarm7 <kotek.moorkotek@gmail.com>
Date: Sun, 23 Mar 2025 00:22:08 +0100
Subject: [PATCH 010/114] Update update_newtab.py
feat: Enhance error handling and logging in newtab update script
Add directory existence validation for NEW_TAB_DIR and ENGINE_DIR
Implement detailed subprocess output capturing with error logging
Introduce comprehensive exception handling with specific error types
Signed-off-by: Jarm7 <kotek.moorkotek@gmail.com>
---
scripts/update_newtab.py | 80 ++++++++++++++++++++++++++++------------
1 file changed, 56 insertions(+), 24 deletions(-)
diff --git a/scripts/update_newtab.py b/scripts/update_newtab.py
index 0a8b4aeb1..e0898b8f7 100644
--- a/scripts/update_newtab.py
+++ b/scripts/update_newtab.py
@@ -2,40 +2,72 @@
import subprocess
import logging
-# Set up logging
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(
+ level=logging.INFO,
+ format='%(asctime)s - %(levelname)s - %(message)s'
+)
-# Constants for paths
NEW_TAB_DIR = "./engine/browser/components/newtab"
ENGINE_DIR = "./engine"
NPM_INSTALL_COMMANDS = ["npm install", "npm install meow@9.0.0"]
BUNDLE_COMMAND = "npm run bundle --prefix=browser/components/newtab"
-
def install_dependencies():
- """Install necessary npm packages for the newtab component."""
- for command in NPM_INSTALL_COMMANDS:
- logging.info(f"Running command: {command} in {NEW_TAB_DIR}")
- subprocess.run(command.split(), cwd=NEW_TAB_DIR, check=True)
-
+ if not os.path.isdir(NEW_TAB_DIR):
+ logging.error(f"Directory not found: {NEW_TAB_DIR}")
+ raise FileNotFoundError(f"New tab directory {NEW_TAB_DIR} does not exist")
+
+ for command in NPM_INSTALL_COMMANDS:
+ try:
+ logging.info(f"Running command: {command} in {NEW_TAB_DIR}")
+ subprocess.run(
+ command.split(),
+ cwd=NEW_TAB_DIR,
+ check=True,
+ capture_output=True,
+ text=True
+ )
+ logging.info(f"Successfully executed: {command}")
+ except subprocess.CalledProcessError as e:
+ logging.error(f"Command failed: {command} - {e.stderr}")
+ raise
def bundle_newtab_components():
- """Bundle the newtab components."""
- logging.info(f"Bundling newtab components in {ENGINE_DIR}")
- subprocess.run(BUNDLE_COMMAND.split(), cwd=ENGINE_DIR, check=True)
-
+ if not os.path.isdir(ENGINE_DIR):
+ logging.error(f"Directory not found: {ENGINE_DIR}")
+ raise FileNotFoundError(f"Engine directory {ENGINE_DIR} does not exist")
+
+ try:
+ logging.info(f"Bundling newtab components in {ENGINE_DIR}")
+ result = subprocess.run(
+ BUNDLE_COMMAND.split(),
+ cwd=ENGINE_DIR,
+ check=True,
+ capture_output=True,
+ text=True
+ )
+ logging.info(f"Bundle completed successfully: {result.stdout}")
+ except subprocess.CalledProcessError as e:
+ logging.error(f"Bundle failed: {e.stderr}")
+ raise
def update_newtab(init: bool = True):
- """Update the newtab components, optionally initializing dependencies."""
- try:
- if init:
- install_dependencies()
-
- bundle_newtab_components()
- except subprocess.CalledProcessError as e:
- logging.error(f"An error occurred: {e}")
- raise
-
+ try:
+ if init:
+ logging.info("Starting dependency installation")
+ install_dependencies()
+ logging.info("Dependencies installed successfully")
+
+ logging.info("Starting bundle process")
+ bundle_newtab_components()
+ logging.info("Newtab update completed successfully")
+
+ except (subprocess.CalledProcessError, FileNotFoundError) as e:
+ logging.error(f"Update process failed: {str(e)}")
+ raise
+ except Exception as e:
+ logging.error(f"Unexpected error: {str(e)}")
+ raise
if __name__ == "__main__":
- update_newtab(init=False)
+ update_newtab(init=False)
From 8939e889f0684d8cf7ad21d53a29bc1d41e7507e Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Sun, 23 Mar 2025 10:41:26 +0100
Subject: [PATCH 011/114] Revert "Fix: fixed overflowing glance buttons when
sidebar is opened"
---
src/browser/base/content/zen-glance.inc.xhtml | 8 +-
.../base/content/zen-styles/zen-glance.css | 11 +-
.../base/zen-components/ZenGlanceManager.mjs | 100 +++++++-----------
3 files changed, 41 insertions(+), 78 deletions(-)
diff --git a/src/browser/base/content/zen-glance.inc.xhtml b/src/browser/base/content/zen-glance.inc.xhtml
index 2a993f821..51891d19c 100644
--- a/src/browser/base/content/zen-glance.inc.xhtml
+++ b/src/browser/base/content/zen-glance.inc.xhtml
@@ -1,6 +1,4 @@
-<vbox id="glance-wrapper">
- <vbox id="zen-glance-sidebar-container" hidden="true">
- <toolbarbutton id="zen-glance-sidebar-close" data-l10n-id="zen-general-confrim" class="toolbarbutton-1" oncommand="gZenGlanceManager.closeGlance({ onTabClose: true })"/>
- <toolbarbutton id="zen-glance-sidebar-open" class="toolbarbutton-1" oncommand="gZenGlanceManager.fullyOpenGlance()"/>
- </vbox>
+<vbox id="zen-glance-sidebar-container" hidden="true">
+ <toolbarbutton id="zen-glance-sidebar-close" data-l10n-id="zen-general-confirm" class="toolbarbutton-1" oncommand="gZenGlanceManager.closeGlance({ onTabClose: true })"/>
+ <toolbarbutton id="zen-glance-sidebar-open" class="toolbarbutton-1" oncommand="gZenGlanceManager.fullyOpenGlance()"/>
</vbox>
diff --git a/src/browser/base/content/zen-styles/zen-glance.css b/src/browser/base/content/zen-styles/zen-glance.css
index 6dacaa7f0..8dcd4513f 100644
--- a/src/browser/base/content/zen-styles/zen-glance.css
+++ b/src/browser/base/content/zen-styles/zen-glance.css
@@ -9,12 +9,6 @@
visibility: inherit;
}
-#glance-wrapper {
- position: relative;
- overflow: visible;
- left: 2%;
-}
-
#zen-glance-sidebar-container {
position: absolute;
display: flex;
@@ -29,6 +23,7 @@
padding: 5px;
gap: 12px;
+ left: 2%;
& toolbarbutton {
width: 32px;
@@ -93,10 +88,6 @@
}
}
-#zen-glance-sidebar-container[hidden='true'] {
- display: none;
-}
-
.browserSidebarContainer.zen-glance-overlay {
box-shadow: none !important;
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 5af4e8196..f6865c5dd 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -12,30 +12,33 @@
window.addEventListener('TabClose', this.onTabClose.bind(this));
window.addEventListener('TabSelect', this.onLocationChange.bind(this));
- ChromeUtils.defineLazyGetter(this, 'sidebarButtons', () => document.getElementById('zen-glance-sidebar-container'));
- document.getElementById('tabbrowser-tabpanels').addEventListener('click', this.onOverlayClick.bind(this));
- Services.obs.addObserver(this, 'quit-application-requested');
-
XPCOMUtils.defineLazyPreferenceGetter(
this._lazyPref,
'SHOULD_OPEN_EXTERNAL_TABS_IN_GLANCE',
'zen.glance.open-essential-external-links',
false
);
+
+ ChromeUtils.defineLazyGetter(this, 'sidebarButtons', () => document.getElementById('zen-glance-sidebar-container'));
+
+ document.getElementById('tabbrowser-tabpanels').addEventListener('click', this.onOverlayClick.bind(this));
+
+ Services.obs.addObserver(this, 'quit-application-requested');
}
get #currentBrowser() {
return this.#glances.get(this.#currentGlanceID)?.browser;
}
+
get #currentTab() {
return this.#glances.get(this.#currentGlanceID)?.tab;
}
+
get #currentParentTab() {
return this.#glances.get(this.#currentGlanceID)?.parentTab;
}
onOverlayClick(event) {
- // If user clicks outside content area, close glance
if (event.target === this.overlay && event.originalTarget !== this.contentWrapper) {
this.closeGlance({ onTabClose: true });
}
@@ -50,18 +53,16 @@
}
onUnload() {
- // Clean up all open Glances
+ // clear everything
for (let [id, glance] of this.#glances) {
gBrowser.removeTab(glance.tab, { animate: false });
}
}
- // Figure out where to insert new tabs
getTabPosition(tab) {
return Math.max(gBrowser.pinnedTabCount, tab._tPos);
}
- // Create a new tab for Glance
createBrowserElement(url, currentTab, existingTab = null) {
const newTabOptions = {
userContextId: currentTab.getAttribute('usercontextid') || '',
@@ -71,21 +72,15 @@
index: this.getTabPosition(currentTab) + 1,
};
currentTab._selected = true;
-
const newUUID = gZenUIManager.generateUuidv4();
const newTab = existingTab ?? gBrowser.addTrustedTab(Services.io.newURI(url).spec, newTabOptions);
-
- // Example: copy any context ID
if (currentTab.hasAttribute('zenDefaultUserContextId')) {
newTab.setAttribute('zenDefaultUserContextId', true);
}
-
- // Insert the new tab as a child of the existing tab's content
currentTab.querySelector('.tab-content').appendChild(newTab);
newTab.setAttribute('zen-glance-tab', true);
newTab.setAttribute('glance-id', newUUID);
currentTab.setAttribute('glance-id', newUUID);
-
this.#glances.set(newUUID, {
tab: newTab,
parentTab: currentTab,
@@ -97,14 +92,12 @@
}
fillOverlay(browser) {
- // Save references to the parent containers
this.overlay = browser.closest('.browserSidebarContainer');
this.browserWrapper = browser.closest('.browserContainer');
this.contentWrapper = browser.closest('.browserStack');
}
showSidebarButtons(animate = false) {
- // Animate in if hidden
if (this.sidebarButtons.hasAttribute('hidden') && animate) {
gZenUIManager.motion.animate(
this.sidebarButtons.querySelectorAll('toolbarbutton'),
@@ -120,57 +113,40 @@
}
openGlance(data, existingTab = null, ownerTab = null) {
- // If a glance is already open, do nothing
if (this.#currentBrowser) {
return;
}
-
- // If the current parent tab is selected, switch to the glance tab
if (gBrowser.selectedTab === this.#currentParentTab) {
gBrowser.selectedTab = this.#currentTab;
return;
}
-
this.animatingOpen = true;
this._animating = true;
- // Gather initial positions
const initialX = data.x;
const initialY = data.y;
const initialWidth = data.width;
const initialHeight = data.height;
- // Clean up any leftover states
this.browserWrapper?.removeAttribute('animate');
this.browserWrapper?.removeAttribute('animate-end');
this.browserWrapper?.removeAttribute('animate-full');
this.browserWrapper?.removeAttribute('has-finished-animation');
this.overlay?.removeAttribute('post-fade-out');
- // Create the new tab
const currentTab = ownerTab ?? gBrowser.selectedTab;
+
const browserElement = this.createBrowserElement(data.url, currentTab, existingTab);
- // Fill references
this.fillOverlay(browserElement);
- const container = document.getElementById('glance-wrapper');
- if (container) {
- container.appendChild(this.sidebarButtons);
- }
-
- // Start overlay
this.overlay.classList.add('zen-glance-overlay');
- // Animate open
this.browserWrapper.removeAttribute('animate-end');
window.requestAnimationFrame(() => {
- // "Quick open" logic
this.quickOpenGlance({ dontOpenButtons: true });
- // Show the sidebar buttons
this.showSidebarButtons(true);
- // Animate the parent container
gZenUIManager.motion.animate(
this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'),
{
@@ -184,12 +160,9 @@
bounce: 0.2,
}
);
-
- // Start the transition
this.#currentBrowser.setAttribute('animate-glance-open', true);
this.overlay.removeAttribute('fade-out');
this.browserWrapper.setAttribute('animate', true);
-
const top = initialY + initialHeight / 2;
const left = initialX + initialWidth / 2;
this.browserWrapper.style.top = `${top}px`;
@@ -197,19 +170,14 @@
this.browserWrapper.style.width = `${initialWidth}px`;
this.browserWrapper.style.height = `${initialHeight}px`;
this.browserWrapper.style.opacity = 0.8;
-
- // Save original position for closing animation
this.#glances.get(this.#currentGlanceID).originalPosition = {
top: this.browserWrapper.style.top,
left: this.browserWrapper.style.left,
width: this.browserWrapper.style.width,
height: this.browserWrapper.style.height,
};
-
this.browserWrapper.style.transform = 'translate(-50%, -50%)';
this.overlay.style.overflow = 'visible';
-
- // Animate up to final size
gZenUIManager.motion
.animate(
this.browserWrapper,
@@ -268,27 +236,24 @@
this.closingGlance = true;
this._animating = true;
- // Insert tab at correct index
gBrowser._insertTabAtIndex(this.#currentTab, {
index: this.getTabPosition(this.#currentParentTab),
});
let quikcCloseZen = false;
if (onTabClose) {
- // If there's only one tab left, open a new one
+ // Create new tab if no more ex
if (gBrowser.tabs.length === 1) {
BrowserCommands.openTab();
return;
}
}
- // do NOT touch here, unknown but functional
+ // do NOT touch here, I don't know what it does, but it works...
this.#currentTab.style.display = 'none';
this.overlay.setAttribute('fade-out', true);
this.overlay.style.pointerEvents = 'none';
this.quickCloseGlance({ justAnimateParent: true, clearID: false });
-
- // Animate the parent container
const originalPosition = this.#glances.get(this.#currentGlanceID).originalPosition;
gZenUIManager.motion
.animate(
@@ -324,11 +289,9 @@
return;
}
- // Final close
if (!onTabClose || quikcCloseZen) {
this.quickCloseGlance({ clearID: false });
}
-
this.overlay.removeAttribute('fade-out');
this.browserWrapper.removeAttribute('animate');
@@ -367,7 +330,6 @@
this._animating = false;
this.closingGlance = false;
- // If we had another Glance queued, open it
if (this.#currentGlanceID) {
this.quickOpenGlance();
}
@@ -387,7 +349,6 @@
parentBrowserContainer.classList.add('zen-glance-background');
parentBrowserContainer.classList.remove('zen-glance-overlay');
parentBrowserContainer.classList.add('deck-selected');
-
this.#currentParentTab.linkedBrowser.zenModeActive = true;
this.#currentParentTab.linkedBrowser.docShellIsActive = true;
this.#currentBrowser.zenModeActive = true;
@@ -493,6 +454,7 @@
return false;
}
this.closeGlance({ onTabClose: true, setNewID: isDifferent ? oldGlanceID : null, isDifferent });
+ // only keep continueing tab close if we are not on the currently selected tab
return !isDifferent;
}
return false;
@@ -500,9 +462,13 @@
tabDomainsDiffer(tab1, url2) {
try {
- if (!tab1) return true;
+ if (!tab1) {
+ return true;
+ }
let url1 = tab1.linkedBrowser.currentURI.spec;
- if (url1.startsWith('about:')) return true;
+ if (url1.startsWith('about:')) {
+ return true;
+ }
return Services.io.newURI(url1).host !== url2.host;
} catch (e) {
return true;
@@ -523,7 +489,9 @@
onTabOpen(browser, uri) {
let tab = gBrowser.getTabForBrowser(browser);
- if (!tab) return;
+ if (!tab) {
+ return;
+ }
try {
if (this.shouldOpenTabInGlance(tab, uri)) {
const browserRect = gBrowser.tabbox.getBoundingClientRect();
@@ -561,11 +529,9 @@
this.#currentTab.removeAttribute('glance-id');
this.#currentParentTab.removeAttribute('glance-id');
gBrowser.selectedTab = this.#currentTab;
-
this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
this.#currentParentTab._visuallySelected = false;
this.hideSidebarButtons();
-
if (gReduceMotion) {
this.finishOpeningGlance();
return;
@@ -586,11 +552,18 @@
openGlanceForBookmark(event) {
const activationMethod = Services.prefs.getStringPref('zen.glance.activation-method', 'ctrl');
- if (activationMethod === 'ctrl' && !event.ctrlKey) return;
- if (activationMethod === 'alt' && !event.altKey) return;
- if (activationMethod === 'shift' && !event.shiftKey) return;
- if (activationMethod === 'meta' && !event.metaKey) return;
- if (activationMethod === 'mantain' || typeof activationMethod === 'undefined') return;
+
+ if (activationMethod === 'ctrl' && !event.ctrlKey) {
+ return;
+ } else if (activationMethod === 'alt' && !event.altKey) {
+ return;
+ } else if (activationMethod === 'shift' && !event.shiftKey) {
+ return;
+ } else if (activationMethod === 'meta' && !event.metaKey) {
+ return;
+ } else if (activationMethod === 'mantain' || typeof activationMethod === 'undefined') {
+ return;
+ }
event.preventDefault();
event.stopPropagation();
@@ -603,7 +576,9 @@
width: rect.width,
height: rect.height,
};
+
this.openGlance(data);
+
return false;
}
@@ -612,10 +587,8 @@
}
}
- // Expose globally
window.gZenGlanceManager = new ZenGlanceManager();
- // Register window actors if needed
function registerWindowActors() {
if (Services.prefs.getBoolPref('zen.glance.enabled', true)) {
gZenActorsManager.addJSWindowActor('ZenGlance', {
@@ -636,5 +609,6 @@
});
}
}
+
registerWindowActors();
}
From 569ee488f53379603e976ef2899f2bf0dbfa02c2 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 23 Mar 2025 11:31:21 +0100
Subject: [PATCH 012/114] fix(build): remove duplicate echo statement for
GITHUB_REPOSITORY_OWNER in workflow
---
.github/workflows/build.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 27653b5bb..e78c79946 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,7 +51,6 @@ jobs:
echo "update_branch: ${{ inputs.update_branch }}"
echo "GITHUB_REPOSITORY: ${{ github.repository }}"
echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}"
- echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}"
echo "GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}"
buildid:
From e79afc87caef469b48f87a6512906b639db22911 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 23 Mar 2025 23:54:07 +0100
Subject: [PATCH 013/114] refactor(ZenCompactMode): comment out relatedTarget
check for hover state experimentation
---
src/browser/base/zen-components/ZenCompactMode.mjs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index 03c7e8c7b..d444ac9fa 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -394,9 +394,10 @@ var gZenCompactModeManager = {
// When moving the cursor between the url bar and bookmarks, or in-between bookmarks in the bookmark bar, the
// mouseLeave event is triggered without a relatedTarget.
- if (event.relatedTarget == null) {
- return;
- }
+ // TODO: Experiment with this for some time, see if people still have issues with the hover state
+ //if (event.relatedTarget == null) {
+ // return;
+ //}
// If it's a child element but not the target, ignore the event
if (target.contains(event.explicitOriginalTarget) && event.explicitOriginalTarget !== target) {
From 09dd3c94c13b020120d4213f4c74888c9a211d98 Mon Sep 17 00:00:00 2001
From: Slowlife <slowlife1165@gmail.com>
Date: Mon, 24 Mar 2025 10:21:51 +0700
Subject: [PATCH 014/114] fix: media controls config typo
Signed-off-by: Slowlife <slowlife1165@gmail.com>
---
src/browser/app/profile/zen-browser.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 6df26cef6..70d505365 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -90,7 +90,7 @@ pref('zen.tabs.show-newtab-vertical', true);
pref('zen.view.show-newtab-button-border-top', false);
pref('zen.view.show-newtab-button-top', true);
-perf('zen.mediacontrols.enabled', true);
+pref('zen.mediacontrols.enabled', true);
#ifdef MOZILLA_OFFICIAL
pref('zen.rice.api.url', 'https://share.zen-browser.app', locked);
From 19ed3fb303cd34136dc5e4de00f59ca647c4d42d Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Mon, 24 Mar 2025 10:40:48 +0700
Subject: [PATCH 015/114] MediaController: update position more frequently
---
src/dom/html/HTMLMediaElement-cpp.patch | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/dom/html/HTMLMediaElement-cpp.patch b/src/dom/html/HTMLMediaElement-cpp.patch
index 412aab2ef..9dc7f44e3 100644
--- a/src/dom/html/HTMLMediaElement-cpp.patch
+++ b/src/dom/html/HTMLMediaElement-cpp.patch
@@ -1,5 +1,5 @@
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
-index 0b8dee1ca22b1f0ddcf7e6a976f606990104b56e..a3a5a7cfcaa8a4719e56988bc917183fa3cc9d10 100644
+index 0b8dee1ca22b1f0ddcf7e6a976f606990104b56e..db31132b67a041abf6bf3e5ed68ab20380fdc293 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -455,6 +455,7 @@ class HTMLMediaElement::MediaControlKeyListener final
@@ -10,3 +10,13 @@ index 0b8dee1ca22b1f0ddcf7e6a976f606990104b56e..a3a5a7cfcaa8a4719e56988bc917183f
NotifyAudibleStateChanged(mIsOwnerAudible
? MediaAudibleState::eAudible
: MediaAudibleState::eInaudible);
+@@ -6952,6 +6953,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
+ DispatchAsyncEvent(std::move(runner));
+ mQueueTimeUpdateRunnerTime = TimeStamp::Now();
+ mLastCurrentTime = CurrentTime();
++ if (aType == TimeupdateType::eMandatory) {
++ mMediaControlKeyListener->NotifyMediaPositionState();
++ }
+ }
+ if (mFragmentEnd >= 0.0 && CurrentTime() >= mFragmentEnd) {
+ Pause();
From a1ab0512b7e9473706e8af7c7c48463ad2147c42 Mon Sep 17 00:00:00 2001
From: "Obscure." <69711181+kritishd8@users.noreply.github.com>
Date: Mon, 24 Mar 2025 15:02:34 +0545
Subject: [PATCH 016/114] Removed weird movement when hovering media player
Signed-off-by: Obscure. <69711181+kritishd8@users.noreply.github.com>
---
src/browser/base/content/zen-styles/zen-media-controls.css | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/browser/base/content/zen-styles/zen-media-controls.css b/src/browser/base/content/zen-styles/zen-media-controls.css
index 3532afffb..fabf87999 100644
--- a/src/browser/base/content/zen-styles/zen-media-controls.css
+++ b/src/browser/base/content/zen-styles/zen-media-controls.css
@@ -141,7 +141,6 @@
background-color: var(--zen-media-control-bg);
backdrop-filter: saturate(3) contrast(2) blur(10px);
width: 100%;
- will-change: transform;
}
.show-on-hover {
From f89478bf67aa0841292f7461bd6f296b75f3538f Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 24 Mar 2025 11:11:05 +0100
Subject: [PATCH 017/114] fix(styles): adjust zen-toast-container positioning
for right-side alignment
---
src/browser/base/content/zen-styles/zen-popup.css | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/browser/base/content/zen-styles/zen-popup.css b/src/browser/base/content/zen-styles/zen-popup.css
index 63fc98beb..8cb651477 100644
--- a/src/browser/base/content/zen-styles/zen-popup.css
+++ b/src/browser/base/content/zen-styles/zen-popup.css
@@ -351,12 +351,19 @@ menuitem {
#zen-toast-container {
position: fixed;
top: calc(var(--zen-element-separation) * 2);
- right: calc(var(--zen-element-separation) * 2);
z-index: 1000;
gap: 1rem;
display: flex;
align-items: end;
+ :root:not([zen-right-side='true']) & {
+ right: calc(var(--zen-element-separation) * 2);
+ }
+
+ :root[zen-right-side='true'] & {
+ left: calc(var(--zen-element-separation) * 2);
+ }
+
& .zen-toast {
padding: 0.9rem 0.8rem;
border-radius: 12px;
From 741ae9eb1ed9d0ae62c5e27a2577c2a627d8d857 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 24 Mar 2025 22:02:04 +0100
Subject: [PATCH 018/114] fix(firefox): update candidate version to 136.0.3 and
update last commit hash
---
firefox-cache/l10n-last-commit-hash | 2 +-
surfer.json | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/firefox-cache/l10n-last-commit-hash b/firefox-cache/l10n-last-commit-hash
index d1765242d..2af534faa 100644
--- a/firefox-cache/l10n-last-commit-hash
+++ b/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-6013afe489c3d5e19c5f0d0f6c3f94b91f5bd7d1
\ No newline at end of file
+e234130176d2813fec2397bbf3a313909565006e
\ No newline at end of file
diff --git a/surfer.json b/surfer.json
index c821cdef9..0f74d16bf 100644
--- a/surfer.json
+++ b/surfer.json
@@ -6,7 +6,7 @@
"version": {
"product": "firefox",
"version": "136.0.2",
- "candidate": "136.0.2"
+ "candidate": "136.0.3"
},
"buildOptions": {
"generateBranding": true
@@ -53,4 +53,4 @@
"licenseType": "MPL-2.0"
},
"updateHostname": "updates.zen-browser.app"
-}
+}
\ No newline at end of file
From 1039f1db38375c0fd731d9bf12a60b042659d11e Mon Sep 17 00:00:00 2001
From: k00lagin <k00lagin@gmail.com>
Date: Tue, 25 Mar 2025 02:06:26 +0500
Subject: [PATCH 019/114] Update ZenThemeMarketplaceChild.sys.mjs
Fix typo intall -> inStall
Signed-off-by: k00lagin <k00lagin@gmail.com>
---
.../zen-components/actors/ZenThemeMarketplaceChild.sys.mjs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs b/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs
index d48c69f05..98422f214 100644
--- a/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs
+++ b/src/browser/base/zen-components/actors/ZenThemeMarketplaceChild.sys.mjs
@@ -50,7 +50,7 @@ export class ZenThemeMarketplaceChild extends JSWindowActorChild {
initiateThemeMarketplace() {
this.contentWindow.setTimeout(() => {
- this.addIntallButtons();
+ this.addInstallButtons();
this.injectMarkplaceAPI();
}, 0);
}
@@ -111,7 +111,7 @@ export class ZenThemeMarketplaceChild extends JSWindowActorChild {
});
}
- async addIntallButtons() {
+ async addInstallButtons() {
const actionButton = this.actionButton;
const actionButtonUnnstall = this.actionButtonUninstall;
const errorMessage = this.contentWindow.document.getElementById('install-theme-error');
From bd5d3c00f1e38bffd5689aebf09453a2aba4e811 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 24 Mar 2025 22:19:49 +0100
Subject: [PATCH 020/114] Formatted the project
---
scripts/update_newtab.py | 106 +++++++++++++------------
src/browser/app/profile/zen-browser.js | 2 +-
2 files changed, 56 insertions(+), 52 deletions(-)
diff --git a/scripts/update_newtab.py b/scripts/update_newtab.py
index e0898b8f7..846e7f045 100644
--- a/scripts/update_newtab.py
+++ b/scripts/update_newtab.py
@@ -12,62 +12,66 @@
NPM_INSTALL_COMMANDS = ["npm install", "npm install meow@9.0.0"]
BUNDLE_COMMAND = "npm run bundle --prefix=browser/components/newtab"
+
def install_dependencies():
- if not os.path.isdir(NEW_TAB_DIR):
- logging.error(f"Directory not found: {NEW_TAB_DIR}")
- raise FileNotFoundError(f"New tab directory {NEW_TAB_DIR} does not exist")
-
- for command in NPM_INSTALL_COMMANDS:
- try:
- logging.info(f"Running command: {command} in {NEW_TAB_DIR}")
- subprocess.run(
- command.split(),
- cwd=NEW_TAB_DIR,
- check=True,
- capture_output=True,
- text=True
- )
- logging.info(f"Successfully executed: {command}")
- except subprocess.CalledProcessError as e:
- logging.error(f"Command failed: {command} - {e.stderr}")
- raise
+ if not os.path.isdir(NEW_TAB_DIR):
+ logging.error(f"Directory not found: {NEW_TAB_DIR}")
+ raise FileNotFoundError(f"New tab directory {NEW_TAB_DIR} does not exist")
-def bundle_newtab_components():
- if not os.path.isdir(ENGINE_DIR):
- logging.error(f"Directory not found: {ENGINE_DIR}")
- raise FileNotFoundError(f"Engine directory {ENGINE_DIR} does not exist")
-
+ for command in NPM_INSTALL_COMMANDS:
try:
- logging.info(f"Bundling newtab components in {ENGINE_DIR}")
- result = subprocess.run(
- BUNDLE_COMMAND.split(),
- cwd=ENGINE_DIR,
- check=True,
- capture_output=True,
- text=True
- )
- logging.info(f"Bundle completed successfully: {result.stdout}")
+ logging.info(f"Running command: {command} in {NEW_TAB_DIR}")
+ subprocess.run(
+ command.split(),
+ cwd=NEW_TAB_DIR,
+ check=True,
+ capture_output=True,
+ text=True
+ )
+ logging.info(f"Successfully executed: {command}")
except subprocess.CalledProcessError as e:
- logging.error(f"Bundle failed: {e.stderr}")
- raise
+ logging.error(f"Command failed: {command} - {e.stderr}")
+ raise
+
+
+def bundle_newtab_components():
+ if not os.path.isdir(ENGINE_DIR):
+ logging.error(f"Directory not found: {ENGINE_DIR}")
+ raise FileNotFoundError(f"Engine directory {ENGINE_DIR} does not exist")
+
+ try:
+ logging.info(f"Bundling newtab components in {ENGINE_DIR}")
+ result = subprocess.run(
+ BUNDLE_COMMAND.split(),
+ cwd=ENGINE_DIR,
+ check=True,
+ capture_output=True,
+ text=True
+ )
+ logging.info(f"Bundle completed successfully: {result.stdout}")
+ except subprocess.CalledProcessError as e:
+ logging.error(f"Bundle failed: {e.stderr}")
+ raise
+
def update_newtab(init: bool = True):
- try:
- if init:
- logging.info("Starting dependency installation")
- install_dependencies()
- logging.info("Dependencies installed successfully")
-
- logging.info("Starting bundle process")
- bundle_newtab_components()
- logging.info("Newtab update completed successfully")
-
- except (subprocess.CalledProcessError, FileNotFoundError) as e:
- logging.error(f"Update process failed: {str(e)}")
- raise
- except Exception as e:
- logging.error(f"Unexpected error: {str(e)}")
- raise
+ try:
+ if init:
+ logging.info("Starting dependency installation")
+ install_dependencies()
+ logging.info("Dependencies installed successfully")
+
+ logging.info("Starting bundle process")
+ bundle_newtab_components()
+ logging.info("Newtab update completed successfully")
+
+ except (subprocess.CalledProcessError, FileNotFoundError) as e:
+ logging.error(f"Update process failed: {str(e)}")
+ raise
+ except Exception as e:
+ logging.error(f"Unexpected error: {str(e)}")
+ raise
+
if __name__ == "__main__":
- update_newtab(init=False)
+ update_newtab(init=False)
diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 70d505365..f97d41c21 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -256,7 +256,7 @@ pref('browser.migrate.opera.enabled', true);
// pref('network.trr.mode', 5);
// security: They must enable this themselves, to avoid people downloading malware
-pref('xpinstall.signatures.required', false);
+pref('xpinstall.signatures.required', true);
// Experimental Zen Features
// Strategy to use for bytecode cache (Thanks https://github.com/gunir)
From 342186584e8ee581a595322b645c2563d558933a Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 24 Mar 2025 23:58:06 +0100
Subject: [PATCH 021/114] Added support for split views persisting between
sessions
---
.../base/content/zen-styles/zen-folders.css | 5 +
.../base/content/zen-styles/zen-popup.css | 2 +-
.../base/zen-components/ZenViewSplitter.mjs | 27 +++++
.../base/zen-components/ZenWorkspaces.mjs | 20 +++-
.../sessionstore/SessionStore-sys-mjs.patch | 28 ++++-
.../sessionstore/TabGroupState-sys-mjs.patch | 14 +++
.../sessionstore/TabState-sys-mjs.patch | 9 +-
.../tabbrowser/content/tabbrowser-js.patch | 109 ++++++++++++------
.../tabbrowser/content/tabs-js.patch | 11 +-
src/toolkit/content/widgets/findbar-js.patch | 12 ++
10 files changed, 184 insertions(+), 53 deletions(-)
create mode 100644 src/browser/components/sessionstore/TabGroupState-sys-mjs.patch
create mode 100644 src/toolkit/content/widgets/findbar-js.patch
diff --git a/src/browser/base/content/zen-styles/zen-folders.css b/src/browser/base/content/zen-styles/zen-folders.css
index a9f162cab..c3f5aa8a5 100644
--- a/src/browser/base/content/zen-styles/zen-folders.css
+++ b/src/browser/base/content/zen-styles/zen-folders.css
@@ -58,6 +58,11 @@ tab-group[split-view-group] {
right: 50%;
transform: translateX(50%);
}
+
+ & .tab-content {
+ min-width: 0;
+ justify-content: unset !important;
+ }
}
&:has(> tab:is([visuallyselected], [multiselected])) {
diff --git a/src/browser/base/content/zen-styles/zen-popup.css b/src/browser/base/content/zen-styles/zen-popup.css
index 8cb651477..49fd937d7 100644
--- a/src/browser/base/content/zen-styles/zen-popup.css
+++ b/src/browser/base/content/zen-styles/zen-popup.css
@@ -365,7 +365,7 @@ menuitem {
}
& .zen-toast {
- padding: 0.9rem 0.8rem;
+ padding: 0.5rem 0.6rem;
border-radius: 12px;
background: linear-gradient(
170deg,
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index b50a6f4f0..33ab211b1 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -1722,6 +1722,33 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
return null;
}
+
+ storeDataForSessionStore() {
+ // We cant store any tab or browser elements in the session store
+ // so we need to store the tab indexes and group indexes
+ const data = this._data.map((group) => {
+ return {
+ groupId: group.tabs[0].group?.id,
+ gridType: group.gridType,
+ };
+ });
+ return data;
+ }
+
+ restoreDataFromSessionStore(data) {
+ if (!data) {
+ return;
+ }
+ // We can just get the tab group with document.getElementById(group.groupId)
+ // and add the tabs to it
+ for (const group of data) {
+ const groupElement = document.getElementById(group.groupId);
+ if (groupElement) {
+ const tabs = groupElement.querySelectorAll('tab');
+ this.splitTabs([...tabs], group.gridType);
+ }
+ }
+ }
}
window.gZenViewSplitter = new ZenViewSplitter();
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index cc2d497aa..fcddcf77e 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -263,12 +263,13 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
_organizeTabsToWorkspaceSections(workspace, section, pinnedSection, tabs) {
const workspaceTabs = Array.from(tabs).filter((tab) => tab.getAttribute('zen-workspace-id') === workspace.uuid);
let firstNormalTab = null;
- for (const tab of workspaceTabs) {
+ for (let tab of workspaceTabs) {
if (tab.hasAttribute('zen-essential')) {
continue; // Ignore essentials as they need to be in their own section
}
// remove tab from list
tabs.splice(tabs.indexOf(tab), 1);
+ tab = tab.group ?? tab;
if (tab.pinned) {
pinnedSection.insertBefore(tab, pinnedSection.nextSibling);
} else {
@@ -2323,6 +2324,23 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
return this._allStoredTabs;
}
+ get allTabGroups() {
+ if (!this._hasInitializedTabsStrip) {
+ let children = this.tabboxChildren;
+ return children.filter((node) => node.tagName == 'tab-group');
+ }
+ const pinnedContainers = document.querySelectorAll('#vertical-pinned-tabs-container .zen-workspace-tabs-section');
+ const normalContainers = document.querySelectorAll('#tabbrowser-arrowscrollbox .zen-workspace-tabs-section');
+ const containers = [...pinnedContainers, ...normalContainers];
+ const tabGroups = [];
+ for (const container of containers) {
+ for (const tabGroup of container.querySelectorAll('tab-group')) {
+ tabGroups.push(tabGroup);
+ }
+ }
+ return tabGroups;
+ }
+
get allUsedBrowsers() {
if (!this._hasInitializedTabsStrip) {
return gBrowser.browsers;
diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index a22222c10..3f6b5aa13 100644
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index f814772114948f87cbb3c3a7231c95ea1f68d776..ae35daa518ca25f4fc95ef983519c390bf088a68 100644
+index f814772114948f87cbb3c3a7231c95ea1f68d776..ee358a46956d5f09983fa98a202085bac69c8b27 100644
--- a/browser/components/sessionstore/SessionStore.sys.mjs
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -3171,7 +3171,7 @@ var SessionStoreInternal = {
@@ -19,7 +19,7 @@ index f814772114948f87cbb3c3a7231c95ea1f68d776..ae35daa518ca25f4fc95ef983519c390
if (inBackground === false) {
aWindow.gBrowser.selectedTab = newTab;
-@@ -5355,14 +5356,14 @@ var SessionStoreInternal = {
+@@ -5355,14 +5356,15 @@ var SessionStoreInternal = {
}
let tabbrowser = aWindow.gBrowser;
@@ -29,6 +29,7 @@ index f814772114948f87cbb3c3a7231c95ea1f68d776..ae35daa518ca25f4fc95ef983519c390
let winData = this._windows[aWindow.__SSi];
let tabsData = (winData.tabs = []);
++ winData.splitViewData = aWindow.gZenViewSplitter?.storeDataForSessionStore();
// update the internal state data for this window
for (let tab of tabs) {
- if (tab == aWindow.FirefoxViewHandler.tab) {
@@ -36,7 +37,7 @@ index f814772114948f87cbb3c3a7231c95ea1f68d776..ae35daa518ca25f4fc95ef983519c390
continue;
}
let tabData = lazy.TabState.collect(tab, TAB_CUSTOM_VALUES.get(tab));
-@@ -5381,7 +5382,7 @@ var SessionStoreInternal = {
+@@ -5381,7 +5383,7 @@ var SessionStoreInternal = {
// We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when
// a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
// since it's only inserted into the tab strip after it's selected).
@@ -45,7 +46,26 @@ index f814772114948f87cbb3c3a7231c95ea1f68d776..ae35daa518ca25f4fc95ef983519c390
selectedIndex = 1;
winData.title = tabbrowser.tabs[0].label;
}
-@@ -6086,8 +6087,23 @@ var SessionStoreInternal = {
+@@ -5538,6 +5540,7 @@ var SessionStoreInternal = {
+ winData.tabs,
+ winData.groups ?? []
+ );
++ aWindow.gZenViewSplitter?.restoreDataFromSessionStore(winData.splitViewData);
+ this._log.debug(
+ `restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
+ );
+@@ -5933,8 +5936,8 @@ var SessionStoreInternal = {
+ let isRemotenessUpdate = options.isRemotenessUpdate;
+
+ let willRestoreImmediately =
+- options.restoreImmediately || tabbrowser.selectedBrowser == browser;
+-
++ options.restoreImmediately || tabbrowser.selectedBrowser == browser
++ || (tabbrowser.selectedTab.group?.id == tab.group?.id);
+ let isBrowserInserted = browser.isConnected;
+
+ // Increase the busy state counter before modifying the tab.
+@@ -6086,8 +6089,23 @@ var SessionStoreInternal = {
// Most of tabData has been restored, now continue with restoring
// attributes that may trigger external events.
diff --git a/src/browser/components/sessionstore/TabGroupState-sys-mjs.patch b/src/browser/components/sessionstore/TabGroupState-sys-mjs.patch
new file mode 100644
index 000000000..4dd3634c5
--- /dev/null
+++ b/src/browser/components/sessionstore/TabGroupState-sys-mjs.patch
@@ -0,0 +1,14 @@
+diff --git a/browser/components/sessionstore/TabGroupState.sys.mjs b/browser/components/sessionstore/TabGroupState.sys.mjs
+index 2406837c67d8ff590aa0db6c75ede81e53097506..b69fb7862cd76c891ef61e29aca8c10bab2f5d7e 100644
+--- a/browser/components/sessionstore/TabGroupState.sys.mjs
++++ b/browser/components/sessionstore/TabGroupState.sys.mjs
+@@ -66,6 +66,9 @@ class _TabGroupState {
+ name: tabGroup.label,
+ color: tabGroup.color,
+ collapsed: tabGroup.collapsed,
++ pinned: tabGroup.pinned,
++ essential: tabGroup.essential,
++ splitView: tabGroup.hasAttribute("split-view-group"),
+ };
+ }
+
diff --git a/src/browser/components/sessionstore/TabState-sys-mjs.patch b/src/browser/components/sessionstore/TabState-sys-mjs.patch
index 91b9a309b..c3c77e19f 100644
--- a/src/browser/components/sessionstore/TabState-sys-mjs.patch
+++ b/src/browser/components/sessionstore/TabState-sys-mjs.patch
@@ -1,13 +1,8 @@
diff --git a/browser/components/sessionstore/TabState.sys.mjs b/browser/components/sessionstore/TabState.sys.mjs
-index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..aff63696d198055886960072a6130318e099ae42 100644
+index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..254849e13f7566029dc780c45e376e0f0d427cb5 100644
--- a/browser/components/sessionstore/TabState.sys.mjs
+++ b/browser/components/sessionstore/TabState.sys.mjs
-@@ -80,10 +80,20 @@ class _TabState {
- tabData.muteReason = tab.muteReason;
- }
-
-- if (tab.group) {
-+ if (tab.group && !tab.group.hasAttribute("split-view-group")) {
+@@ -84,6 +84,16 @@ class _TabState {
tabData.groupId = tab.group.id;
}
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 9faa921ef..42ccc1105 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 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63af1fa8a3 100644
+index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7409d0582 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -412,11 +412,50 @@
@@ -246,7 +246,24 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
-@@ -2904,6 +2977,7 @@
+@@ -2865,12 +2938,15 @@
+ * @param {string} [label=]
+ * @returns {MozTabbrowserTabGroup}
+ */
+- _createTabGroup(id, color, collapsed, label = "") {
++ _createTabGroup(id, color, collapsed, label = "", pinned = false, essential = false, splitViewGroup = false) {
+ let group = document.createXULElement("tab-group", { is: "tab-group" });
+ group.id = id;
+ group.collapsed = collapsed;
+ group.color = color;
+ group.label = label;
++ group.pinned = pinned;
++ group.essential = essential;
++ if (splitViewGroup) group.setAttribute('split-view-group', true);
+ return group;
+ }
+
+@@ -2904,6 +2980,7 @@
label = "",
insertBefore = null,
showCreateUI = false,
@@ -254,7 +271,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
} = {}
) {
if (!tabs?.length) {
-@@ -2918,7 +2992,12 @@
+@@ -2918,7 +2995,12 @@
id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
}
let group = this._createTabGroup(id, color, false, label);
@@ -264,11 +281,11 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
+ }
+ group.essential = tabs.some(tab => tab.hasAttribute("essential"));
+ group.pinned = group.essential || tabs.some(tab => tab.pinned);
-+ (group.essential ? document.getElementById("zen-essentials-container") : (group.pinned ? this.verticalPinnedTabsContainer : this.tabContainer)).insertBefore(
++ ((insertBefore?.group ?? insertBefore).parentNode).insertBefore(
group,
insertBefore?.group ?? insertBefore
);
-@@ -3126,6 +3205,7 @@
+@@ -3126,6 +3208,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -276,7 +293,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
}
) {
// If we don't have a preferred remote type, and we have a remote
-@@ -3189,6 +3269,7 @@
+@@ -3189,6 +3272,7 @@
openWindowInfo,
name,
skipLoad,
@@ -284,7 +301,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
});
}
-@@ -3367,6 +3448,27 @@
+@@ -3367,6 +3451,27 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@@ -312,7 +329,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
-@@ -3380,6 +3482,7 @@
+@@ -3380,6 +3485,7 @@
restoreTabsLazily && !select && !tabData.pinned;
let url = "about:blank";
@@ -320,7 +337,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (tabData.entries?.length) {
let activeIndex = (tabData.index || tabData.entries.length) - 1;
// Ensure the index is in bounds.
-@@ -3415,7 +3518,27 @@
+@@ -3415,7 +3521,27 @@
skipLoad: true,
preferredRemoteType,
});
@@ -349,7 +366,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (select) {
tabToSelect = tab;
}
-@@ -3428,8 +3551,8 @@
+@@ -3428,8 +3554,8 @@
// inserted in the DOM. If the tab is not yet in the DOM,
// just insert it in the right place from the start.
if (!tab.parentNode) {
@@ -360,7 +377,29 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
tab.toggleAttribute("pinned", true);
this.tabContainer._invalidateCachedTabs();
// Then ensure all the tab open/pinning information is sent.
-@@ -3504,6 +3627,9 @@
+@@ -3439,7 +3565,8 @@
+ // needs calling:
+ shouldUpdateForPinnedTabs = true;
+ }
+- } else if (tabData.groupId) {
++ }
++ if (tabData.groupId) {
+ let { groupId } = tabData;
+ const tabGroup = tabGroupWorkingData.get(groupId);
+ // if a tab refers to a tab group we don't know, skip any group
+@@ -3453,7 +3580,10 @@
+ tabGroup.stateData.id,
+ tabGroup.stateData.color,
+ tabGroup.stateData.collapsed,
+- tabGroup.stateData.name
++ tabGroup.stateData.name,
++ tabGroup.stateData.pinned,
++ tabGroup.stateData.essential,
++ tabGroup.stateData.splitView,
+ );
+ tabsFragment.appendChild(tabGroup.node);
+ }
+@@ -3504,6 +3634,9 @@
this.selectedTab = tabToSelect;
this.removeTab(leftoverTab);
}
@@ -370,7 +409,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert();
-@@ -3693,7 +3819,7 @@
+@@ -3693,7 +3826,7 @@
// Ensure we have an index if one was not provided.
if (typeof index != "number") {
// Move the new tab after another tab if needed, to the end otherwise.
@@ -379,7 +418,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (
!bulkOrderedOpen &&
((openerTab &&
-@@ -3736,18 +3862,18 @@
+@@ -3736,18 +3869,18 @@
// Ensure index is within bounds.
if (tab.pinned) {
@@ -402,7 +441,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (tabAfter && tabAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, tabAfter);
-@@ -4059,6 +4185,9 @@
+@@ -4059,6 +4192,9 @@
return;
}
@@ -412,7 +451,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
this.removeTabs(selectedTabs);
}
-@@ -4391,6 +4520,7 @@
+@@ -4391,6 +4527,7 @@
skipSessionStore,
} = {}
) {
@@ -420,7 +459,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.finish("browser.tabs.opening", window);
}
-@@ -4407,6 +4537,12 @@
+@@ -4407,6 +4544,12 @@
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
}
@@ -433,7 +472,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
-@@ -4421,7 +4557,9 @@
+@@ -4421,7 +4564,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -444,7 +483,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
-@@ -4435,7 +4573,6 @@
+@@ -4435,7 +4580,6 @@
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
return;
}
@@ -452,7 +491,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
let lockTabSizing =
!this.tabContainer.verticalMode &&
!aTab.pinned &&
-@@ -4574,14 +4711,14 @@
+@@ -4574,14 +4718,14 @@
!!this.tabsInCollapsedTabGroups.length;
if (
aTab.visible &&
@@ -469,7 +508,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4605,6 +4742,7 @@
+@@ -4605,6 +4749,7 @@
newTab = true;
}
@@ -477,7 +516,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4645,9 +4783,7 @@
+@@ -4645,9 +4790,7 @@
aTab._mouseleave();
if (newTab) {
@@ -488,7 +527,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
} else {
TabBarVisibility.update();
}
-@@ -4776,6 +4912,8 @@
+@@ -4776,6 +4919,8 @@
this.tabs[i]._tPos = i;
}
@@ -497,7 +536,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
-@@ -4994,7 +5132,7 @@
+@@ -4994,7 +5139,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -506,7 +545,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
}
// Try to find a remaining tab that comes after the given tab
-@@ -5016,7 +5154,7 @@
+@@ -5016,7 +5161,7 @@
}
if (tab) {
@@ -515,7 +554,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
}
// If no qualifying visible tab was found, see if there is a tab in
-@@ -5434,10 +5572,10 @@
+@@ -5434,10 +5579,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -528,7 +567,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5675,7 +5813,7 @@
+@@ -5675,7 +5820,7 @@
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
@@ -537,7 +576,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
} else {
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
-@@ -5685,10 +5823,17 @@
+@@ -5685,10 +5830,17 @@
this._handleTabMove(aTab, () => {
let neighbor = this.tabs[aIndex];
@@ -557,7 +596,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5697,7 +5842,7 @@
+@@ -5697,7 +5849,7 @@
}
moveTabToGroup(aTab, aGroup) {
@@ -566,7 +605,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -5721,6 +5866,10 @@
+@@ -5721,6 +5873,10 @@
moveActionCallback();
@@ -577,7 +616,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
-@@ -5771,7 +5920,7 @@
+@@ -5771,7 +5927,7 @@
createLazyBrowser,
};
@@ -586,7 +625,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
-@@ -6513,7 +6662,7 @@
+@@ -6513,7 +6669,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -595,7 +634,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
window.focus();
aEvent.preventDefault();
break;
-@@ -7415,6 +7564,7 @@
+@@ -7415,6 +7571,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -603,7 +642,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
-@@ -8381,7 +8531,7 @@ var TabContextMenu = {
+@@ -8381,7 +8538,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !multiselectionContext;
@@ -612,7 +651,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
-@@ -8414,7 +8564,7 @@ var TabContextMenu = {
+@@ -8414,7 +8571,7 @@ var TabContextMenu = {
let contextMoveTabToStart = document.getElementById("context_moveToStart");
let isFirstTab =
tabsToMove[0] == visibleTabs[0] ||
@@ -621,7 +660,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..06a4aae50ebe8a42d08d4689d8e80a63
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
-@@ -8647,6 +8797,7 @@ var TabContextMenu = {
+@@ -8647,6 +8804,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 5c93bcbc1..353350486 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index fa96568d366fd3608f9bd583fa793150bd815c8b..1c940a3b162919256ca73fa867c5c261a3395e25 100644
+index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d734668f2a 100644
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
@@ -94,7 +94,7 @@
@@ -145,7 +145,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..1c940a3b162919256ca73fa867c5c261
}
get verticalMode() {
-@@ -1537,28 +1565,40 @@
+@@ -1537,29 +1565,41 @@
if (this.#allTabs) {
return this.#allTabs;
}
@@ -189,11 +189,12 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..1c940a3b162919256ca73fa867c5c261
}
get allGroups() {
-- let children = Array.from(this.arrowScrollbox.children);
-+ let children = ZenWorkspaces.tabboxChildren;
- return children.filter(node => node.tagName == "tab-group");
+ let children = Array.from(this.arrowScrollbox.children);
+- return children.filter(node => node.tagName == "tab-group");
++ return ZenWorkspaces.allTabGroups;
}
+ /**
@@ -1579,7 +1619,7 @@
*/
get visibleTabs() {
diff --git a/src/toolkit/content/widgets/findbar-js.patch b/src/toolkit/content/widgets/findbar-js.patch
new file mode 100644
index 000000000..967c891d8
--- /dev/null
+++ b/src/toolkit/content/widgets/findbar-js.patch
@@ -0,0 +1,12 @@
+diff --git a/toolkit/content/widgets/findbar.js b/toolkit/content/widgets/findbar.js
+index 8ca512e0b212bb6e25ed37e7edb4f8e2587d5bb0..5abfff92b3a8df5d138082af96419668a2c8a9bb 100644
+--- a/toolkit/content/widgets/findbar.js
++++ b/toolkit/content/widgets/findbar.js
+@@ -1188,6 +1188,7 @@
+ * e.g. <command name="cmd_find" oncommand="gFindBar.onFindCommand();"/>
+ */
+ onFindCommand() {
++ if (gBrowser?.selectedTab?.hasAttribute("zen-empty-tab")) return;
+ return this.startFind(this.FIND_NORMAL);
+ }
+
From 53ec2f15b66f17ddb7b499c644351d91637168b8 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 25 Mar 2025 00:03:27 +0100
Subject: [PATCH 022/114] Fixed pinning tabs rendering the browser useles
(closes https://github.com/zen-browser/desktop/issues/4583)
---
src/browser/base/zen-components/ZenWorkspaces.mjs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index cc2d497aa..b568dd03b 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -2291,7 +2291,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
if (!this._hasInitializedTabsStrip) {
const children = this.tabboxChildren;
children.pop(); // Remove the last child which is the new tab button
- return children;
+ return [
+ ...document.querySelectorAll('#zen-essentials-container tab'),
+ ...document.querySelectorAll('#vertical-pinned-tabs-container tab'),
+ ...children,
+ ];
}
if (this._allStoredTabs) {
From 3467e5070f02760993ec252caa83ceea4f85c5da Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Tue, 25 Mar 2025 20:09:25 +0700
Subject: [PATCH 023/114] fix(MediaController): pass in playbackRate when
switching
---
src/browser/base/zen-components/ZenMediaController.mjs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/browser/base/zen-components/ZenMediaController.mjs b/src/browser/base/zen-components/ZenMediaController.mjs
index 19c28220a..78664f567 100644
--- a/src/browser/base/zen-components/ZenMediaController.mjs
+++ b/src/browser/base/zen-components/ZenMediaController.mjs
@@ -199,6 +199,7 @@ class ZenMediaController {
browser,
position: positionState.position,
duration: positionState.duration,
+ playbackRate: positionState.playbackRate,
lastUpdated: Date.now(),
});
}
@@ -292,6 +293,7 @@ class ZenMediaController {
...mediaController,
position: event.position,
duration: event.duration,
+ playbackRate: event.playbackRate,
lastUpdated: Date.now(),
});
@@ -333,6 +335,7 @@ class ZenMediaController {
this.setupMediaControlUI(nextController.controller.getMetadata(), {
position: nextController.position + (nextController.controller.isPlaying ? elapsedTime : 0),
duration: nextController.duration,
+ playbackRate: nextController.playbackRate,
});
this.showMediaControls();
From b2fa05fa222b15f7d3beae3a3936a0bba6efba6a Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Tue, 25 Mar 2025 20:34:07 +0700
Subject: [PATCH 024/114] fix(MediaController): pass in playbackRate in more
place
---
src/browser/base/zen-components/ZenMediaController.mjs | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/browser/base/zen-components/ZenMediaController.mjs b/src/browser/base/zen-components/ZenMediaController.mjs
index 78664f567..f44ead53c 100644
--- a/src/browser/base/zen-components/ZenMediaController.mjs
+++ b/src/browser/base/zen-components/ZenMediaController.mjs
@@ -245,6 +245,7 @@ class ZenMediaController {
browser,
position: positionState.position,
duration: positionState.duration,
+ playbackRate: positionState.playbackRate,
lastUpdated: Date.now(),
});
From c99d3d37db4d87cdc3333f470e669dd56188b9c5 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Tue, 25 Mar 2025 20:45:41 +0700
Subject: [PATCH 025/114] refactor(MediaController): remove redundant code
---
src/browser/base/zen-components/ZenMediaController.mjs | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/src/browser/base/zen-components/ZenMediaController.mjs b/src/browser/base/zen-components/ZenMediaController.mjs
index f44ead53c..57bc92cdb 100644
--- a/src/browser/base/zen-components/ZenMediaController.mjs
+++ b/src/browser/base/zen-components/ZenMediaController.mjs
@@ -192,16 +192,6 @@ class ZenMediaController {
this._currentBrowser = browser;
this.updatePipButton();
-
- const positionState = mediaController.getPositionState();
- this.mediaControllersMap.set(mediaController.id, {
- controller: mediaController,
- browser,
- position: positionState.position,
- duration: positionState.duration,
- playbackRate: positionState.playbackRate,
- lastUpdated: Date.now(),
- });
}
setupMediaControlUI(metadata, positionState) {
From 14736750945e415993bc99b6ecfa2512393f2d2c Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 25 Mar 2025 19:51:03 +0100
Subject: [PATCH 026/114] fix: improve workspace session restoration and
scrolling behavior
---
.../base/content/zen-styles/zen-workspaces.css | 3 +++
.../base/zen-components/ZenViewSplitter.mjs | 14 +++++++++++++-
src/browser/base/zen-components/ZenWorkspaces.mjs | 13 +++++++++++++
.../sessionstore/SessionStore-sys-mjs.patch | 13 +------------
surfer.json | 6 +++---
5 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index ab55b1a59..2717ceacf 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -130,6 +130,9 @@
overflow: hidden;
display: flex;
gap: 0.5ch;
+ overflow-x: auto;
+ scrollbar-width: none;
+ scroll-behavior: smooth;
}
}
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index 33ab211b1..e536a43f0 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -981,7 +981,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
layoutTree: this.calculateLayoutTree(tabs, gridType),
};
this._data.push(splitData);
- window.gBrowser.selectedTab = tabs[0];
+ if (!this._sessionRestoring) {
+ window.gBrowser.selectedTab = tabs[0];
+ }
// Add tabs to the split view group
let splitGroup = this._getSplitViewGroup(tabs);
@@ -1739,6 +1741,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
if (!data) {
return;
}
+ this._sessionRestoring = true;
// We can just get the tab group with document.getElementById(group.groupId)
// and add the tabs to it
for (const group of data) {
@@ -1748,6 +1751,15 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
this.splitTabs([...tabs], group.gridType);
}
}
+ delete this._sessionRestoring;
+ }
+
+ onAfterWorkspaceSessionRestore() {
+ if (this.currentView >= 0) {
+ // Activate all browsers in the split view
+ this.currentView = -1;
+ this.onLocationChange(gBrowser.selectedTab.linkedBrowser);
+ }
}
}
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 0d7f34722..a1afd5155 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -405,6 +405,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
_handleSwipeMayStart(event) {
if (!this.workspaceEnabled) return;
+ if (event.target.closest('#zen-sidebar-bottom-buttons')) return;
// Only handle horizontal swipes
if (event.direction === event.DIRECTION_LEFT || event.direction === event.DIRECTION_RIGHT) {
@@ -648,6 +649,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
if (gZenVerticalTabsManager._canReplaceNewTab && showed) {
BrowserCommands.openTab();
}
+ gZenViewSplitter.onAfterWorkspaceSessionRestore();
}
handleInitialTab(tab, isEmpty) {
@@ -2415,6 +2417,17 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
const maxWidth = 100 / numButtons;
parent.style.setProperty('--zen-overflowed-workspace-button-width', `${maxWidth}%`);
this._processingResize = false;
+
+ // Scroll to the active workspace button if it's not visible
+ const activeButton = parent.querySelector('.zen-workspace-button.active');
+ if (!activeButton) {
+ return;
+ }
+ const parentRect = parent.getBoundingClientRect();
+ const activeRect = activeButton.getBoundingClientRect();
+ if (activeRect.left < parentRect.left || activeRect.right > parentRect.right) {
+ parent.scrollLeft = activeButton.offsetLeft;
+ }
});
}
})();
diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index 3f6b5aa13..b4ab32dfb 100644
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index f814772114948f87cbb3c3a7231c95ea1f68d776..ee358a46956d5f09983fa98a202085bac69c8b27 100644
+index f814772114948f87cbb3c3a7231c95ea1f68d776..38913eb9dee97b42697440560f7a1bab1ffe9f15 100644
--- a/browser/components/sessionstore/SessionStore.sys.mjs
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -3171,7 +3171,7 @@ var SessionStoreInternal = {
@@ -54,17 +54,6 @@ index f814772114948f87cbb3c3a7231c95ea1f68d776..ee358a46956d5f09983fa98a202085ba
this._log.debug(
`restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
);
-@@ -5933,8 +5936,8 @@ var SessionStoreInternal = {
- let isRemotenessUpdate = options.isRemotenessUpdate;
-
- let willRestoreImmediately =
-- options.restoreImmediately || tabbrowser.selectedBrowser == browser;
--
-+ options.restoreImmediately || tabbrowser.selectedBrowser == browser
-+ || (tabbrowser.selectedTab.group?.id == tab.group?.id);
- let isBrowserInserted = browser.isConnected;
-
- // Increase the busy state counter before modifying the tab.
@@ -6086,8 +6089,23 @@ var SessionStoreInternal = {
// Most of tabData has been restored, now continue with restoring
diff --git a/surfer.json b/surfer.json
index 0f74d16bf..95a6eadf6 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,7 +5,7 @@
"binaryName": "zen",
"version": {
"product": "firefox",
- "version": "136.0.2",
+ "version": "136.0.3",
"candidate": "136.0.3"
},
"buildOptions": {
@@ -19,7 +19,7 @@
"brandShortName": "Zen",
"brandFullName": "Zen Browser",
"release": {
- "displayVersion": "1.10.1b",
+ "displayVersion": "1.10.2b",
"github": {
"repo": "zen-browser/desktop"
},
@@ -39,7 +39,7 @@
"brandShortName": "Twilight",
"brandFullName": "Zen Twilight",
"release": {
- "displayVersion": "1.10.1t",
+ "displayVersion": "1.10.2t",
"github": {
"repo": "zen-browser/desktop"
}
From 360079d15ea63a2261991bfde573c662c705d3a2 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 26 Mar 2025 19:24:28 +0100
Subject: [PATCH 027/114] Small change to how essentials blur the favicon
---
src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 65473b89e..f93c6f6f9 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1106,7 +1106,7 @@
&::after {
content: "";
inset: -50%;
- filter: blur(15px) brightness(1.2);
+ filter: blur(20px);
position: absolute;
background-size: 100% 100%;
background-clip: padding-box;
From 63d25a11ae54f23730ca4dcbd619c5ef07fd3187 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 26 Mar 2025 19:33:39 +0100
Subject: [PATCH 028/114] Update Firefox version to 136.0.3 and candidate to
137.0; update localization commit hash
---
firefox-cache/l10n-last-commit-hash | 2 +-
surfer.json | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/firefox-cache/l10n-last-commit-hash b/firefox-cache/l10n-last-commit-hash
index 2af534faa..c00ad2b99 100644
--- a/firefox-cache/l10n-last-commit-hash
+++ b/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-e234130176d2813fec2397bbf3a313909565006e
\ No newline at end of file
+6c9732d1c3b969818a320c60f02e8339822ac08e
\ No newline at end of file
diff --git a/surfer.json b/surfer.json
index 0f74d16bf..cd2b1a8a2 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,8 +5,8 @@
"binaryName": "zen",
"version": {
"product": "firefox",
- "version": "136.0.2",
- "candidate": "136.0.3"
+ "version": "136.0.3",
+ "candidate": "137.0"
},
"buildOptions": {
"generateBranding": true
@@ -53,4 +53,4 @@
"licenseType": "MPL-2.0"
},
"updateHostname": "updates.zen-browser.app"
-}
\ No newline at end of file
+}
From daf6d6aea8748abce521e66bf8a172ff4636686f Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 26 Mar 2025 21:31:12 +0100
Subject: [PATCH 029/114] feat: update preferences and UI components for new
features and improvements
---
.../base/content/aboutDialog-xhtml.patch | 10 +-
.../base/content/browser-box-inc-xhtml.patch | 12 +-
.../base/content/browser-init-js.patch | 41 ++---
src/browser/base/content/browser-js.patch | 30 +---
src/browser/base/content/browser-xhtml.patch | 12 +-
.../content/main-popupset-inc-xhtml.patch | 30 +---
.../content/navigator-toolbox-inc-xhtml.patch | 51 ++----
.../components/BrowserGlue-sys-mjs.patch | 13 +-
.../CustomizableUI-sys-mjs.patch | 38 +++-
.../ToolbarContextMenu-sys-mjs.patch | 29 ++-
.../ContentSection/ContentSection-jsx.patch | 13 --
.../abouthomecache/page-html-template.patch | 12 --
.../newtab/lib/ActivityStream-sys-mjs.patch | 13 --
src/browser/components/places/jar-mn.patch | 4 +-
.../sessionstore/TabGroupState-sys-mjs.patch | 16 +-
.../sidebar/browser-sidebar-js.patch | 29 ++-
.../tabbrowser/content/tabbrowser-js.patch | 136 +++++++--------
.../tabbrowser/content/tabs-js.patch | 165 ++++++++----------
.../ContentSection/ContentSection-jsx.patch | 13 ++
.../newtab/lib/AboutPreferences-sys-mjs.patch | 8 +-
.../newtab/lib/ActivityStream-sys-mjs.patch | 13 ++
.../modules/BrowserDOMWindow-sys-mjs.patch | 24 +++
.../themes/addons/dark/manifest-json.patch | 37 ----
.../themes/addons/light/manifest-json.patch | 37 ----
src/browser/themes/linux/browser-css.patch | 4 +-
.../libpref/init/StaticPrefList-yaml.patch | 17 +-
src/toolkit/themes/shared/popup-css.patch | 29 +--
src/widget/windows/WinUtils-cpp.patch | 12 ++
src/widget/windows/nsWindow-cpp.patch | 20 +--
29 files changed, 357 insertions(+), 511 deletions(-)
delete mode 100644 src/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection-jsx.patch
delete mode 100644 src/browser/components/newtab/data/content/abouthomecache/page-html-template.patch
delete mode 100644 src/browser/components/newtab/lib/ActivityStream-sys-mjs.patch
create mode 100644 src/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection-jsx.patch
rename src/browser/{components => extensions}/newtab/lib/AboutPreferences-sys-mjs.patch (56%)
create mode 100644 src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
create mode 100644 src/browser/modules/BrowserDOMWindow-sys-mjs.patch
delete mode 100644 src/browser/themes/addons/dark/manifest-json.patch
delete mode 100644 src/browser/themes/addons/light/manifest-json.patch
create mode 100644 src/widget/windows/WinUtils-cpp.patch
diff --git a/src/browser/base/content/aboutDialog-xhtml.patch b/src/browser/base/content/aboutDialog-xhtml.patch
index 38588c58c..ea6c32e21 100644
--- a/src/browser/base/content/aboutDialog-xhtml.patch
+++ b/src/browser/base/content/aboutDialog-xhtml.patch
@@ -1,8 +1,8 @@
diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
-index 53e4616a99b7826453d5b6dea027184d90bc73f7..90c9fe5683411cf3087bebd3d0941decf6d23e89 100644
+index c64980810570fcea84e33fdc2d66ac42a79f4e46..b7198e810a7510fa82cc6801cfd01c88a08d42c1 100644
--- a/browser/base/content/aboutDialog.xhtml
+++ b/browser/base/content/aboutDialog.xhtml
-@@ -34,6 +34,7 @@
+@@ -35,6 +35,7 @@
<html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="browser/aboutDialog.ftl"/>
@@ -10,7 +10,7 @@ index 53e4616a99b7826453d5b6dea027184d90bc73f7..90c9fe5683411cf3087bebd3d0941dec
</linkset>
<html:div id="aboutDialogContainer">
-@@ -124,21 +125,23 @@
+@@ -125,21 +126,23 @@
</description>
</vbox>
<description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
@@ -30,8 +30,8 @@ index 53e4616a99b7826453d5b6dea027184d90bc73f7..90c9fe5683411cf3087bebd3d0941dec
<vbox id="bottomBox">
<hbox pack="center">
<label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
-- <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottomLinks-rights"/>
-- <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/>
+- <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottom-links-terms"/>
+- <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&utm_medium=firefox-desktop&utm_campaign=about-dialog" data-l10n-id="bottom-links-privacy"/>
+ <label is="text-link" class="bottom-link" href="about:rights" data-l10n-id="bottomLinks-rights"/>
+ <label is="text-link" class="bottom-link" href="https://www.zen-browser.app/privacy-policy/" data-l10n-id="bottomLinks-privacy"/>
</hbox>
diff --git a/src/browser/base/content/browser-box-inc-xhtml.patch b/src/browser/base/content/browser-box-inc-xhtml.patch
index 3728cc0e3..3310c63c3 100644
--- a/src/browser/base/content/browser-box-inc-xhtml.patch
+++ b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -1,17 +1,17 @@
diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index 7d7e8697f02f90d4f336c9ab0a73a89848e0c21c..2fd19f3b43db4bdd99e65fecd1481f80d4541a7a 100644
+index 2ca8bdd2674fb4addf3bbf94ff17abc5c93c6293..49c772ae71e6b3793ff806d22197d3028ff4385f 100644
--- a/browser/base/content/browser-box.inc.xhtml
+++ b/browser/base/content/browser-box.inc.xhtml
-@@ -23,7 +23,14 @@
- <browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true" tooltip="aHTMLTooltip"/>
- </vbox>
- <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
+@@ -26,7 +26,14 @@
+ <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
+ <box id="after-splitter"></box>
+ </div>
+#include zen-sidebar-panel.inc.xhtml
+<vbox flex="1" id="zen-appcontent-wrapper">
+<html:div id="zen-appcontent-navbar-container"></html:div>
+<hbox id="zen-tabbox-wrapper" flex="1">
<tabbox id="tabbrowser-tabbox" flex="1" tabcontainer="tabbrowser-tabs">
-+ #include zen-tabbrowser-elements.inc.xhtml
++#include zen-tabbrowser-elements.inc.xhtml
<tabpanels id="tabbrowser-tabpanels" flex="1" selectedIndex="0"/>
</tabbox>
</hbox>
diff --git a/src/browser/base/content/browser-init-js.patch b/src/browser/base/content/browser-init-js.patch
index 9c40e1e09..b768837d8 100644
--- a/src/browser/base/content/browser-init-js.patch
+++ b/src/browser/base/content/browser-init-js.patch
@@ -1,36 +1,17 @@
diff --git a/browser/base/content/browser-init.js b/browser/base/content/browser-init.js
-index 63100defacf66c6b3232b9e0a783a5fd14e3a46a..398d685b142a47a85619dfc55772ea98ccfad445 100644
+index 3d5173315812589c0b79beec5f0419fc37cb8868..c4216db9e414fbbaead6ecd89b40366b0d8a50c1 100644
--- a/browser/base/content/browser-init.js
+++ b/browser/base/content/browser-init.js
-@@ -162,13 +162,15 @@ var gBrowserInit = {
- elem.setAttribute("skipintoolbarset", "true");
- }
- }
-+ ZenCustomizableUI.init(window);
- for (let area of CustomizableUI.areas) {
- let type = CustomizableUI.getAreaType(area);
-- if (type == CustomizableUI.TYPE_TOOLBAR) {
-+ if (type == CustomizableUI.TYPE_TOOLBAR && !area.startsWith("zen-")) {
- let node = document.getElementById(area);
- CustomizableUI.registerToolbarNode(node);
- }
- }
-+ ZenCustomizableUI.registerToolbarNodes(window);
- if (isVerticalTabs) {
- // Show the vertical tabs toolbar
- setToolbarVisibility(
-@@ -287,6 +289,10 @@ var gBrowserInit = {
- gPrivateBrowsingUI.init();
- BrowserSearch.init();
- BrowserPageActions.init();
-+
-+Services.scriptloader.loadSubScript("chrome://browser/content/ZenStartup.mjs", window);
-+Services.scriptloader.loadSubScript("chrome://browser/content/zenThemeModifier.js", window);
-+
- if (gToolbarKeyNavEnabled) {
- ToolbarKeyboardNavigator.init();
- }
-@@ -365,6 +371,7 @@ var gBrowserInit = {
+@@ -175,6 +175,8 @@ var gBrowserInit = {
+ },
+
+ onLoad() {
++ Services.scriptloader.loadSubScript("chrome://browser/content/ZenStartup.mjs", window);
++ Services.scriptloader.loadSubScript("chrome://browser/content/zenThemeModifier.js", window);
+ gBrowser.addEventListener("DOMUpdateBlockedPopups", e =>
+ PopupBlockerObserver.handleEvent(e)
+ );
+@@ -310,6 +312,7 @@ var gBrowserInit = {
TelemetryTimestamps.add("delayedStartupStarted");
this._cancelDelayedStartup();
diff --git a/src/browser/base/content/browser-js.patch b/src/browser/base/content/browser-js.patch
index 8d436fe94..97f85112b 100644
--- a/src/browser/base/content/browser-js.patch
+++ b/src/browser/base/content/browser-js.patch
@@ -1,8 +1,8 @@
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
-index 019b168c1aeae7e1c97a3ae58c99a48a27f54134..22dcf304591290d7a1b60f01998b6cf4782c0cdc 100644
+index b89846a1103827b7e65c0b6c9197e80761e3f5c0..cc7205765244738743db92bfcafc1f288919ae0d 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
-@@ -32,6 +32,7 @@ ChromeUtils.defineESModuleGetters(this, {
+@@ -33,6 +33,7 @@ ChromeUtils.defineESModuleGetters(this, {
ContextualIdentityService:
"resource://gre/modules/ContextualIdentityService.sys.mjs",
CustomizableUI: "resource:///modules/CustomizableUI.sys.mjs",
@@ -10,7 +10,7 @@ index 019b168c1aeae7e1c97a3ae58c99a48a27f54134..22dcf304591290d7a1b60f01998b6cf4
DevToolsSocketStatus:
"resource://devtools/shared/security/DevToolsSocketStatus.sys.mjs",
DownloadUtils: "resource://gre/modules/DownloadUtils.sys.mjs",
-@@ -3440,6 +3441,11 @@ var XULBrowserWindow = {
+@@ -2698,6 +2699,11 @@ var XULBrowserWindow = {
AboutReaderParent.updateReaderButton(gBrowser.selectedBrowser);
TranslationsParent.onLocationChange(gBrowser.selectedBrowser);
@@ -22,27 +22,7 @@ index 019b168c1aeae7e1c97a3ae58c99a48a27f54134..22dcf304591290d7a1b60f01998b6cf4
PictureInPicture.updateUrlbarToggle(gBrowser.selectedBrowser);
if (!gMultiProcessBrowser) {
-@@ -4435,7 +4441,7 @@ nsBrowserAccess.prototype = {
- // Passing a null-URI to only create the content window,
- // and pass true for aSkipLoad to prevent loading of
- // about:blank
-- return this.getContentWindowOrOpenURIInFrame(
-+ let res = this.getContentWindowOrOpenURIInFrame(
- null,
- aParams,
- aWhere,
-@@ -4443,6 +4449,10 @@ nsBrowserAccess.prototype = {
- aName,
- true
- );
-+ if (typeof window.gZenGlanceManager !== "undefined" && window.toolbar.visible) {
-+ window.gZenGlanceManager.onTabOpen(res, aURI);
-+ }
-+ return res;
- },
-
- openURIInFrame: function browser_openURIInFrame(
-@@ -6351,7 +6361,7 @@ function switchToTabHavingURI(
+@@ -5194,7 +5200,7 @@ function switchToTabHavingURI(
ignoreQueryString || replaceQueryString,
ignoreFragmentWhenComparing
);
@@ -51,7 +31,7 @@ index 019b168c1aeae7e1c97a3ae58c99a48a27f54134..22dcf304591290d7a1b60f01998b6cf4
for (let i = 0; i < browsers.length; i++) {
let browser = browsers[i];
let browserCompare = cleanURL(
-@@ -6392,7 +6402,7 @@ function switchToTabHavingURI(
+@@ -5235,7 +5241,7 @@ function switchToTabHavingURI(
}
if (!doAdopt) {
diff --git a/src/browser/base/content/browser-xhtml.patch b/src/browser/base/content/browser-xhtml.patch
index fca20413e..9fe640974 100644
--- a/src/browser/base/content/browser-xhtml.patch
+++ b/src/browser/base/content/browser-xhtml.patch
@@ -1,5 +1,5 @@
diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 68849f5093cd8ab99ab0747d972799eaf3ad7e22..3b4e6a179ab7b71859f832709778c326a39cffda 100644
+index 0d0a559a6473149b50f4bf18d059e86907c4acd3..a5a48ba1d50b3bf74dec3f3d371a76228e246a9e 100644
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -26,6 +26,7 @@
@@ -10,7 +10,7 @@ index 68849f5093cd8ab99ab0747d972799eaf3ad7e22..3b4e6a179ab7b71859f832709778c326
persist="screenX screenY width height sizemode"
data-l10n-sync="true">
<head>
-@@ -100,6 +101,8 @@
+@@ -104,6 +105,8 @@
<title data-l10n-id="browser-main-window-default-title"></title>
@@ -19,15 +19,15 @@ index 68849f5093cd8ab99ab0747d972799eaf3ad7e22..3b4e6a179ab7b71859f832709778c326
# All JS files which are needed by browser.xhtml and other top level windows to
# support MacOS specific features *must* go into the global-scripts.inc file so
# that they can be shared with macWindow.inc.xhtml.
-@@ -169,6 +172,7 @@
- });
- });
+@@ -148,6 +151,7 @@
+ window.addEventListener("DOMContentLoaded",
+ gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
</script>
+#include zen-assets.inc.xhtml
</head>
<html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
# All sets except for popupsets (commands, keys, and stringbundles)
-@@ -190,9 +194,13 @@
+@@ -169,9 +173,13 @@
</vbox>
</html:template>
diff --git a/src/browser/base/content/main-popupset-inc-xhtml.patch b/src/browser/base/content/main-popupset-inc-xhtml.patch
index 072fa90a1..9a3003ff5 100644
--- a/src/browser/base/content/main-popupset-inc-xhtml.patch
+++ b/src/browser/base/content/main-popupset-inc-xhtml.patch
@@ -1,19 +1,19 @@
diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
-index 959c523b21c642f29353b9de37b3ce6b5505b01b..4cd26ea85ad4905bade71dcd470b8678079787bd 100644
+index 198c188e074b7062169764fb7d81c692d3a2bdae..b412a3c1fabdc6470b4ea9e7be34c426cc76aafd 100644
--- a/browser/base/content/main-popupset.inc.xhtml
+++ b/browser/base/content/main-popupset.inc.xhtml
-@@ -206,6 +206,10 @@
+@@ -201,6 +201,10 @@
hidden="true"
tabspecific="true"
aria-labelledby="editBookmarkPanelTitle">
-+ <html:div id="zenEditBookmarkPanelFaviconContainer">
-+ <html:img id="zenEditBookmarkPanelFavicon"/>
-+ </html:div>
-+ <vbox>
++ <html:div id="zenEditBookmarkPanelFaviconContainer">
++ <html:img id="zenEditBookmarkPanelFavicon"/>
++ </html:div>
++ <vbox>
<box class="panel-header">
<html:h1>
<html:span id="editBookmarkPanelTitle"/>
-@@ -231,6 +235,7 @@
+@@ -226,6 +230,7 @@
class="footer-button"/>
</html:moz-button-group>
</vbox>
@@ -21,21 +21,7 @@ index 959c523b21c642f29353b9de37b3ce6b5505b01b..4cd26ea85ad4905bade71dcd470b8678
</panel>
</html:template>
-@@ -426,11 +431,13 @@
- observes="cmd_CustomizeToolbars"
- class="viewCustomizeToolbar"
- data-lazy-l10n-id="toolbar-context-menu-view-customize-toolbar-2"/>
-+#if 0
- <menuseparator id="sidebarRevampSeparator"/>
- <menuitem id="toolbar-context-toggle-vertical-tabs"
- data-lazy-l10n-id="toolbar-context-turn-on-vertical-tabs"/>
- <menuitem id="toolbar-context-customize-sidebar"
- data-lazy-l10n-id="toolbar-context-customize-sidebar"/>
-+#endif
- <menuseparator contexttype="fullscreen"/>
- <menuitem id="toolbar-context-full-screen-autohide"
- class="fullscreen-context-autohide"
-@@ -565,6 +572,8 @@
+@@ -567,6 +572,8 @@
#include popup-notifications.inc.xhtml
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index f2be3c096..a8a6be2ee 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index a0a382643a2f74b6d789f3641ef300eed202d5e9..a962e155f1452362a2a35df89c8f56e1c0d9968c 100644
+index feb9e4ef7e872b4cfbf0d55f24a34db275951c66..3ce9b9919ff736885b8aa8943bbbce3c5d0f33a6 100644
--- a/browser/base/content/navigator-toolbox.inc.xhtml
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
@@ -2,7 +2,7 @@
@@ -11,20 +11,18 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..a962e155f1452362a2a35df89c8f56e1
<script src="chrome://browser/content/navigator-toolbox.js" />
<!-- Menu -->
-@@ -17,9 +17,11 @@
+@@ -17,9 +17,8 @@
#include browser-menubar.inc
</toolbaritem>
<spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
-+#if 0
- #include titlebar-items.inc.xhtml
-+#endif
+-#include titlebar-items.inc.xhtml
</toolbar>
-
+<hbox id="titlebar">
<toolbar id="TabsToolbar"
class="browser-toolbar browser-titlebar"
fullscreentoolbar="true"
-@@ -32,7 +34,7 @@
+@@ -32,7 +31,7 @@
<hbox class="titlebar-spacer" type="pre-tabs"/>
@@ -33,18 +31,15 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..a962e155f1452362a2a35df89c8f56e1
<toolbartabstop/>
<hbox id="TabsToolbar-customization-target" flex="1">
<toolbarbutton id="firefox-view-button"
-@@ -40,9 +42,9 @@
+@@ -40,6 +39,7 @@
data-l10n-id="toolbar-button-firefox-view-2"
role="button"
aria-pressed="false"
+ hidden="true"
cui-areatype="toolbar"
removable="true"/>
--
- <tabs id="tabbrowser-tabs"
- is="tabbrowser-tabs"
- aria-multiselectable="true"
-@@ -50,6 +52,10 @@
+
+@@ -50,6 +50,10 @@
tooltip="tabbrowser-tab-tooltip"
orient="horizontal"
stopwatchid="FX_TAB_CLICK_MS">
@@ -55,16 +50,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..a962e155f1452362a2a35df89c8f56e1
<hbox class="tab-drop-indicator" hidden="true"/>
# If the name (tabbrowser-arrowscrollbox) or structure of this changes
# significantly, there is an optimization in
-@@ -57,7 +63,7 @@
- # the current structure that we may want to revisit.
- <html:div id="vertical-pinned-tabs-container" tabindex="-1"></html:div>
- <html:div id="vertical-pinned-tabs-container-separator"></html:div>
-- <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" clicktoscroll="" scrolledtostart="" scrolledtoend="">
-+ <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="vertical" flex="1" clicktoscroll="" scrolledtostart="" scrolledtoend="">
- <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
- <hbox id="tabbrowser-arrowscrollbox-periphery">
- <toolbartabstop/>
-@@ -75,6 +81,8 @@
+@@ -75,6 +79,8 @@
tooltip="dynamic-shortcut-tooltip"
data-l10n-id="tabs-toolbar-new-tab"/>
<html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
@@ -73,33 +59,28 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..a962e155f1452362a2a35df89c8f56e1
</tabs>
<toolbarbutton id="new-tab-button"
-@@ -100,11 +108,12 @@
+@@ -100,10 +106,10 @@
#include private-browsing-indicator.inc.xhtml
- <toolbarbutton id="content-analysis-indicator"
- class="toolbarbutton-1 content-analysis-indicator-icon"/>
--
-+#if 0
- #include titlebar-items.inc.xhtml
--
-+#endif
+ <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>
+
+-#include titlebar-items.inc.xhtml
+#include zen-sidebar-icons.inc.xhtml
+
</toolbar>
-
+</hbox>
<toolbar id="nav-bar"
class="browser-toolbar chromeclass-location"
data-l10n-id="navbar-accessible"
-@@ -490,10 +499,12 @@
+@@ -489,10 +495,10 @@
consumeanchor="PanelUI-button"
data-l10n-id="appmenu-menu-button-closed2"/>
</toolbaritem>
+#include titlebar-items.inc.xhtml
<hbox class="titlebar-spacer" type="post-tabs"/>
#include private-browsing-indicator.inc.xhtml
--
-+#if 0
- #include titlebar-items.inc.xhtml
-+#endif
+ <toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>
+-#include titlebar-items.inc.xhtml
</toolbar>
<toolbar id="PersonalToolbar"
diff --git a/src/browser/components/BrowserGlue-sys-mjs.patch b/src/browser/components/BrowserGlue-sys-mjs.patch
index f2a09f011..62a09fd01 100644
--- a/src/browser/components/BrowserGlue-sys-mjs.patch
+++ b/src/browser/components/BrowserGlue-sys-mjs.patch
@@ -1,19 +1,20 @@
diff --git a/browser/components/BrowserGlue.sys.mjs b/browser/components/BrowserGlue.sys.mjs
-index b888a753a7f23a9800fe04da51a4e6b898314ff2..a6a01cf035253b05ea7b20b434cf2002ff115d96 100644
+index b8b6d30f0b3c968a8615ca601e06e50261d0dae6..5c2b718b902aed2ef8d7a4b622ba882ee937c655 100644
--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
-@@ -121,6 +121,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
+@@ -106,6 +106,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
WindowsGPOParser: "resource://gre/modules/policies/WindowsGPOParser.sys.mjs",
clearTimeout: "resource://gre/modules/Timer.sys.mjs",
setTimeout: "resource://gre/modules/Timer.sys.mjs",
+ gZenUIMigration: "chrome://browser/content/zen-components/ZenUIMigration.mjs",
});
- if (AppConstants.MOZ_UPDATER) {
-@@ -1951,6 +1952,7 @@ BrowserGlue.prototype = {
-
- lazy.UrlbarPrefs.updateFirefoxSuggestScenario();
+ XPCOMUtils.defineLazyServiceGetters(lazy, {
+@@ -1896,7 +1897,7 @@ BrowserGlue.prototype = {
+ lazy.TabCrashHandler.init();
+ lazy.ProcessHangMonitor.init();
+-
+ lazy.gZenUIMigration.init(this._isNewProfile, aWindow);
// A channel for "remote troubleshooting" code...
let channel = new lazy.WebChannel(
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index 20662d9f1..f53668d7a 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 8eab0f9181c19c68a0a2daf0f819b3ae82ed92bc..092107b377ec4f7bc9ae86c817cded349732ffc6 100644
+index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..6a68b53443d32461927ef98d770b297caaecf790 100644
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -90,7 +90,27 @@ index 8eab0f9181c19c68a0a2daf0f819b3ae82ed92bc..092107b377ec4f7bc9ae86c817cded34
} else {
window.gNavToolbox.palette.appendChild(widgetNode);
}
-@@ -2678,7 +2677,6 @@ var CustomizableUIInternal = {
+@@ -1704,16 +1703,16 @@ var CustomizableUIInternal = {
+ elem.setAttribute("skipintoolbarset", "true");
+ }
+ }
+-
++ ZenCustomizableUI.init(window);
+ // Now register all the toolbars
+ for (let area of CustomizableUI.areas) {
+ let type = CustomizableUI.getAreaType(area);
+- if (type == CustomizableUI.TYPE_TOOLBAR) {
++ if (type == CustomizableUI.TYPE_TOOLBAR && !area.startsWith("zen-")) {
+ let node = document.getElementById(area);
+ this.registerToolbarNode(node);
+ }
+ }
+-
++ ZenCustomizableUI.registerToolbarNodes(window);
+ // Handle initial state of vertical tabs.
+ if (isVerticalTabs) {
+ // Show the vertical tabs toolbar
+@@ -2744,7 +2743,6 @@ var CustomizableUIInternal = {
if (!this.isWidgetRemovable(aWidgetId)) {
return;
}
@@ -98,7 +118,7 @@ index 8eab0f9181c19c68a0a2daf0f819b3ae82ed92bc..092107b377ec4f7bc9ae86c817cded34
let placements = gPlacements.get(oldPlacement.area);
let position = placements.indexOf(aWidgetId);
if (position != -1) {
-@@ -3669,7 +3667,7 @@ var CustomizableUIInternal = {
+@@ -3735,7 +3733,7 @@ var CustomizableUIInternal = {
}
},
@@ -107,7 +127,7 @@ index 8eab0f9181c19c68a0a2daf0f819b3ae82ed92bc..092107b377ec4f7bc9ae86c817cded34
for (let [areaId, areaNodes] of gBuildAreas) {
let placements = gPlacements.get(areaId);
let isFirstChangedToolbar = true;
-@@ -3680,7 +3678,7 @@ var CustomizableUIInternal = {
+@@ -3746,7 +3744,7 @@ var CustomizableUIInternal = {
if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
let defaultCollapsed = area.get("defaultCollapsed");
let win = areaNode.ownerGlobal;
@@ -116,7 +136,7 @@ index 8eab0f9181c19c68a0a2daf0f819b3ae82ed92bc..092107b377ec4f7bc9ae86c817cded34
win.setToolbarVisibility(
areaNode,
typeof defaultCollapsed == "string"
-@@ -4857,6 +4855,7 @@ export var CustomizableUI = {
+@@ -4923,6 +4921,7 @@ export var CustomizableUI = {
unregisterArea(aName, aDestroyPlacements) {
CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
},
@@ -124,7 +144,7 @@ index 8eab0f9181c19c68a0a2daf0f819b3ae82ed92bc..092107b377ec4f7bc9ae86c817cded34
/**
* Add a widget to an area.
* If the area to which you try to add is not known to CustomizableUI,
-@@ -6840,11 +6839,11 @@ class OverflowableToolbar {
+@@ -6916,11 +6915,11 @@ class OverflowableToolbar {
parseFloat(style.paddingLeft) -
parseFloat(style.paddingRight) -
toolbarChildrenWidth;
@@ -138,7 +158,7 @@ index 8eab0f9181c19c68a0a2daf0f819b3ae82ed92bc..092107b377ec4f7bc9ae86c817cded34
});
lazy.log.debug(
-@@ -6854,7 +6853,8 @@ class OverflowableToolbar {
+@@ -6930,7 +6929,8 @@ class OverflowableToolbar {
// If the target has min-width: 0, their children might actually overflow
// it, so check for both cases explicitly.
let targetContentWidth = Math.max(targetWidth, targetChildrenWidth);
@@ -148,7 +168,7 @@ index 8eab0f9181c19c68a0a2daf0f819b3ae82ed92bc..092107b377ec4f7bc9ae86c817cded34
return { isOverflowing, targetContentWidth, totalAvailWidth };
}
-@@ -6948,7 +6948,7 @@ class OverflowableToolbar {
+@@ -7024,7 +7024,7 @@ class OverflowableToolbar {
}
}
if (!inserted) {
@@ -157,7 +177,7 @@ index 8eab0f9181c19c68a0a2daf0f819b3ae82ed92bc..092107b377ec4f7bc9ae86c817cded34
}
child.removeAttribute("cui-anchorid");
child.removeAttribute("overflowedItem");
-@@ -7110,6 +7110,9 @@ class OverflowableToolbar {
+@@ -7186,6 +7186,9 @@ class OverflowableToolbar {
* @param {MouseEvent} aEvent the click event.
*/
#onClickDefaultListButton(aEvent) {
diff --git a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
index 6a690a496..05a35d59b 100644
--- a/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
+++ b/src/browser/components/customizableui/ToolbarContextMenu-sys-mjs.patch
@@ -1,22 +1,13 @@
diff --git a/browser/components/customizableui/ToolbarContextMenu.sys.mjs b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-index 9879487f9ed9ddf825f5fb5c1467ddbd7fbe7a32..9e2565fafe0f5f9afa6065c9f4f522fec745db2a 100644
+index af22f766a052372a68faca139161cccbf0d768f0..ceff0576321f880c71ce301e537f4d03ccca8a73 100644
--- a/browser/components/customizableui/ToolbarContextMenu.sys.mjs
+++ b/browser/components/customizableui/ToolbarContextMenu.sys.mjs
-@@ -237,17 +237,6 @@ export var ToolbarContextMenu = {
- // autohide item's checked state to mirror the autohide pref.
- showFullScreenViewContextMenuItems(popup);
-
-- let toggleVerticalTabsItem = document.getElementById(
-- "toolbar-context-toggle-vertical-tabs"
-- );
-- document.l10n.setAttributes(
-- toggleVerticalTabsItem,
-- gBrowser.tabContainer?.verticalMode
-- ? "toolbar-context-turn-off-vertical-tabs"
-- : "toolbar-context-turn-on-vertical-tabs"
-- );
-- document.getElementById("toolbar-context-customize-sidebar").hidden =
-- !gBrowser.tabContainer?.verticalMode;
-
- // View -> Toolbars menu doesn't have the moveToPanel or removeFromToolbar items.
- if (!moveToPanel || !removeFromToolbar) {
+@@ -241,7 +241,7 @@ export var ToolbarContextMenu = {
+ let sidebarRevampEnabled = Services.prefs.getBoolPref("sidebar.revamp");
+ let showSidebarActions =
+ ["tabbrowser-tabs", "sidebar-button"].includes(toolbarItem?.id) ||
+- toolbarItem?.localName == "toolbarspring";
++ toolbarItem?.localName == "toolbarspring" && false;
+ let toggleVerticalTabsItem = document.getElementById(
+ "toolbar-context-toggle-vertical-tabs"
+ );
diff --git a/src/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection-jsx.patch b/src/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection-jsx.patch
deleted file mode 100644
index 077ed2d81..000000000
--- a/src/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection-jsx.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx b/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
-index 57ed935e93198bb50555d119080552934c49e428..21e8fb35501091d448502dbd0c53ee01ce8b7bc0 100644
---- a/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
-+++ b/browser/components/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
-@@ -153,7 +153,7 @@ export class ContentSection extends React.PureComponent {
- data-l10n-args='{"num": 4}'
- />
- </select>
-- {mayHaveSponsoredTopSites && (
-+ {false && (
- <div className="check-wrapper" role="presentation">
- <input
- id="sponsored-shortcuts"
diff --git a/src/browser/components/newtab/data/content/abouthomecache/page-html-template.patch b/src/browser/components/newtab/data/content/abouthomecache/page-html-template.patch
deleted file mode 100644
index cb95ca6a1..000000000
--- a/src/browser/components/newtab/data/content/abouthomecache/page-html-template.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/browser/components/newtab/data/content/abouthomecache/page.html.template b/browser/components/newtab/data/content/abouthomecache/page.html.template
-index 60898ed6b82ec298198cb9529387f4efd8561cc1..fbd93ccc7ee3619415192164a55f5fcbfd387a51 100644
---- a/browser/components/newtab/data/content/abouthomecache/page.html.template
-+++ b/browser/components/newtab/data/content/abouthomecache/page.html.template
-@@ -32,6 +32,7 @@
- <link rel="stylesheet" href="chrome://global/skin/design-system/tokens-brand.css">
- <link rel="stylesheet" href="chrome://browser/content/contentSearchUI.css" />
- <link rel="stylesheet" href="chrome://activity-stream/content/css/activity-stream.css" />
-+ <script src="chrome://browser/content/zenThemeModifier.js"></script>
- </head>
- <!-- Cached: {{ CACHE_TIME }} -->
- <body class="activity-stream">
diff --git a/src/browser/components/newtab/lib/ActivityStream-sys-mjs.patch b/src/browser/components/newtab/lib/ActivityStream-sys-mjs.patch
deleted file mode 100644
index 02c52af35..000000000
--- a/src/browser/components/newtab/lib/ActivityStream-sys-mjs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/browser/components/newtab/lib/ActivityStream.sys.mjs b/browser/components/newtab/lib/ActivityStream.sys.mjs
-index f46e8aadf053c1a567642cda5f728534c81c8223..9ba13e5988a1fbcbc0502bba46fe6cfa3c647d85 100644
---- a/browser/components/newtab/lib/ActivityStream.sys.mjs
-+++ b/browser/components/newtab/lib/ActivityStream.sys.mjs
-@@ -127,7 +127,7 @@ export const PREFS_CONFIG = new Map([
- "showSponsoredTopSites",
- {
- title: "Show sponsored top sites",
-- value: true,
-+ value: false,
- },
- ],
- [
diff --git a/src/browser/components/places/jar-mn.patch b/src/browser/components/places/jar-mn.patch
index c30c06cf2..446ce0cd4 100644
--- a/src/browser/components/places/jar-mn.patch
+++ b/src/browser/components/places/jar-mn.patch
@@ -1,10 +1,10 @@
diff --git a/browser/components/places/jar.mn b/browser/components/places/jar.mn
-index 7334914664484267ccf80eeeb2917c2001a1acaf..e0636a13798d6fbf41cbf69e51e460822b00ab1a 100644
+index e12c6bbf449f062fd22ef260909b539857f52c6a..2dcc143109de015e4c9d486b83119ae1122d2e71 100644
--- a/browser/components/places/jar.mn
+++ b/browser/components/places/jar.mn
@@ -25,3 +25,5 @@ browser.jar:
+ content/browser/places/interactionsViewer.css (metadataViewer/interactionsViewer.css)
content/browser/places/interactionsViewer.html (metadataViewer/interactionsViewer.html)
content/browser/places/interactionsViewer.js (metadataViewer/interactionsViewer.js)
- #endif
+ content/browser/places/zenNewWebPanel.xhtml (content/zenNewWebPanel.xhtml)
+ content/browser/places/zenNewWebPanel.js (content/zenNewWebPanel.js)
diff --git a/src/browser/components/sessionstore/TabGroupState-sys-mjs.patch b/src/browser/components/sessionstore/TabGroupState-sys-mjs.patch
index 4dd3634c5..034fc32d3 100644
--- a/src/browser/components/sessionstore/TabGroupState-sys-mjs.patch
+++ b/src/browser/components/sessionstore/TabGroupState-sys-mjs.patch
@@ -1,14 +1,14 @@
diff --git a/browser/components/sessionstore/TabGroupState.sys.mjs b/browser/components/sessionstore/TabGroupState.sys.mjs
-index 2406837c67d8ff590aa0db6c75ede81e53097506..b69fb7862cd76c891ef61e29aca8c10bab2f5d7e 100644
+index 934326aefc80479a2ca2ee9e376375f117512b4d..db840ead9ab53849f8f1f33864972347d43f9398 100644
--- a/browser/components/sessionstore/TabGroupState.sys.mjs
+++ b/browser/components/sessionstore/TabGroupState.sys.mjs
-@@ -66,6 +66,9 @@ class _TabGroupState {
- name: tabGroup.label,
- color: tabGroup.color,
- collapsed: tabGroup.collapsed,
+@@ -62,6 +62,9 @@ class _TabGroupState {
+ */
+ collect(tabGroup) {
+ return {
+ pinned: tabGroup.pinned,
+ essential: tabGroup.essential,
+ splitView: tabGroup.hasAttribute("split-view-group"),
- };
- }
-
+ id: tabGroup.id,
+ name: tabGroup.label,
+ color: tabGroup.color,
diff --git a/src/browser/components/sidebar/browser-sidebar-js.patch b/src/browser/components/sidebar/browser-sidebar-js.patch
index 4bd9fb764..1166bc15a 100644
--- a/src/browser/components/sidebar/browser-sidebar-js.patch
+++ b/src/browser/components/sidebar/browser-sidebar-js.patch
@@ -1,22 +1,13 @@
diff --git a/browser/components/sidebar/browser-sidebar.js b/browser/components/sidebar/browser-sidebar.js
-index 1937a01b9940c79782cc2ad002b09ea5938b89e0..a702e8c520fad651a98615215f94657b7e1c58eb 100644
+index 371190c058fa1eed91dc91b58608c934100e3a1b..440fe6fb403c3e78b3bfe68fb747d000b4a27521 100644
--- a/browser/components/sidebar/browser-sidebar.js
+++ b/browser/components/sidebar/browser-sidebar.js
-@@ -671,7 +671,7 @@ var SidebarController = {
- */
- setPosition() {
- // First reset all ordinals to match DOM ordering.
-- let browser = document.getElementById("browser");
-+ let browser = document.getElementById("tabbrowser-tabbox");
- [...browser.children].forEach((node, i) => {
- node.style.order = i + 1;
- });
-@@ -681,7 +681,7 @@ var SidebarController = {
- // DOM ordering is: sidebar-main | launcher-splitter | sidebar-box | splitter | tabbrowser-tabbox |
- // Want to display as: | tabbrowser-tabbox | splitter | sidebar-box | launcher-splitter | sidebar-main
- // So we just swap box and tabbrowser-tabbox ordering and move sidebar-main to the end
-- let tabbox = document.getElementById("tabbrowser-tabbox");
-+ let tabbox = document.getElementById("tabbrowser-tabpanels");
- let boxOrdinal = this._box.style.order;
- this._box.style.order = tabbox.style.order;
-
+@@ -718,7 +718,7 @@ var SidebarController = {
+ }
+ });
+ } else {
+- let browser = document.getElementById("browser");
++ let browser = document.getElementById("tabbrowser-tabbox");
+ [...browser.children].forEach((node, i) => {
+ node.style.order = i + 1;
+ });
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 42ccc1105..7ac2426ab 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 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7409d0582 100644
+index 0dc763824f390b4964489ac4e071ed6d41cc41db..3e0be2c686a162038e99b31fdbcf9832f184a629 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -412,11 +412,50 @@
+@@ -424,11 +424,50 @@
return this.tabContainer.visibleTabs;
}
@@ -55,7 +55,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
}
return i;
}
-@@ -546,6 +585,7 @@
+@@ -558,6 +597,7 @@
this.tabpanels.appendChild(panel);
let tab = this.tabs[0];
@@ -63,7 +63,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
tab.linkedPanel = uniqueId;
this._selectedTab = tab;
this._selectedBrowser = browser;
-@@ -811,12 +851,13 @@
+@@ -823,12 +863,13 @@
}
this.showTab(aTab);
@@ -72,7 +72,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
+ const handled = gZenFolders.handleTabPin(aTab);
+ if (!handled) this.ungroupTab(aTab);
+ if (this.tabContainer.verticalMode && !handled) {
- this._handleTabMove(aTab, () =>
+ this.#handleTabMove(aTab, () =>
- this.verticalPinnedTabsContainer.appendChild(aTab)
+ aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.insertBefore(aTab, this.verticalPinnedTabsContainer.lastChild)
);
@@ -81,12 +81,12 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
}
aTab.setAttribute("pinned", "true");
-@@ -830,12 +871,15 @@
+@@ -842,12 +883,15 @@
}
if (this.tabContainer.verticalMode) {
+ const handled = gZenFolders.handleTabUnpin(aTab);
- this._handleTabMove(aTab, () => {
+ this.#handleTabMove(aTab, () => {
// we remove this attribute first, so that allTabs represents
// the moving of a tab from the vertical pinned tabs container
// and back into arrowscrollbox.
@@ -98,7 +98,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
});
} else {
this.moveTabTo(aTab, this.pinnedTabCount - 1, {
-@@ -1018,6 +1062,8 @@
+@@ -1030,6 +1074,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -107,7 +107,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (
aIconURL &&
!aLoadingPrincipal &&
-@@ -1028,6 +1074,9 @@
+@@ -1040,6 +1086,9 @@
);
return;
}
@@ -117,7 +117,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
-@@ -1273,6 +1322,7 @@
+@@ -1288,6 +1337,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@@ -125,7 +125,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1425,6 +1475,9 @@
+@@ -1440,6 +1490,9 @@
}
let activeEl = document.activeElement;
@@ -135,7 +135,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
// If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) {
newTab.focus();
-@@ -1748,7 +1801,7 @@
+@@ -1763,7 +1816,7 @@
}
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -144,7 +144,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
return false;
}
-@@ -1851,7 +1904,7 @@
+@@ -1866,7 +1919,7 @@
newIndex = this.selectedTab._tPos + 1;
}
@@ -153,7 +153,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
let browser;
if (targetTab) {
browser = this.getBrowserForTab(targetTab);
-@@ -2108,6 +2161,7 @@
+@@ -2123,6 +2176,7 @@
uriIsAboutBlank,
userContextId,
skipLoad,
@@ -161,7 +161,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
} = {}) {
let b = document.createXULElement("browser");
// Use the JSM global to create the permanentKey, so that if the
-@@ -2181,8 +2235,7 @@
+@@ -2196,8 +2250,7 @@
// we use a different attribute name for this?
b.setAttribute("name", name);
}
@@ -171,7 +171,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
b.setAttribute("transparent", "true");
}
-@@ -2347,7 +2400,7 @@
+@@ -2374,7 +2427,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@@ -180,7 +180,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
-@@ -2406,8 +2459,8 @@
+@@ -2433,8 +2486,8 @@
// If we transitioned from one browser to two browsers, we need to set
// hasSiblings=false on both the existing browser and the new browser.
if (this.tabs.length == 2) {
@@ -191,7 +191,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
-@@ -2629,6 +2682,7 @@
+@@ -2656,6 +2709,7 @@
schemelessInput,
hasValidUserGestureActivation = false,
textDirectiveUserActivation = false,
@@ -199,7 +199,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
} = {}
) {
// all callers of addTab that pass a params object need to pass
-@@ -2639,6 +2693,12 @@
+@@ -2666,6 +2720,12 @@
);
}
@@ -212,7 +212,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
-@@ -2702,6 +2762,15 @@
+@@ -2729,6 +2789,15 @@
noInitialLabel,
skipBackgroundNotify,
});
@@ -228,7 +228,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (insertTab) {
// insert the tab into the tab container in the correct position
this._insertTabAtIndex(t, {
-@@ -2726,6 +2795,7 @@
+@@ -2753,6 +2822,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -236,7 +236,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
}));
if (focusUrlBar) {
-@@ -2845,6 +2915,9 @@
+@@ -2872,6 +2942,9 @@
}
}
@@ -246,7 +246,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
-@@ -2865,12 +2938,15 @@
+@@ -2892,12 +2965,15 @@
* @param {string} [label=]
* @returns {MozTabbrowserTabGroup}
*/
@@ -263,15 +263,15 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
return group;
}
-@@ -2904,6 +2980,7 @@
- label = "",
+@@ -2938,6 +3014,7 @@
insertBefore = null,
- showCreateUI = false,
+ isUserCreated = false,
+ telemetryUserCreateSource = "unknown",
+ forSplitView = false,
} = {}
) {
if (!tabs?.length) {
-@@ -2918,7 +2995,12 @@
+@@ -2952,7 +3029,12 @@
id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
}
let group = this._createTabGroup(id, color, false, label);
@@ -285,7 +285,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
group,
insertBefore?.group ?? insertBefore
);
-@@ -3126,6 +3208,7 @@
+@@ -3269,6 +3351,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -293,7 +293,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
}
) {
// If we don't have a preferred remote type, and we have a remote
-@@ -3189,6 +3272,7 @@
+@@ -3332,6 +3415,7 @@
openWindowInfo,
name,
skipLoad,
@@ -301,7 +301,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
});
}
-@@ -3367,6 +3451,27 @@
+@@ -3510,6 +3594,27 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@@ -329,7 +329,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
-@@ -3380,6 +3485,7 @@
+@@ -3523,6 +3628,7 @@
restoreTabsLazily && !select && !tabData.pinned;
let url = "about:blank";
@@ -337,7 +337,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (tabData.entries?.length) {
let activeIndex = (tabData.index || tabData.entries.length) - 1;
// Ensure the index is in bounds.
-@@ -3415,7 +3521,27 @@
+@@ -3558,7 +3664,27 @@
skipLoad: true,
preferredRemoteType,
});
@@ -366,7 +366,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (select) {
tabToSelect = tab;
}
-@@ -3428,8 +3554,8 @@
+@@ -3571,8 +3697,8 @@
// inserted in the DOM. If the tab is not yet in the DOM,
// just insert it in the right place from the start.
if (!tab.parentNode) {
@@ -377,7 +377,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
tab.toggleAttribute("pinned", true);
this.tabContainer._invalidateCachedTabs();
// Then ensure all the tab open/pinning information is sent.
-@@ -3439,7 +3565,8 @@
+@@ -3582,7 +3708,8 @@
// needs calling:
shouldUpdateForPinnedTabs = true;
}
@@ -387,7 +387,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group
-@@ -3453,7 +3580,10 @@
+@@ -3596,7 +3723,10 @@
tabGroup.stateData.id,
tabGroup.stateData.color,
tabGroup.stateData.collapsed,
@@ -399,7 +399,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
);
tabsFragment.appendChild(tabGroup.node);
}
-@@ -3504,6 +3634,9 @@
+@@ -3647,6 +3777,9 @@
this.selectedTab = tabToSelect;
this.removeTab(leftoverTab);
}
@@ -409,7 +409,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert();
-@@ -3693,7 +3826,7 @@
+@@ -3831,7 +3964,7 @@
// Ensure we have an index if one was not provided.
if (typeof index != "number") {
// Move the new tab after another tab if needed, to the end otherwise.
@@ -418,7 +418,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (
!bulkOrderedOpen &&
((openerTab &&
-@@ -3736,18 +3869,18 @@
+@@ -3877,18 +4010,18 @@
// Ensure index is within bounds.
if (tab.pinned) {
@@ -441,7 +441,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (tabAfter && tabAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, tabAfter);
-@@ -4059,6 +4192,9 @@
+@@ -4200,6 +4333,9 @@
return;
}
@@ -451,7 +451,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
this.removeTabs(selectedTabs);
}
-@@ -4391,6 +4527,7 @@
+@@ -4557,6 +4693,7 @@
skipSessionStore,
} = {}
) {
@@ -459,7 +459,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.finish("browser.tabs.opening", window);
}
-@@ -4407,6 +4544,12 @@
+@@ -4573,6 +4710,12 @@
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
}
@@ -472,7 +472,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
-@@ -4421,7 +4564,9 @@
+@@ -4587,7 +4730,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -483,7 +483,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
-@@ -4435,7 +4580,6 @@
+@@ -4601,7 +4746,6 @@
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
return;
}
@@ -491,7 +491,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
let lockTabSizing =
!this.tabContainer.verticalMode &&
!aTab.pinned &&
-@@ -4574,14 +4718,14 @@
+@@ -4740,14 +4884,14 @@
!!this.tabsInCollapsedTabGroups.length;
if (
aTab.visible &&
@@ -508,7 +508,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4605,6 +4749,7 @@
+@@ -4771,6 +4915,7 @@
newTab = true;
}
@@ -516,7 +516,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4645,9 +4790,7 @@
+@@ -4811,9 +4956,7 @@
aTab._mouseleave();
if (newTab) {
@@ -527,7 +527,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
} else {
TabBarVisibility.update();
}
-@@ -4776,6 +4919,8 @@
+@@ -4942,6 +5085,8 @@
this.tabs[i]._tPos = i;
}
@@ -536,7 +536,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
-@@ -4994,7 +5139,7 @@
+@@ -5160,7 +5305,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -545,7 +545,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
}
// Try to find a remaining tab that comes after the given tab
-@@ -5016,7 +5161,7 @@
+@@ -5182,7 +5327,7 @@
}
if (tab) {
@@ -554,7 +554,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
}
// If no qualifying visible tab was found, see if there is a tab in
-@@ -5434,10 +5579,10 @@
+@@ -5600,10 +5745,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -567,8 +567,8 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5675,7 +5820,7 @@
-
+@@ -5839,7 +5984,7 @@
+ moveTabTo(aTab, aIndex, { forceStandaloneTab = false } = {}) {
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
- aIndex = Math.min(aIndex, this.pinnedTabCount - 1);
@@ -576,16 +576,16 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
} else {
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
-@@ -5685,10 +5830,17 @@
+@@ -5849,10 +5994,17 @@
- this._handleTabMove(aTab, () => {
+ this.#handleTabMove(aTab, () => {
let neighbor = this.tabs[aIndex];
- if (forceStandaloneTab && neighbor.group) {
+ const _tPos = aTab._tPos;
+ if ((forceStandaloneTab && neighbor.group) || neighbor.group?.hasAttribute("split-view-group")) {
neighbor = neighbor.group;
}
-- if (neighbor && aIndex >= aTab._tPos) {
+- if (neighbor && aIndex > aTab._tPos) {
+ if (aTab.group?.hasAttribute("split-view-group")) {
+ aTab = aTab.group;
+ }
@@ -596,7 +596,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5697,7 +5849,7 @@
+@@ -5938,7 +6090,7 @@
}
moveTabToGroup(aTab, aGroup) {
@@ -605,7 +605,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -5721,6 +5873,10 @@
+@@ -5962,6 +6114,10 @@
moveActionCallback();
@@ -616,7 +616,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
-@@ -5771,7 +5927,7 @@
+@@ -6016,7 +6172,7 @@
createLazyBrowser,
};
@@ -625,7 +625,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
-@@ -6513,7 +6669,7 @@
+@@ -6766,7 +6922,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -634,7 +634,7 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
window.focus();
aEvent.preventDefault();
break;
-@@ -7415,6 +7571,7 @@
+@@ -7672,6 +7828,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -642,25 +642,25 @@ index 628aa6596627c85efe361fc1ece8fd58f7ee653e..2a9ac30c7e270586ff4502046e5b1ae7
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
-@@ -8381,7 +8538,7 @@ var TabContextMenu = {
+@@ -8641,7 +8798,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
- !this.contextTab.pinned || !multiselectionContext;
+ !this.contextTab.pinned || !this.multiselected;
-
+ gZenPinnedTabManager.updatePinnedTabContextMenu(this.contextTab);
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
-@@ -8414,7 +8571,7 @@ var TabContextMenu = {
- let contextMoveTabToStart = document.getElementById("context_moveToStart");
+@@ -8675,7 +8832,7 @@ var TabContextMenu = {
let isFirstTab =
- tabsToMove[0] == visibleTabs[0] ||
-- tabsToMove[0] == visibleTabs[gBrowser.pinnedTabCount];
-+ tabsToMove[0] == visibleTabs[gBrowser._numVisiblePinTabs];
+ !this.contextTabs[0].group &&
+ (this.contextTabs[0] == visibleTabs[0] ||
+- this.contextTabs[0] == visibleTabs[gBrowser.pinnedTabCount]);
++ this.contextTabs[0] == visibleTabs[gBrowser._numVisiblePinTabs];
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
-@@ -8647,6 +8804,7 @@ var TabContextMenu = {
+@@ -8905,6 +9062,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 353350486..fe09ea5ba 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,8 +1,8 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d734668f2a 100644
+index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187bcdda61d 100644
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
-@@ -94,7 +94,7 @@
+@@ -93,7 +93,7 @@
};
this.arrowScrollbox._canScrollToElement = element => {
if (isTab(element)) {
@@ -11,7 +11,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
}
return true;
};
-@@ -339,7 +339,7 @@
+@@ -347,7 +347,7 @@
// and we're not hitting the scroll buttons.
if (
event.button != 0 ||
@@ -20,7 +20,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
event.composedTarget.localName == "toolbarbutton"
) {
return;
-@@ -388,6 +388,7 @@
+@@ -396,6 +396,7 @@
// Reset the "ignored click" flag
target._ignoredCloseButtonClicks = false;
}
@@ -28,7 +28,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
}
/* Protects from close-tab-button errant doubleclick:
-@@ -683,7 +684,7 @@
+@@ -693,7 +694,7 @@
if (this.#isContainerVerticalPinnedExpanded(tab)) {
// In expanded vertical mode, the max number of pinned tabs per row is dynamic
// Set this before adjusting dragged tab's position
@@ -37,7 +37,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
let tabsPerRow = 0;
let position = 0;
for (let pinnedTab of pinnedTabs) {
-@@ -883,6 +884,10 @@
+@@ -899,6 +900,10 @@
}
let draggedTab = event.dataTransfer.mozGetDataAt(TAB_DROP_TYPE, 0);
@@ -48,7 +48,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
if (
(effects == "move" || effects == "copy") &&
this == draggedTab.container &&
-@@ -996,6 +1001,18 @@
+@@ -1012,6 +1017,18 @@
this._tabDropIndicator.hidden = true;
event.stopPropagation();
@@ -67,41 +67,32 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
if (draggedTab && dropEffect == "copy") {
// copy the dropped tab (wherever it's from)
let newIndex = this._getDropIndex(event);
-@@ -1034,10 +1051,11 @@
+@@ -1050,10 +1067,11 @@
}
} else {
- let pinned = draggedTab.pinned;
+ let isPinned = draggedTab.pinned;
- let numPinned = gBrowser.pinnedTabCount;
-- let tabs = this.visibleTabs.slice(
-- pinned ? 0 : numPinned,
-- pinned ? numPinned : undefined
+- let tabs = this.ariaFocusableItems.slice(
+- isPinned ? 0 : numPinned,
+- isPinned ? numPinned : undefined
+ let numPinned = gBrowser._numVisiblePinTabs;
+ let essential = draggedTab.hasAttribute("zen-essential");
-+ let tabs = this.visibleTabs.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
-+ pinned ? (essential ? 0 : gBrowser._numZenVisibleEssentials) : numPinned,
-+ pinned ? (essential ? gBrowser._numZenVisibleEssentials : numPinned) : undefined
++ let tabs = this.ariaFocusableItems.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
++ isPinned ? (essential ? 0 : gBrowser._numZenVisibleEssentials) : numPinned,
++ isPinned ? (essential ? gBrowser._numZenVisibleEssentials : numPinned) : undefined
);
let size = this.verticalMode ? "height" : "width";
let screenAxis = this.verticalMode ? "screenY" : "screenX";
-@@ -1114,7 +1132,7 @@
- let postTransitionCleanup = () => {
+@@ -1129,7 +1147,7 @@
tab.removeAttribute("tabdrop-samewindow");
-
-- this._finishAnimateTabMove();
-+ this._finishAnimateTabMove(true);
- if (dropIndex !== false) {
- gBrowser.moveTabTo(tab, dropIndex);
- if (!directionForward) {
-@@ -1122,7 +1140,7 @@
- }
- }
+ resolve();
};
- if (gReduceMotion) {
+ if (true || gReduceMotion) {
postTransitionCleanup();
} else {
let onTransitionEnd = transitionendEvent => {
-@@ -1249,7 +1267,7 @@
+@@ -1246,7 +1264,7 @@
return;
}
}
@@ -110,7 +101,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
gBrowser.loadTabs(urls, {
inBackground,
replace,
-@@ -1279,13 +1297,23 @@
+@@ -1276,13 +1294,23 @@
return;
}
@@ -136,7 +127,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
) {
delete draggedTab._dragData;
return;
-@@ -1517,7 +1545,7 @@
+@@ -1504,7 +1532,7 @@
}
get newTabButton() {
@@ -145,7 +136,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
}
get verticalMode() {
-@@ -1537,29 +1565,41 @@
+@@ -1524,29 +1552,41 @@
if (this.#allTabs) {
return this.#allTabs;
}
@@ -195,7 +186,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
}
/**
-@@ -1579,7 +1619,7 @@
+@@ -1566,7 +1606,7 @@
*/
get visibleTabs() {
if (!this.#visibleTabs) {
@@ -204,20 +195,23 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
}
return this.#visibleTabs;
}
-@@ -1613,10 +1653,8 @@
- return this.#focusableItems;
+@@ -1601,13 +1641,11 @@
}
+ let elementIndex = 0;
- let verticalPinnedTabsContainer = document.getElementById(
- "vertical-pinned-tabs-container"
- );
++ let verticalPinnedTabsContainer = this.verticalPinnedTabsContainer
+ for (let i = 0; i < verticalPinnedTabsContainer.childElementCount; i++) {
+ verticalPinnedTabsContainer.children[i].elementIndex = elementIndex++;
+ }
- let children = Array.from(this.arrowScrollbox.children);
-+ let verticalPinnedTabsContainer = this.verticalPinnedTabsContainer;
+ let children = ZenWorkspaces.tabboxChildrenWithoutEmpty;
let focusableItems = [];
for (let child of children) {
-@@ -1632,6 +1670,7 @@
+@@ -1628,6 +1666,7 @@
}
this.#focusableItems = [
@@ -225,7 +219,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
...verticalPinnedTabsContainer.children,
...focusableItems,
];
-@@ -1642,6 +1681,7 @@
+@@ -1638,6 +1677,7 @@
_invalidateCachedTabs() {
this.#allTabs = null;
this._invalidateCachedVisibleTabs();
@@ -233,7 +227,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
}
_invalidateCachedVisibleTabs() {
-@@ -1656,8 +1696,8 @@
+@@ -1652,8 +1692,8 @@
#isContainerVerticalPinnedExpanded(tab) {
return (
this.verticalMode &&
@@ -244,7 +238,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
);
}
-@@ -1672,7 +1712,7 @@
+@@ -1668,7 +1708,7 @@
if (node == null) {
// We have a container for non-tab elements at the end of the scrollbox.
@@ -253,7 +247,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
}
node.before(tab);
-@@ -1772,7 +1812,7 @@
+@@ -1763,7 +1803,7 @@
// There are separate "new tab" buttons for horizontal tabs toolbar, vertical tabs and
// for when the tab strip is overflowed (which is shared by vertical and horizontal tabs);
// Attach the long click popup to all of them.
@@ -262,7 +256,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
const newTab2 = this.newTabButton;
const newTabVertical = document.getElementById(
"vertical-tabs-newtab-button"
-@@ -1855,7 +1895,7 @@
+@@ -1846,7 +1886,7 @@
let rect = ele => {
return window.windowUtils.getBoundsWithoutFlushing(ele);
};
@@ -271,7 +265,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
if (tab && rect(tab).width <= this._tabClipWidth) {
this.setAttribute("closebuttons", "activetab");
} else {
-@@ -1867,10 +1907,12 @@
+@@ -1858,10 +1898,12 @@
_handleTabSelect(aInstant) {
let selectedTab = this.selectedItem;
@@ -284,7 +278,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
selectedTab._notselectedsinceload = false;
}
-@@ -1882,7 +1924,7 @@
+@@ -1873,7 +1915,7 @@
return;
}
@@ -293,7 +287,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
if (!tabs.length) {
return;
}
-@@ -1918,7 +1960,7 @@
+@@ -1909,7 +1951,7 @@
if (isEndTab && !this._hasTabTempMaxWidth) {
return;
}
@@ -302,7 +296,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
// Force tabs to stay the same width, unless we're closing the last tab,
// which case we need to let them expand just enough so that the overall
// tabbar width is the same.
-@@ -1933,7 +1975,7 @@
+@@ -1924,7 +1966,7 @@
let tabsToReset = [];
for (let i = numPinned; i < tabs.length; i++) {
let tab = tabs[i];
@@ -311,7 +305,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
if (!isEndTab) {
// keep tabs the same width
tab.style.transition = "none";
-@@ -1999,16 +2041,15 @@
+@@ -1990,16 +2032,15 @@
// Move pinned tabs to another container when the tabstrip is toggled to vertical
// and when session restore code calls _positionPinnedTabs; update styling whenever
// the number of pinned tabs changes.
@@ -334,7 +328,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
}
}
-@@ -2016,9 +2057,7 @@
+@@ -2007,9 +2048,7 @@
}
_resetVerticalPinnedTabs() {
@@ -345,7 +339,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
if (!verticalTabsContainer.children.length) {
return;
-@@ -2031,8 +2070,8 @@
+@@ -2022,8 +2061,8 @@
}
_positionPinnedTabs() {
@@ -356,7 +350,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
let absPositionHorizontalTabs =
this.overflowing && tabs.length > numPinned && numPinned > 0;
-@@ -2041,7 +2080,7 @@
+@@ -2032,7 +2071,7 @@
if (this.verticalMode) {
this._updateVerticalPinnedTabs();
@@ -365,7 +359,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
let layoutData = this._pinnedTabsLayoutCache;
let uiDensity = document.documentElement.getAttribute("uidensity");
if (!layoutData || layoutData.uiDensity != uiDensity) {
-@@ -2113,7 +2152,7 @@
+@@ -2104,7 +2143,7 @@
return;
}
@@ -374,7 +368,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
let directionX = screenX > dragData.animLastScreenX;
let directionY = screenY > dragData.animLastScreenY;
-@@ -2121,7 +2160,7 @@
+@@ -2112,7 +2151,7 @@
dragData.animLastScreenX = screenX;
let { width: tabWidth, height: tabHeight } =
@@ -384,18 +378,18 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
let shiftSizeY = tabHeight;
dragData.tabWidth = tabWidth;
@@ -2296,10 +2335,11 @@
- }
+ this.#clearDragOverCreateGroupTimer();
- let pinned = draggedTab.pinned;
+ let isPinned = draggedTab.pinned;
- let numPinned = gBrowser.pinnedTabCount;
-- let tabs = this.visibleTabs.slice(
-- pinned ? 0 : numPinned,
-- pinned ? numPinned : undefined
+- let tabs = this.ariaFocusableItems.slice(
+- isPinned ? 0 : numPinned,
+- isPinned ? numPinned : undefined
+ let numPinned = gBrowser._numVisiblePinTabs;
+ let essential = draggedTab.hasAttribute("zen-essential");
-+ let tabs = this.visibleTabs.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
-+ pinned ? (essential ? 0 : gBrowser._numZenVisibleEssentials) : numPinned,
-+ pinned ? (essential ? gBrowser._numZenVisibleEssentials : numPinned) : undefined
++ let tabs = this.ariaFocusableItems.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
++ isPinned ? (essential ? 0 : gBrowser._numZenVisibleEssentials) : numPinned,
++ isPinned ? (essential ? gBrowser._numZenVisibleEssentials : numPinned) : undefined
);
if (this.#rtlMode) {
@@ -412,25 +406,28 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
}
dragData.translatePos = translate;
-@@ -2484,12 +2528,16 @@
+@@ -2639,7 +2683,7 @@
// Shift background tabs to leave a gap where the dragged tab
// would currently be dropped.
- for (let tab of tabs) {
-- if (tab == draggedTab) {
-+ if (tab == draggedTab || (tab.group?.hasAttribute("split-view-group") && tab.group == draggedTab.group)) {
+ for (let item of tabs) {
+- if (item == draggedTab) {
++ if (item == draggedTab || (item.group?.hasAttribute("split-view-group") && item.group == draggedTab.group)) {
continue;
}
- let shift = getTabShift(tab, newIndex);
- let transform = shift ? `${translateAxis}(${shift}px)` : "";
-+ if (tab.group?.hasAttribute("split-view-group")) {
-+ tab.group.style.transform = transform;
+
+@@ -2649,7 +2693,11 @@
+ // Shift the `.tab-group-label-container` to shift the label element.
+ item = item.parentElement;
+ }
++ if (item.group?.hasAttribute("split-view-group")) {
++ item.group.style.transform = transform;
+ } else {
- tab.style.transform = transform;
+ item.style.transform = transform;
+ }
- if (tab.group?.tabs[0] == tab) {
- tab.group.style.setProperty(
- "--tabgroup-dragover-transform",
-@@ -2541,8 +2589,9 @@
+ }
+ }
+
+@@ -2697,8 +2745,9 @@
);
}
@@ -442,16 +439,8 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
return;
}
-@@ -2553,6 +2602,7 @@
- tab.style.transform = "";
- if (tab.group) {
- tab.group.style.removeProperty("--tabgroup-dragover-transform");
-+ tab.group.style.transform = "";
- }
- tab.removeAttribute("dragover-createGroup");
- }
-@@ -2604,7 +2654,7 @@
- movingTab._moveTogetherSelectedTabsData.newIndex = movingTabNewIndex;
+@@ -2754,7 +2803,7 @@
+ let postTransitionCleanup = () => {
movingTab._moveTogetherSelectedTabsData.animate = false;
};
- if (gReduceMotion) {
@@ -459,19 +448,7 @@ index fa96568d366fd3608f9bd583fa793150bd815c8b..13a870629a98304cb18dc09b5ae075d7
postTransitionCleanup();
} else {
let onTransitionEnd = transitionendEvent => {
-@@ -2707,9 +2757,9 @@
- function newIndex(aTab, index) {
- // Don't allow mixing pinned and unpinned tabs.
- if (aTab.pinned) {
-- return Math.min(index, gBrowser.pinnedTabCount - 1);
-+ return Math.min(index, gBrowser._numVisiblePinTabs - 1);
- }
-- return Math.max(index, gBrowser.pinnedTabCount);
-+ return Math.max(index, gBrowser._numVisiblePinTabs);
- }
- }
-
-@@ -2793,7 +2843,7 @@
+@@ -2924,7 +2973,7 @@
}
_notifyBackgroundTab(aTab) {
diff --git a/src/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection-jsx.patch b/src/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection-jsx.patch
new file mode 100644
index 000000000..f92d7c824
--- /dev/null
+++ b/src/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection-jsx.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx b/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
+index dcf192d0ab7323d69f1bf505971e57c98ad4397d..a4d88304786af35030391f71bc99eee6cf7c1a64 100644
+--- a/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
++++ b/browser/extensions/newtab/content-src/components/CustomizeMenu/ContentSection/ContentSection.jsx
+@@ -188,7 +188,7 @@ export class ContentSection extends React.PureComponent {
+ data-l10n-args='{"num": 4}'
+ />
+ </select>
+- {mayHaveSponsoredTopSites && (
++ {false && (
+ <div className="check-wrapper" role="presentation">
+ <input
+ id="sponsored-shortcuts"
diff --git a/src/browser/components/newtab/lib/AboutPreferences-sys-mjs.patch b/src/browser/extensions/newtab/lib/AboutPreferences-sys-mjs.patch
similarity index 56%
rename from src/browser/components/newtab/lib/AboutPreferences-sys-mjs.patch
rename to src/browser/extensions/newtab/lib/AboutPreferences-sys-mjs.patch
index 8284caa02..20ee3686a 100644
--- a/src/browser/components/newtab/lib/AboutPreferences-sys-mjs.patch
+++ b/src/browser/extensions/newtab/lib/AboutPreferences-sys-mjs.patch
@@ -1,7 +1,7 @@
-diff --git a/browser/components/newtab/lib/AboutPreferences.sys.mjs b/browser/components/newtab/lib/AboutPreferences.sys.mjs
-index 33f7ecdaeb7074c7633dd229a4446f2a8ed4b247..f422a9bfb9694b190e84e81a430a509b4ab8c986 100644
---- a/browser/components/newtab/lib/AboutPreferences.sys.mjs
-+++ b/browser/components/newtab/lib/AboutPreferences.sys.mjs
+diff --git a/browser/extensions/newtab/lib/AboutPreferences.sys.mjs b/browser/extensions/newtab/lib/AboutPreferences.sys.mjs
+index df9d63c2713b4237d8acca93f108d5c788caed8d..a80cc02fdec6e1056d26a6b5a1cdc1a602e5cf2a 100644
+--- a/browser/extensions/newtab/lib/AboutPreferences.sys.mjs
++++ b/browser/extensions/newtab/lib/AboutPreferences.sys.mjs
@@ -34,7 +34,7 @@ const PREFS_BEFORE_SECTIONS = () => [
titleString: "home-prefs-shortcuts-header",
descString: "home-prefs-shortcuts-description",
diff --git a/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
new file mode 100644
index 000000000..123516148
--- /dev/null
+++ b/src/browser/extensions/newtab/lib/ActivityStream-sys-mjs.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/extensions/newtab/lib/ActivityStream.sys.mjs b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
+index b3d89213ec27151f05e9990d5a55c6e81ce3655f..3c485f616fa2daba62aacbdde2dfb3122e244821 100644
+--- a/browser/extensions/newtab/lib/ActivityStream.sys.mjs
++++ b/browser/extensions/newtab/lib/ActivityStream.sys.mjs
+@@ -214,7 +214,7 @@ export const PREFS_CONFIG = new Map([
+ "showSponsoredTopSites",
+ {
+ title: "Show sponsored top sites",
+- value: true,
++ value: false,
+ },
+ ],
+ [
diff --git a/src/browser/modules/BrowserDOMWindow-sys-mjs.patch b/src/browser/modules/BrowserDOMWindow-sys-mjs.patch
new file mode 100644
index 000000000..0b909dad0
--- /dev/null
+++ b/src/browser/modules/BrowserDOMWindow-sys-mjs.patch
@@ -0,0 +1,24 @@
+diff --git a/browser/modules/BrowserDOMWindow.sys.mjs b/browser/modules/BrowserDOMWindow.sys.mjs
+index 2bc4918c15b5ea80e486db66d20bb9668b9e29c0..3800a3807f11c5f65ce0d602a775f95037f5dcf8 100644
+--- a/browser/modules/BrowserDOMWindow.sys.mjs
++++ b/browser/modules/BrowserDOMWindow.sys.mjs
+@@ -362,7 +362,7 @@ export class BrowserDOMWindow {
+ // Passing a null-URI to only create the content window,
+ // and pass true for aSkipLoad to prevent loading of
+ // about:blank
+- return this.getContentWindowOrOpenURIInFrame(
++ let res = this.getContentWindowOrOpenURIInFrame(
+ null,
+ aParams,
+ aWhere,
+@@ -370,6 +370,10 @@ export class BrowserDOMWindow {
+ aName,
+ true
+ );
++ if (typeof this.win?.gZenGlanceManager !== "undefined" && this.win.toolbar.visible) {
++ this.win.gZenGlanceManager.onTabOpen(res, aURI);
++ }
++ return res;
+ }
+
+ openURIInFrame(aURI, aParams, aWhere, aFlags, aName) {
diff --git a/src/browser/themes/addons/dark/manifest-json.patch b/src/browser/themes/addons/dark/manifest-json.patch
deleted file mode 100644
index afacba08f..000000000
--- a/src/browser/themes/addons/dark/manifest-json.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/browser/themes/addons/dark/manifest.json b/browser/themes/addons/dark/manifest.json
-index bfebde683d00b0acf26509139a0f662029d37c72..976b553f49e40b7ed02743d79ccc102fccffcf6f 100644
---- a/browser/themes/addons/dark/manifest.json
-+++ b/browser/themes/addons/dark/manifest.json
-@@ -7,10 +7,10 @@
- }
- },
-
-- "name": "Dark",
-+ "name": "Zen Dark",
- "description": "A theme with a dark color scheme.",
-- "author": "Mozilla",
-+ "author": "Zen",
- "version": "1.3.2",
-
- "icons": { "32": "icon.svg" },
-
-@@ -58,7 +58,8 @@
- "color_scheme": "dark",
- "panel_active": "color-mix(in srgb, currentColor 14%, transparent)",
- "toolbar_field_icon_opacity": "1",
-- "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
-+ "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
-+ "zen_main_browser_background": "var(--zen-themed-toolbar-bg)"
- }
- },
-
-@@ -82,7 +83,8 @@
- "properties": {
- "panel_active": "--arrowpanel-dimmed-further",
- "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
-- "zap_gradient": "--panel-separator-zap-gradient"
-+ "zap_gradient": "--panel-separator-zap-gradient",
-+ "zen_main_browser_background": "--zen-main-browser-background"
- }
- }
- }
diff --git a/src/browser/themes/addons/light/manifest-json.patch b/src/browser/themes/addons/light/manifest-json.patch
deleted file mode 100644
index 5be9c4707..000000000
--- a/src/browser/themes/addons/light/manifest-json.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/browser/themes/addons/light/manifest.json b/browser/themes/addons/light/manifest.json
-index d490f8f08d203ded55b65fe1a19be105b61ee6c0..eb4349e939b979b3a4d7c525ee0c0f9a53079d4a 100644
---- a/browser/themes/addons/light/manifest.json
-+++ b/browser/themes/addons/light/manifest.json
-@@ -7,10 +7,10 @@
- }
- },
-
-- "name": "Light",
-+ "name": "Zen Light",
- "description": "A theme with a light color scheme.",
-- "author": "Mozilla",
-+ "author": "Zen",
- "version": "1.3",
-
- "icons": { "32": "icon.svg" },
-
-@@ -59,7 +59,8 @@
- "panel_active": "color-mix(in srgb, currentColor 20%, transparent)",
- "panel_active_darker": "color-mix(in srgb, currentColor 27%, transparent)",
- "toolbar_field_icon_opacity": "0.72",
-- "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)"
-+ "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
-+ "zen_main_browser_background": "var(--zen-themed-toolbar-bg)"
- }
- },
-
-@@ -86,7 +87,8 @@
- "panel_active": "--arrowpanel-dimmed-further",
- "panel_active_darker": "--panel-item-active-bgcolor",
- "toolbar_field_icon_opacity": "--urlbar-icon-fill-opacity",
-- "zap_gradient": "--panel-separator-zap-gradient"
-+ "zap_gradient": "--panel-separator-zap-gradient",
-+ "zen_main_browser_background": "--zen-main-browser-background"
- }
- }
- }
diff --git a/src/browser/themes/linux/browser-css.patch b/src/browser/themes/linux/browser-css.patch
index 433a109c0..324f8abe9 100644
--- a/src/browser/themes/linux/browser-css.patch
+++ b/src/browser/themes/linux/browser-css.patch
@@ -1,5 +1,5 @@
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
-index dc95772553ef7130c27c1122178ff99028b601f2..81f7dbb40c35168376ca84eebfa9fba8d314cb90 100644
+index 5c9891e5ed4b865ed4ecc98d794a239b0f96a8f9..e13bf7277edeb49ebbb12cf9359ac6193bb47ebd 100644
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -42,21 +42,25 @@
@@ -17,7 +17,7 @@ index dc95772553ef7130c27c1122178ff99028b601f2..81f7dbb40c35168376ca84eebfa9fba8
}
/* stylelint-disable-next-line media-query-no-invalid */
- @media (-moz-bool-pref: "widget.gtk.rounded-bottom-corners.enabled") {
+ @media -moz-pref("widget.gtk.rounded-bottom-corners.enabled") {
- #navigator-toolbox {
+ #zen-main-app-wrapper {
/* The body clip below covers this. */
diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch
index 07280d491..f45fcb94d 100644
--- a/src/modules/libpref/init/StaticPrefList-yaml.patch
+++ b/src/modules/libpref/init/StaticPrefList-yaml.patch
@@ -1,17 +1,24 @@
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index a9863858f9a28b2c633edd9689d4379203eef1e6..7ac24baf70727a2a9be428c6f98763f312a0969b 100644
+index 85974462e5ce2b7dbf85bd5c79f09b3db5c25915..428a245cdf58d959256aa3c975687f31aed16b05 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -18305,7 +18305,7 @@
+@@ -18462,13 +18462,13 @@
# Whether we use the mica backdrop. Off by default for now.
- name: widget.windows.mica
type: bool
- value: false
+ value: true
- mirror: once
- #endif
+ mirror: always
+
+ # Whether we use the mica backdrop for popups. Off by default for now.
+ - name: widget.windows.mica.popups
+ type: RelaxedAtomicBool
+- value: false
++ value: true
+ mirror: always
-@@ -18418,6 +18418,26 @@
+ # Whether we expand the client area into the taskbar hidden edge on maximized
+@@ -18594,6 +18594,26 @@
mirror: always
#endif
diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch
index ae49f318a..ed8e74140 100644
--- a/src/toolkit/themes/shared/popup-css.patch
+++ b/src/toolkit/themes/shared/popup-css.patch
@@ -5,45 +5,26 @@ index 648c65a9c21dc0e670b50c82cbfb237a68a951d9..ba20bfdd8e6b9cc985977d06e166147e
@@ -21,8 +21,8 @@ panel {
--panel-border-color: ThreeDShadow;
--panel-width: initial;
-
+
- --panel-shadow-margin: 0px;
- --panel-shadow: 0 0 var(--panel-shadow-margin) hsla(0,0%,0%,.2);
+ --panel-shadow-margin: 10px !important;
+ --panel-shadow: var(--zen-big-shadow);
-moz-window-input-region-margin: var(--panel-shadow-margin);
margin: calc(-1 * var(--panel-shadow-margin));
-
+
@@ -30,8 +30,6 @@ panel {
--background-color-canvas: var(--panel-background);
-
+
@media (-moz-platform: linux) {
- --panel-border-radius: 8px;
- --panel-padding-block: 3px;
-
+
@media (prefers-contrast) {
--panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
-@@ -49,18 +47,6 @@ panel {
- --panel-border-radius: 0px !important;
- }
-
-- @media (-moz-platform: macos) {
-- appearance: auto;
-- -moz-default-appearance: menupopup;
-- /* We set the default background here, rather than on ::part(content),
-- * because otherwise it'd interfere with the native look. Non-native-looking
-- * popups should get their background via --panel-background */
-- background-color: Menu;
-- --panel-background: none;
-- --panel-border-color: transparent;
-- /* This should be kept in sync with GetMenuMaskImage() */
-- --panel-border-radius: 6px;
-- }
-
- &::part(content) {
- display: flex;
@@ -198,7 +184,6 @@ panel:where([type="arrow"]) {
}
-
+
&[animating] {
- pointer-events: none;
}
diff --git a/src/widget/windows/WinUtils-cpp.patch b/src/widget/windows/WinUtils-cpp.patch
new file mode 100644
index 000000000..2d3854274
--- /dev/null
+++ b/src/widget/windows/WinUtils-cpp.patch
@@ -0,0 +1,12 @@
+diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp
+index 598c96cbb5cd06a986a5793ebe9c5438d419d4a9..de1317749e6a6dd7df644818970d7706a51e6c14 100644
+--- a/widget/windows/WinUtils.cpp
++++ b/widget/windows/WinUtils.cpp
+@@ -2007,6 +2007,7 @@ bool WinUtils::GetTimezoneName(wchar_t* aBuffer) {
+ static constexpr nsLiteralCString kMicaPrefs[] = {
+ "widget.windows.mica"_ns,
+ "widget.windows.mica.popups"_ns,
++ "zen.widget.windows.acrylic"_ns,
+ };
+
+ static BOOL CALLBACK UpdateMicaInHwnd(HWND aHwnd, LPARAM aLParam) {
diff --git a/src/widget/windows/nsWindow-cpp.patch b/src/widget/windows/nsWindow-cpp.patch
index 30aefc18b..2c1d4f797 100644
--- a/src/widget/windows/nsWindow-cpp.patch
+++ b/src/widget/windows/nsWindow-cpp.patch
@@ -1,5 +1,5 @@
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
-index 209fa7536df662e24bc6739b7ac9f911fba70ff0..321bb19cf7996a4632110e0099585d7e4ca4ca8a 100644
+index d2863d5fd9ce5cedc88253a07cb061a660d42e61..28e63f8bb0b6c8d3b5655b285ea1040ea426616d 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -165,6 +165,7 @@
@@ -10,12 +10,12 @@ index 209fa7536df662e24bc6739b7ac9f911fba70ff0..321bb19cf7996a4632110e0099585d7e
#include "nsNativeAppSupportWin.h"
#include "nsIGfxInfo.h"
-@@ -2535,7 +2536,7 @@ void nsWindow::SetMicaBackdrop(bool aEnabled) {
-
- // Enable Mica Alt Material if available.
- const DWM_SYSTEMBACKDROP_TYPE type =
-- aEnabled ? DWMSBT_TABBEDWINDOW : DWMSBT_AUTO;
-+ aEnabled ? (StaticPrefs::zen_widget_windows_acrylic_AtStartup() ? DWMSBT_TRANSIENTWINDOW : DWMSBT_TABBEDWINDOW) : DWMSBT_AUTO;
- DwmSetWindowAttribute(mWnd, DWMWA_SYSTEMBACKDROP_TYPE, &type, sizeof type);
- }
-
+@@ -2546,7 +2547,7 @@ void nsWindow::UpdateMicaBackdrop(bool aForce) {
+ if (!useBackdrop) {
+ return DWMSBT_AUTO;
+ }
+- return IsPopup() ? DWMSBT_TRANSIENTWINDOW : DWMSBT_TABBEDWINDOW;
++ return IsPopup() ? DWMSBT_TRANSIENTWINDOW : (StaticPrefs::zen_widget_windows_acrylic_AtStartup() ? DWMSBT_TRANSIENTWINDOW : DWMSBT_TABBEDWINDOW);
+ }();
+ ::DwmSetWindowAttribute(mWnd, DWMWA_SYSTEMBACKDROP_TYPE, &backdrop,
+ sizeof backdrop);
From c3e33fa7f331e60d7d9de9d6bf343c2823f86d0a Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 26 Mar 2025 23:28:30 +0100
Subject: [PATCH 030/114] refactor: update configuration and initialization for
Zen application
---
.github/workflows/windows-release-build.yml | 2 +-
configs/common/mozconfig | 1 -
src/browser/base/content/ZenUIManager.mjs | 7 +++-
.../CustomizableUI-sys-mjs.patch | 6 +--
.../tabbrowser/content/tabbrowser-js.patch | 4 +-
.../urlbar/UrlbarInput-sys-mjs.patch | 41 ++++++++++++-------
src/build/moz-build.patch | 4 +-
src/toolkit/moz-configure.patch | 24 +++++++++--
8 files changed, 59 insertions(+), 30 deletions(-)
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 602e397a4..007d2eb7e 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -177,7 +177,7 @@ jobs:
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
run: |
cd engine/
- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.81
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.82
source $HOME/.cargo/env
if test "${{ matrix.arch }}" = "aarch64"; then
rustup target add aarch64-pc-windows-msvc
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 00c55a046..8267b2253 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -8,7 +8,6 @@ ac_add_options --with-l10n-base="${topsrcdir}/browser/locales"
export MOZ_USER_DIR="${name}"
export MOZ_APP_BASENAME=Zen
-export MOZ_APP_PROFILE=${binName}
export MOZ_BRANDING_DIRECTORY=${brandingDir}
export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir}
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 08f481493..aa75b72eb 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -65,7 +65,7 @@ var gZenUIManager = {
tabs.style.removeProperty('flex');
tabs.style.maxHeight = height + 'px';
gZenVerticalTabsManager.actualWindowButtons.removeAttribute('zen-has-hover');
- gURLBar.updateLayoutBreakout();
+ gURLBar.zenUpdateLayoutBreakout();
},
get tabsWrapper() {
@@ -642,7 +642,10 @@ var gZenVerticalTabsManager = {
if (!isSingleToolbar) {
document.getElementById('urlbar').style.setProperty('--urlbar-height', '32px');
} else {
- gURLBar.updateLayoutBreakout();
+ try {
+ gURLBar.zenUpdateLayoutBreakout();
+ } catch (e) {
+ }
}
// Always move the splitter next to the sidebar
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index f53668d7a..14ccb820c 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..6a68b53443d32461927ef98d770b297caaecf790 100644
+index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..20248e5c0e38d4de3349687157b6aeb40339488d 100644
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -95,7 +95,7 @@ index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..6a68b53443d32461927ef98d770b297c
}
}
-
-+ ZenCustomizableUI.init(window);
++ lazy.ZenCustomizableUI.init(aWindow);
// Now register all the toolbars
for (let area of CustomizableUI.areas) {
let type = CustomizableUI.getAreaType(area);
@@ -106,7 +106,7 @@ index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..6a68b53443d32461927ef98d770b297c
}
}
-
-+ ZenCustomizableUI.registerToolbarNodes(window);
++ lazy.ZenCustomizableUI.registerToolbarNodes(aWindow);
// Handle initial state of vertical tabs.
if (isVerticalTabs) {
// Show the vertical tabs toolbar
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 7ac2426ab..c5019e88c 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 0dc763824f390b4964489ac4e071ed6d41cc41db..3e0be2c686a162038e99b31fdbcf9832f184a629 100644
+index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd8851844e982 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -424,11 +424,50 @@
@@ -656,7 +656,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..3e0be2c686a162038e99b31fdbcf9832
!this.contextTabs[0].group &&
(this.contextTabs[0] == visibleTabs[0] ||
- this.contextTabs[0] == visibleTabs[gBrowser.pinnedTabCount]);
-+ this.contextTabs[0] == visibleTabs[gBrowser._numVisiblePinTabs];
++ this.contextTabs[0] == visibleTabs[gBrowser._numVisiblePinTabs]);
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index ced98537b..d5883a485 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b62e85eed4 100644
+index 6de4c2ac873b1424abee118a143ac377f26beb80..3b41d52c8e00860ce9913a334f15f70e1db08a7c 100644
--- a/browser/components/urlbar/UrlbarInput.sys.mjs
+++ b/browser/components/urlbar/UrlbarInput.sys.mjs
@@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -16,7 +16,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
const DEFAULT_FORM_HISTORY_NAME = "searchbar-history";
const SEARCH_BUTTON_CLASS = "urlbar-search-button";
-@@ -349,7 +356,11 @@ export class UrlbarInput {
+@@ -348,7 +355,11 @@ export class UrlbarInput {
// See _on_select(). HTMLInputElement.select() dispatches a "select"
// event but does not set the primary selection.
this._suppressPrimaryAdjustment = true;
@@ -28,7 +28,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
this._suppressPrimaryAdjustment = false;
}
-@@ -425,6 +436,10 @@ export class UrlbarInput {
+@@ -424,6 +435,10 @@ export class UrlbarInput {
hideSearchTerms = false,
isSameDocument = false
) {
@@ -39,7 +39,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
// We only need to update the searchModeUI on tab switch conditionally
// as we only persist searchMode with ScotchBonnet enabled.
if (
-@@ -698,8 +713,11 @@ export class UrlbarInput {
+@@ -697,8 +712,11 @@ export class UrlbarInput {
return;
}
}
@@ -52,7 +52,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
}
/**
-@@ -943,6 +961,10 @@ export class UrlbarInput {
+@@ -937,6 +955,10 @@ export class UrlbarInput {
// Nullify search mode before setURI so it won't try to restore it.
this.searchMode = null;
this.setURI(null, true, false, true);
@@ -63,7 +63,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
if (this.value && this.focused) {
this.select();
}
-@@ -1098,7 +1120,11 @@ export class UrlbarInput {
+@@ -1092,7 +1114,11 @@ export class UrlbarInput {
}
if (!this.#providesSearchMode(result)) {
@@ -76,7 +76,18 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
}
this.controller.recordSelectedResult(event, result);
-@@ -2157,6 +2183,11 @@ export class UrlbarInput {
+@@ -2124,6 +2150,10 @@ export class UrlbarInput {
+ await this.#updateLayoutBreakoutDimensions();
+ }
+
++ async zenUpdateLayoutBreakout() {
++ await this.#updateLayoutBreakout();
++ }
++
+ startLayoutExtend() {
+ if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
+ // Do not expand if the Urlbar does not support being expanded or it is
+@@ -2146,6 +2176,11 @@ export class UrlbarInput {
this.setAttribute("breakout-extend", "true");
@@ -88,7 +99,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
// Enable the animation only after the first extend call to ensure it
// doesn't run when opening a new window.
if (!this.hasAttribute("breakout-extend-animate")) {
-@@ -2176,6 +2207,11 @@ export class UrlbarInput {
+@@ -2165,6 +2200,11 @@ export class UrlbarInput {
return;
}
@@ -100,7 +111,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
this.removeAttribute("breakout-extend");
this.#updateTextboxPosition();
}
-@@ -2998,7 +3034,7 @@ export class UrlbarInput {
+@@ -2997,7 +3037,7 @@ export class UrlbarInput {
*/
_trimValue(val) {
let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -109,7 +120,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
: val;
// Only trim value if the directionality doesn't change to RTL and we're not
// showing a strikeout https protocol.
-@@ -3365,7 +3401,7 @@ export class UrlbarInput {
+@@ -3359,7 +3399,7 @@ export class UrlbarInput {
} else {
where = lazy.BrowserUtils.whereToOpenLink(event, false, false);
}
@@ -118,7 +129,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
if (where == "current") {
where = "tab";
} else if (where == "tab") {
-@@ -3380,6 +3416,9 @@ export class UrlbarInput {
+@@ -3374,6 +3414,9 @@ export class UrlbarInput {
) {
where = "current";
}
@@ -128,7 +139,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
return where;
}
-@@ -3921,6 +3960,11 @@ export class UrlbarInput {
+@@ -4048,6 +4091,11 @@ export class UrlbarInput {
}
_on_click(event) {
@@ -140,7 +151,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
if (
event.target == this.inputField ||
event.target == this._inputContainer ||
-@@ -3992,7 +4036,7 @@ export class UrlbarInput {
+@@ -4119,7 +4167,7 @@ export class UrlbarInput {
}
}
@@ -149,7 +160,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
this.view.autoOpen({ event });
} else {
if (this._untrimOnFocusAfterKeydown) {
-@@ -4032,9 +4076,12 @@ export class UrlbarInput {
+@@ -4159,9 +4207,12 @@ export class UrlbarInput {
}
_on_mousedown(event) {
@@ -163,7 +174,7 @@ index 02c328f0d0724b0cf95c820fe49a43e94a97b3c2..79b9161544633d319d7e550dd95334b6
if (
event.target != this.inputField &&
-@@ -4044,8 +4091,8 @@ export class UrlbarInput {
+@@ -4171,8 +4222,8 @@ export class UrlbarInput {
break;
}
diff --git a/src/build/moz-build.patch b/src/build/moz-build.patch
index c6b981eae..46aee904f 100644
--- a/src/build/moz-build.patch
+++ b/src/build/moz-build.patch
@@ -1,8 +1,8 @@
diff --git a/build/moz.build b/build/moz.build
-index 7bf9c501db06d38f924c26372d4243d448af8d81..90b02a99af90c40cea7d90c20ce1bac3d8c109a8 100644
+index ad78395c33bba4f6a7bd73bae2a3b6e0658ed59e..a3ba1001a60b764c9ef1c824917fe4d5b81ed0b2 100644
--- a/build/moz.build
+++ b/build/moz.build
-@@ -91,7 +91,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
+@@ -90,7 +90,7 @@ if CONFIG["MOZ_APP_BASENAME"]:
if CONFIG[var]:
appini_defines[var] = True
diff --git a/src/toolkit/moz-configure.patch b/src/toolkit/moz-configure.patch
index f3cd4394e..ffc5d8d46 100644
--- a/src/toolkit/moz-configure.patch
+++ b/src/toolkit/moz-configure.patch
@@ -1,8 +1,24 @@
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
-index 9c3bb513537f1efc44788fc3efb9f7561eca9c0e..dcada8742c5ea147d2378357c86c9a8b7dc639db 100644
+index e5e517635d639f43de064fdc81a33090c28ca786..67ce7a27d93c3c6f9c8045c2d5796b85bf059113 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
-@@ -81,10 +81,13 @@ option(
+@@ -22,6 +22,7 @@ def check_moz_app_id(moz_app_id, build_project):
+
+ project_flag(
+ env="MOZ_APP_VENDOR",
++ default="Zen Team",
+ nargs=1,
+ help='Used for application.ini\'s "Vendor" field, which also impacts profile location and user-visible fields',
+ )
+@@ -35,6 +36,7 @@ project_flag(
+
+ project_flag(
+ "MOZ_APP_PROFILE",
++ default="zen",
+ nargs=1,
+ help='Used for application.ini\'s "Profile" field, which controls profile location',
+ )
+@@ -87,10 +89,13 @@ option(
)
set_config("MOZ_INCLUDE_SOURCE_INFO", True, when="MOZ_INCLUDE_SOURCE_INFO")
@@ -17,7 +33,7 @@ index 9c3bb513537f1efc44788fc3efb9f7561eca9c0e..dcada8742c5ea147d2378357c86c9a8b
help="Set distribution-specific id",
)
set_config("MOZ_DISTRIBUTION_ID", depends("--with-distribution-id")(lambda v: v[0]))
-@@ -869,9 +872,9 @@ set_define("MOZ_AV1", av1)
+@@ -881,9 +886,9 @@ set_config("MOZ_SYSTEM_AV1", True, when="--with-system-av1")
option("--disable-jxl", help="Disable jxl image support")
@@ -30,7 +46,7 @@ index 9c3bb513537f1efc44788fc3efb9f7561eca9c0e..dcada8742c5ea147d2378357c86c9a8b
return True
-@@ -2012,7 +2015,7 @@ set_define("A11Y_LOG", True, when=a11y_log)
+@@ -2019,7 +2024,7 @@ set_define("A11Y_LOG", True, when=a11y_log)
# ==============================================================
@depends(milestone)
def require_signing(milestone):
From baafa12967491e235d3074e89fe96fa112615b52 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 26 Mar 2025 23:41:42 +0100
Subject: [PATCH 031/114] fix: add missing newline at end of surfer.json
---
.../tabbrowser/content/tabbrowser-js.patch | 109 +++++++++---------
surfer.json | 2 +-
2 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index c5019e88c..d05ade5d0 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 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd8851844e982 100644
+index 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd8851844e982 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -424,11 +424,50 @@
@@ -63,11 +63,10 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
tab.linkedPanel = uniqueId;
this._selectedTab = tab;
this._selectedBrowser = browser;
-@@ -823,12 +863,13 @@
+@@ -823,11 +863,13 @@
}
this.showTab(aTab);
-- this.ungroupTab(aTab);
- if (this.tabContainer.verticalMode) {
+ const handled = gZenFolders.handleTabPin(aTab);
+ if (!handled) this.ungroupTab(aTab);
@@ -81,7 +80,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
}
aTab.setAttribute("pinned", "true");
-@@ -842,12 +883,15 @@
+@@ -841,12 +883,15 @@
}
if (this.tabContainer.verticalMode) {
@@ -98,7 +97,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
});
} else {
this.moveTabTo(aTab, this.pinnedTabCount - 1, {
-@@ -1030,6 +1074,8 @@
+@@ -1029,6 +1074,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -107,7 +106,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (
aIconURL &&
!aLoadingPrincipal &&
-@@ -1040,6 +1086,9 @@
+@@ -1039,6 +1086,9 @@
);
return;
}
@@ -117,7 +116,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
-@@ -1288,6 +1337,7 @@
+@@ -1287,6 +1337,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@@ -125,7 +124,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1440,6 +1490,9 @@
+@@ -1439,6 +1490,9 @@
}
let activeEl = document.activeElement;
@@ -135,7 +134,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
// If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) {
newTab.focus();
-@@ -1763,7 +1816,7 @@
+@@ -1762,7 +1816,7 @@
}
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -144,7 +143,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
return false;
}
-@@ -1866,7 +1919,7 @@
+@@ -1865,7 +1919,7 @@
newIndex = this.selectedTab._tPos + 1;
}
@@ -153,7 +152,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
let browser;
if (targetTab) {
browser = this.getBrowserForTab(targetTab);
-@@ -2123,6 +2176,7 @@
+@@ -2122,6 +2176,7 @@
uriIsAboutBlank,
userContextId,
skipLoad,
@@ -161,7 +160,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} = {}) {
let b = document.createXULElement("browser");
// Use the JSM global to create the permanentKey, so that if the
-@@ -2196,8 +2250,7 @@
+@@ -2195,8 +2250,7 @@
// we use a different attribute name for this?
b.setAttribute("name", name);
}
@@ -171,7 +170,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
b.setAttribute("transparent", "true");
}
-@@ -2374,7 +2427,7 @@
+@@ -2373,7 +2427,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@@ -180,7 +179,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
-@@ -2433,8 +2486,8 @@
+@@ -2432,8 +2486,8 @@
// If we transitioned from one browser to two browsers, we need to set
// hasSiblings=false on both the existing browser and the new browser.
if (this.tabs.length == 2) {
@@ -191,7 +190,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
-@@ -2656,6 +2709,7 @@
+@@ -2655,6 +2709,7 @@
schemelessInput,
hasValidUserGestureActivation = false,
textDirectiveUserActivation = false,
@@ -199,7 +198,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} = {}
) {
// all callers of addTab that pass a params object need to pass
-@@ -2666,6 +2720,12 @@
+@@ -2665,6 +2720,12 @@
);
}
@@ -212,7 +211,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
-@@ -2729,6 +2789,15 @@
+@@ -2728,6 +2789,15 @@
noInitialLabel,
skipBackgroundNotify,
});
@@ -228,7 +227,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (insertTab) {
// insert the tab into the tab container in the correct position
this._insertTabAtIndex(t, {
-@@ -2753,6 +2822,7 @@
+@@ -2752,6 +2822,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -236,7 +235,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
}));
if (focusUrlBar) {
-@@ -2872,6 +2942,9 @@
+@@ -2871,6 +2942,9 @@
}
}
@@ -246,7 +245,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
-@@ -2892,12 +2965,15 @@
+@@ -2891,12 +2965,15 @@
* @param {string} [label=]
* @returns {MozTabbrowserTabGroup}
*/
@@ -263,7 +262,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
return group;
}
-@@ -2938,6 +3014,7 @@
+@@ -2937,6 +3014,7 @@
insertBefore = null,
isUserCreated = false,
telemetryUserCreateSource = "unknown",
@@ -271,7 +270,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} = {}
) {
if (!tabs?.length) {
-@@ -2952,7 +3029,12 @@
+@@ -2951,7 +3029,12 @@
id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
}
let group = this._createTabGroup(id, color, false, label);
@@ -285,7 +284,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
group,
insertBefore?.group ?? insertBefore
);
-@@ -3269,6 +3351,7 @@
+@@ -3268,6 +3351,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -293,7 +292,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
}
) {
// If we don't have a preferred remote type, and we have a remote
-@@ -3332,6 +3415,7 @@
+@@ -3331,6 +3415,7 @@
openWindowInfo,
name,
skipLoad,
@@ -301,7 +300,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
});
}
-@@ -3510,6 +3594,27 @@
+@@ -3509,6 +3594,27 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@@ -329,7 +328,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
-@@ -3523,6 +3628,7 @@
+@@ -3522,6 +3628,7 @@
restoreTabsLazily && !select && !tabData.pinned;
let url = "about:blank";
@@ -337,7 +336,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (tabData.entries?.length) {
let activeIndex = (tabData.index || tabData.entries.length) - 1;
// Ensure the index is in bounds.
-@@ -3558,7 +3664,27 @@
+@@ -3557,7 +3664,27 @@
skipLoad: true,
preferredRemoteType,
});
@@ -366,7 +365,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (select) {
tabToSelect = tab;
}
-@@ -3571,8 +3697,8 @@
+@@ -3570,8 +3697,8 @@
// inserted in the DOM. If the tab is not yet in the DOM,
// just insert it in the right place from the start.
if (!tab.parentNode) {
@@ -377,7 +376,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
tab.toggleAttribute("pinned", true);
this.tabContainer._invalidateCachedTabs();
// Then ensure all the tab open/pinning information is sent.
-@@ -3582,7 +3708,8 @@
+@@ -3581,7 +3708,8 @@
// needs calling:
shouldUpdateForPinnedTabs = true;
}
@@ -387,7 +386,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group
-@@ -3596,7 +3723,10 @@
+@@ -3595,7 +3723,10 @@
tabGroup.stateData.id,
tabGroup.stateData.color,
tabGroup.stateData.collapsed,
@@ -399,7 +398,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
);
tabsFragment.appendChild(tabGroup.node);
}
-@@ -3647,6 +3777,9 @@
+@@ -3646,6 +3777,9 @@
this.selectedTab = tabToSelect;
this.removeTab(leftoverTab);
}
@@ -409,7 +408,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert();
-@@ -3831,7 +3964,7 @@
+@@ -3830,7 +3964,7 @@
// Ensure we have an index if one was not provided.
if (typeof index != "number") {
// Move the new tab after another tab if needed, to the end otherwise.
@@ -418,7 +417,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (
!bulkOrderedOpen &&
((openerTab &&
-@@ -3877,18 +4010,18 @@
+@@ -3876,18 +4010,18 @@
// Ensure index is within bounds.
if (tab.pinned) {
@@ -441,7 +440,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (tabAfter && tabAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, tabAfter);
-@@ -4200,6 +4333,9 @@
+@@ -4199,6 +4333,9 @@
return;
}
@@ -451,7 +450,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
this.removeTabs(selectedTabs);
}
-@@ -4557,6 +4693,7 @@
+@@ -4556,6 +4693,7 @@
skipSessionStore,
} = {}
) {
@@ -459,7 +458,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.finish("browser.tabs.opening", window);
}
-@@ -4573,6 +4710,12 @@
+@@ -4572,6 +4710,12 @@
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
}
@@ -472,7 +471,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
-@@ -4587,7 +4730,9 @@
+@@ -4586,7 +4730,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -483,7 +482,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
-@@ -4601,7 +4746,6 @@
+@@ -4600,7 +4746,6 @@
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
return;
}
@@ -491,7 +490,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
let lockTabSizing =
!this.tabContainer.verticalMode &&
!aTab.pinned &&
-@@ -4740,14 +4884,14 @@
+@@ -4739,14 +4884,14 @@
!!this.tabsInCollapsedTabGroups.length;
if (
aTab.visible &&
@@ -508,7 +507,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4771,6 +4915,7 @@
+@@ -4770,6 +4915,7 @@
newTab = true;
}
@@ -516,7 +515,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4811,9 +4956,7 @@
+@@ -4810,9 +4956,7 @@
aTab._mouseleave();
if (newTab) {
@@ -527,7 +526,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} else {
TabBarVisibility.update();
}
-@@ -4942,6 +5085,8 @@
+@@ -4941,6 +5085,8 @@
this.tabs[i]._tPos = i;
}
@@ -536,7 +535,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
-@@ -5160,7 +5305,7 @@
+@@ -5159,7 +5305,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -545,7 +544,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
}
// Try to find a remaining tab that comes after the given tab
-@@ -5182,7 +5327,7 @@
+@@ -5181,7 +5327,7 @@
}
if (tab) {
@@ -554,7 +553,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
}
// If no qualifying visible tab was found, see if there is a tab in
-@@ -5600,10 +5745,10 @@
+@@ -5599,10 +5745,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -567,7 +566,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5839,7 +5984,7 @@
+@@ -5838,7 +5984,7 @@
moveTabTo(aTab, aIndex, { forceStandaloneTab = false } = {}) {
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
@@ -576,7 +575,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} else {
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
-@@ -5849,10 +5994,17 @@
+@@ -5848,10 +5994,17 @@
this.#handleTabMove(aTab, () => {
let neighbor = this.tabs[aIndex];
@@ -596,7 +595,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5938,7 +6090,7 @@
+@@ -5937,7 +6090,7 @@
}
moveTabToGroup(aTab, aGroup) {
@@ -605,7 +604,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -5962,6 +6114,10 @@
+@@ -5961,6 +6114,10 @@
moveActionCallback();
@@ -616,7 +615,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
-@@ -6016,7 +6172,7 @@
+@@ -6015,7 +6172,7 @@
createLazyBrowser,
};
@@ -625,7 +624,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
-@@ -6766,7 +6922,7 @@
+@@ -6765,7 +6922,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -634,7 +633,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
window.focus();
aEvent.preventDefault();
break;
-@@ -7672,6 +7828,7 @@
+@@ -7671,6 +7828,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -642,7 +641,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
-@@ -8641,7 +8798,7 @@ var TabContextMenu = {
+@@ -8640,7 +8798,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@@ -651,7 +650,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
-@@ -8675,7 +8832,7 @@ var TabContextMenu = {
+@@ -8674,7 +8832,7 @@ var TabContextMenu = {
let isFirstTab =
!this.contextTabs[0].group &&
(this.contextTabs[0] == visibleTabs[0] ||
@@ -660,7 +659,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
-@@ -8905,6 +9062,7 @@ var TabContextMenu = {
+@@ -8904,6 +9062,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {
diff --git a/surfer.json b/surfer.json
index b7018c922..db962de92 100644
--- a/surfer.json
+++ b/surfer.json
@@ -53,4 +53,4 @@
"licenseType": "MPL-2.0"
},
"updateHostname": "updates.zen-browser.app"
-}
+}
\ No newline at end of file
From e43f9729a722edfcd2a1b58de728b62ae1528fa8 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 27 Mar 2025 00:22:43 +0100
Subject: [PATCH 032/114] Fixed fetching bool prefs on the CSS
---
src/browser/base/content/ZenUIManager.mjs | 3 +--
.../content/zen-styles/zen-browser-container.css | 2 +-
.../base/content/zen-styles/zen-browser-ui.css | 6 +++---
.../base/content/zen-styles/zen-compact-mode.css | 10 +++++-----
.../base/content/zen-styles/zen-decks.css | 2 +-
.../zen-styles/zen-gradient-generator.css | 2 +-
src/browser/base/content/zen-styles/zen-tabs.css | 2 +-
.../zen-styles/zen-tabs/horizontal-tabs.css | 2 +-
.../zen-tabs/vertical-tabs-topbar.inc.css | 4 ++--
.../zen-styles/zen-tabs/vertical-tabs.css | 16 ++++++++--------
.../base/content/zen-styles/zen-theme.css | 2 +-
.../base/content/zen-styles/zen-urlbar.css | 2 +-
.../base/content/zen-styles/zen-workspaces.css | 2 +-
.../shared/preferences/zen-preferences.css | 2 +-
14 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index aa75b72eb..637aac71b 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -644,8 +644,7 @@ var gZenVerticalTabsManager = {
} else {
try {
gURLBar.zenUpdateLayoutBreakout();
- } catch (e) {
- }
+ } catch (e) {}
}
// Always move the splitter next to the sidebar
diff --git a/src/browser/base/content/zen-styles/zen-browser-container.css b/src/browser/base/content/zen-styles/zen-browser-container.css
index 96750285a..61be43c46 100644
--- a/src/browser/base/content/zen-styles/zen-browser-container.css
+++ b/src/browser/base/content/zen-styles/zen-browser-container.css
@@ -19,7 +19,7 @@
}
}
- @media (-moz-bool-pref: 'zen.view.experimental-rounded-view') {
+ @media -moz-pref('zen.view.experimental-rounded-view') {
#tabbrowser-tabpanels {
mix-blend-mode: multiply;
-moz-osx-font-smoothing: grayscale;
diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index ada3d5667..b9210f0bf 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -52,7 +52,7 @@
transition: background-color var(--inactive-window-transition);
}
- @media (-moz-bool-pref: 'zen.theme.gradient') {
+ @media -moz-pref('zen.theme.gradient') {
&[animating='true']::after {
background: var(--zen-main-browser-background-old);
backdrop-filter: blur(5px);
@@ -61,7 +61,7 @@
}
}
- @media (not (-moz-windows-mica)) and (-moz-bool-pref: 'zen.view.grey-out-inactive-windows') {
+ @media (not (-moz-windows-mica)) and -moz-pref('zen.view.grey-out-inactive-windows') {
transition: color var(--inactive-window-transition);
:root:not([zen-welcome-stage]) &:-moz-window-inactive {
color: var(--toolbox-textcolor-inactive);
@@ -173,7 +173,7 @@
}
}
- @media (-moz-bool-pref: 'zen.widget.mac.mono-window-controls') {
+ @media -moz-pref('zen.widget.mac.mono-window-controls') {
.titlebar-buttonbox-container {
/* Draw 3 dots as background to represent the window controls,
all with the same cololr as the titlebar */
diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index 7a1e14a72..42b6d576f 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -8,7 +8,7 @@
:root[zen-compact-mode='true']:not([customizing]):not([inDOMFullscreen='true']) {
%include zen-tabs/vertical-tabs-topbuttons-fix.css
- @media (-moz-bool-pref: 'zen.view.compact.hide-tabbar') or (-moz-bool-pref: 'zen.view.use-single-toolbar') {
+ @media -moz-pref('zen.view.compact.hide-tabbar') or -moz-pref('zen.view.use-single-toolbar') {
#zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel[pinned='true']) {
margin-left: var(--zen-sidebar-web-panel-spacing) !important;
}
@@ -77,7 +77,7 @@
/* When we have multiple toolbars and the top-toolbar is NOT being hidden,
* we need to adjust the top-padding of the toolbox to account for the
* extra toolbar height. */
- @media not (-moz-bool-pref: 'zen.view.compact.hide-toolbar') {
+ @media not -moz-pref('zen.view.compact.hide-toolbar') {
&:not([zen-single-toolbar='true']) #navigator-toolbox:not([animate='true']) {
margin-top: var(--zen-toolbar-height) !important;
}
@@ -121,7 +121,7 @@
margin-left: 0 !important;
}
- @media (-moz-bool-pref: 'zen.view.compact.color-sidebar') {
+ @media -moz-pref('zen.view.compact.color-sidebar') {
background: var(--zen-main-browser-background-toolbar) !important;
background-attachment: fixed !important;
background-size: 2000px !important; /* Dont ask me why */
@@ -285,7 +285,7 @@
}
}
- @media (-moz-bool-pref: 'zen.view.compact.hide-toolbar') {
+ @media -moz-pref('zen.view.compact.hide-toolbar') {
&:not([zen-single-toolbar='true']) {
& #navigator-toolbox {
top: 0;
@@ -337,7 +337,7 @@
opacity: 0;
}
- @media (-moz-bool-pref: 'zen.view.compact.color-toolbar') {
+ @media -moz-pref('zen.view.compact.color-toolbar') {
background-attachment: fixed;
background: var(--zen-main-browser-background-toolbar);
background-size: 100% 2000px;
diff --git a/src/browser/base/content/zen-styles/zen-decks.css b/src/browser/base/content/zen-styles/zen-decks.css
index 8b39b2a47..fb8969930 100644
--- a/src/browser/base/content/zen-styles/zen-decks.css
+++ b/src/browser/base/content/zen-styles/zen-decks.css
@@ -56,7 +56,7 @@
#tabbrowser-tabpanels:has(> [zen-split='true']),
#zen-splitview-overlay {
:root:not([zen-compact-mode='true']):not([customizing]) & {
- @media (-moz-bool-pref: 'zen.view.compact.hide-toolbar') {
+ @media -moz-pref('zen.view.compact.hide-toolbar') {
& {
margin-top: calc(var(--zen-split-column-gap) * -1);
}
diff --git a/src/browser/base/content/zen-styles/zen-gradient-generator.css b/src/browser/base/content/zen-styles/zen-gradient-generator.css
index 998fa95b8..634a84e95 100644
--- a/src/browser/base/content/zen-styles/zen-gradient-generator.css
+++ b/src/browser/base/content/zen-styles/zen-gradient-generator.css
@@ -296,7 +296,7 @@
}
}
-@media not (-moz-bool-pref: 'zen.theme.gradient.show-custom-colors') {
+@media not -moz-pref('zen.theme.gradient.show-custom-colors') {
#PanelUI-zen-gradient-generator-custom-colors {
display: none !important;
}
diff --git a/src/browser/base/content/zen-styles/zen-tabs.css b/src/browser/base/content/zen-styles/zen-tabs.css
index 055ba613e..49905b837 100644
--- a/src/browser/base/content/zen-styles/zen-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs.css
@@ -12,7 +12,7 @@
z-index: 0;
}
-@media (-moz-bool-pref: 'zen.workspaces.hide-default-container-indicator') {
+@media -moz-pref('zen.workspaces.hide-default-container-indicator') {
.tabbrowser-tab[zenDefaultUserContextId='true'] .tab-context-line {
display: none !important;
}
diff --git a/src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css
index 200eaee1e..ecaedd0dd 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/horizontal-tabs.css
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-@media not (-moz-bool-pref: 'zen.tabs.vertical') {
+@media not -moz-pref('zen.tabs.vertical') {
:root #browser {
display: flex !important;
flex-direction: column !important;
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css
index a14afcac7..1e0517c5b 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs-topbar.inc.css
@@ -1,6 +1,6 @@
height: var(--zen-toolbar-height);
-@media (-moz-bool-pref: 'zen.view.hide-window-controls') {
+@media -moz-pref('zen.view.hide-window-controls') {
& {
transition:
height 0.15s ease,
@@ -24,7 +24,7 @@ height: var(--zen-toolbar-height);
}
}
- @media (-moz-bool-pref: 'zen.view.experimental-no-window-controls') {
+ @media -moz-pref('zen.view.experimental-no-window-controls') {
&:has(#PersonalToolbar[collapsed='true']) {
max-height: 0 !important;
overflow: hidden;
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index f93c6f6f9..d7b79b8ab 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -19,7 +19,7 @@
height: var(--zen-toolbar-height);
}
- @media (-moz-platform: macos) and (not (-moz-bool-pref: 'zen.view.mac.show-three-dot-menu')) {
+ @media (-moz-platform: macos) and (not -moz-pref('zen.view.mac.show-three-dot-menu')) {
&:not([customizing]) #PanelUI-button:not([open]):not([panelopen]) {
position: absolute;
opacity: 0;
@@ -38,7 +38,7 @@
}
}
-@media (-moz-bool-pref: 'zen.tabs.vertical') {
+@media -moz-pref('zen.tabs.vertical') {
:root:not([zen-window-buttons-reversed='true']) {
& .titlebar-buttonbox-container {
margin-left: auto;
@@ -294,7 +294,7 @@
}
}
- @media (-moz-bool-pref: 'zen.tabs.dim-pending') {
+ @media -moz-pref('zen.tabs.dim-pending') {
&[pending='true'] .tab-icon-image {
opacity: 0.5;
}
@@ -734,7 +734,7 @@
}
}
}
- @media (-moz-bool-pref: 'zen.view.sidebar-collapsed.hide-mute-button') {
+ @media -moz-pref('zen.view.sidebar-collapsed.hide-mute-button') {
& .tab-icon-overlay:is([soundplaying], [muted]):not([selected]) {
display: none !important;
:is(
@@ -992,7 +992,7 @@
opacity: 0.5;
}
-@media (-moz-bool-pref: 'zen.tabs.show-newtab-vertical') {
+@media -moz-pref('zen.tabs.show-newtab-vertical') {
#tabs-newtab-button {
display: flex !important;
transition: scale 0.1s ease;
@@ -1018,11 +1018,11 @@
--zen-colors-border: var(--zen-colors-tertiary);
}
- @media (-moz-bool-pref: 'zen.view.show-newtab-button-top') {
+ @media -moz-pref('zen.view.show-newtab-button-top') {
order: -1;
}
- @media (-moz-bool-pref: 'zen.view.show-newtab-button-border-top') and (not (-moz-bool-pref: 'zen.view.show-newtab-button-top')) {
+ @media -moz-pref('zen.view.show-newtab-button-border-top') and (not -moz-pref('zen.view.show-newtab-button-top')) {
#tabbrowser-arrowscrollbox:has(tab:not([hidden])) & {
margin-top: 15px;
position: relative;
@@ -1101,7 +1101,7 @@
background: var(--tab-selected-bgcolor);
}
- @media (-moz-bool-pref: 'zen.theme.essentials-favicon-bg') {
+ @media -moz-pref('zen.theme.essentials-favicon-bg') {
&[visuallyselected] > .tab-stack > .tab-background {
&::after {
content: "";
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index f47f42089..0a914baa0 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -163,7 +163,7 @@
@media (-moz-windows-mica) or (-moz-platform: macos) {
background: transparent;
--zen-themed-toolbar-bg-transparent: transparent;
- @media (-moz-bool-pref: 'zen.widget.windows.acrylic') {
+ @media -moz-pref('zen.widget.windows.acrylic') {
--zen-themed-toolbar-bg-transparent: color-mix(in srgb, var(--zen-themed-toolbar-bg) 35%, transparent 65%);
}
}
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
index 064bfb6b0..17bff9762 100644
--- a/src/browser/base/content/zen-styles/zen-urlbar.css
+++ b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -464,7 +464,7 @@ button.popup-notification-dropmarker {
}
}
-@media not (-moz-bool-pref: 'zen.urlbar.show-protections-icon') {
+@media not -moz-pref('zen.urlbar.show-protections-icon') {
#tracking-protection-icon-container {
display: none !important;
}
diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index 2717ceacf..af6d57541 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -483,7 +483,7 @@
}
}
-@media not (-moz-bool-pref: 'zen.workspaces.show-workspace-indicator') {
+@media not -moz-pref('zen.workspaces.show-workspace-indicator') {
#zen-current-workspace-indicator-container {
display: none !important;
}
diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css
index 1d3579462..93bf84d83 100644
--- a/src/browser/themes/shared/preferences/zen-preferences.css
+++ b/src/browser/themes/shared/preferences/zen-preferences.css
@@ -181,7 +181,7 @@ groupbox h2 {
}
}
-@media (-moz-bool-pref: 'zen.view.use-single-toolbar') {
+@media -moz-pref('zen.view.use-single-toolbar') {
#zen-compact-mode-styles-form {
display: none;
}
From d011bb94974089fbce8d8cf393fcb62b14449ee3 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Thu, 27 Mar 2025 07:45:58 -0700
Subject: [PATCH 033/114] Updated to ff 136.0.4
Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com>
---
surfer.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/surfer.json b/surfer.json
index 95a6eadf6..e8e7c9628 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,8 +5,8 @@
"binaryName": "zen",
"version": {
"product": "firefox",
- "version": "136.0.3",
- "candidate": "136.0.3"
+ "version": "136.0.4",
+ "candidate": "136.0.4"
},
"buildOptions": {
"generateBranding": true
@@ -53,4 +53,4 @@
"licenseType": "MPL-2.0"
},
"updateHostname": "updates.zen-browser.app"
-}
\ No newline at end of file
+}
From 1c1d4697e5608fedc703c9216cbf96fa5e71bed9 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Thu, 27 Mar 2025 07:51:09 -0700
Subject: [PATCH 034/114] Bumped version 10 `1.10.3b`
Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com>
---
surfer.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/surfer.json b/surfer.json
index e8e7c9628..8b3c040b9 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
"brandShortName": "Zen",
"brandFullName": "Zen Browser",
"release": {
- "displayVersion": "1.10.2b",
+ "displayVersion": "1.10.3b",
"github": {
"repo": "zen-browser/desktop"
},
@@ -39,7 +39,7 @@
"brandShortName": "Twilight",
"brandFullName": "Zen Twilight",
"release": {
- "displayVersion": "1.10.2t",
+ "displayVersion": "1.10.3t",
"github": {
"repo": "zen-browser/desktop"
}
From 173242e2bb42f1bda5b70037335c5178f4a6f5a1 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 27 Mar 2025 22:41:09 +0100
Subject: [PATCH 035/114] fix: update repository URL and license in
package.json; adjust bug and homepage links
---
package.json | 8 +-
.../tabbrowser/content/tabbrowser-js.patch | 28 ++++--
.../tabbrowser/content/tabs-js.patch | 86 +++++++++++--------
3 files changed, 74 insertions(+), 48 deletions(-)
diff --git a/package.json b/package.json
index 3c3a548ac..7d3273f11 100644
--- a/package.json
+++ b/package.json
@@ -28,18 +28,18 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/zen-browser/core.git"
+ "url": "git+https://github.com/zen-browser/desktop.git"
},
"hooks": {
"pre-commit": "npm run prepare"
},
"keywords": [],
"author": "",
- "license": "ISC",
+ "license": "MPL-2.0",
"bugs": {
- "url": "https://github.com/zen-browser/core/issues"
+ "url": "https://github.com/zen-browser/desktop/issues"
},
- "homepage": "https://github.com/zen-browser/core#readme",
+ "homepage": "https://github.com/zen-browser/desktop#readme",
"dependencies": {
"@zen-browser/surfer": "^1.10.5"
},
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index d05ade5d0..1313ff33c 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 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd8851844e982 100644
+index 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d9296a455275 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -424,11 +424,50 @@
@@ -595,7 +595,17 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd885
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5937,7 +6090,7 @@
+@@ -5908,6 +6061,9 @@
+ }
+
+ let getContainer = () => {
++ if (tab.hasAttribute("zen-essential")) {
++ return document.getElementById("zen-essentials-container");
++ }
+ if (tab.pinned && this.tabContainer.verticalMode) {
+ return this.tabContainer.verticalPinnedTabsContainer;
+ }
+@@ -5937,7 +6093,7 @@
}
moveTabToGroup(aTab, aGroup) {
@@ -604,7 +614,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd885
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -5961,6 +6114,10 @@
+@@ -5961,6 +6117,10 @@
moveActionCallback();
@@ -615,7 +625,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd885
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
-@@ -6015,7 +6172,7 @@
+@@ -6015,7 +6175,7 @@
createLazyBrowser,
};
@@ -624,7 +634,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd885
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
-@@ -6765,7 +6922,7 @@
+@@ -6765,7 +6925,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -633,7 +643,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd885
window.focus();
aEvent.preventDefault();
break;
-@@ -7671,6 +7828,7 @@
+@@ -7671,6 +7831,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -641,7 +651,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd885
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
-@@ -8640,7 +8798,7 @@ var TabContextMenu = {
+@@ -8640,7 +8801,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@@ -650,7 +660,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd885
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
-@@ -8674,7 +8832,7 @@ var TabContextMenu = {
+@@ -8674,7 +8835,7 @@ var TabContextMenu = {
let isFirstTab =
!this.contextTabs[0].group &&
(this.contextTabs[0] == visibleTabs[0] ||
@@ -659,7 +669,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd885
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
-@@ -8904,6 +9062,7 @@ var TabContextMenu = {
+@@ -8904,6 +9065,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index fe09ea5ba..e82a69aba 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187bcdda61d 100644
+index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb205812e87 100644
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
@@ -93,7 +93,7 @@
@@ -195,31 +195,39 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
}
return this.#visibleTabs;
}
-@@ -1601,13 +1641,11 @@
+@@ -1601,16 +1641,11 @@
}
let elementIndex = 0;
- let verticalPinnedTabsContainer = document.getElementById(
- "vertical-pinned-tabs-container"
- );
-+ let verticalPinnedTabsContainer = this.verticalPinnedTabsContainer
- for (let i = 0; i < verticalPinnedTabsContainer.childElementCount; i++) {
- verticalPinnedTabsContainer.children[i].elementIndex = elementIndex++;
- }
+- for (let i = 0; i < verticalPinnedTabsContainer.childElementCount; i++) {
+- verticalPinnedTabsContainer.children[i].elementIndex = elementIndex++;
+- }
- let children = Array.from(this.arrowScrollbox.children);
++ let verticalPinnedTabsContainer = this.verticalPinnedTabsContainer
+ let children = ZenWorkspaces.tabboxChildrenWithoutEmpty;
let focusableItems = [];
- for (let child of children) {
-@@ -1628,6 +1666,7 @@
+- for (let child of children) {
++ for (let child of [...document.getElementById("zen-essentials-container").children, ...verticalPinnedTabsContainer.children, ...children]) {
+ if (isTab(child) && child.visible) {
+ child.elementIndex = elementIndex++;
+ focusableItems.push(child);
+@@ -1627,10 +1662,7 @@
+ }
}
- this.#focusableItems = [
-+ ...document.getElementById("zen-essentials-container").children,
- ...verticalPinnedTabsContainer.children,
- ...focusableItems,
- ];
-@@ -1638,6 +1677,7 @@
+- this.#focusableItems = [
+- ...verticalPinnedTabsContainer.children,
+- ...focusableItems,
+- ];
++ this.#focusableItems = focusableItems;
+
+ return this.#focusableItems;
+ }
+@@ -1638,6 +1670,7 @@
_invalidateCachedTabs() {
this.#allTabs = null;
this._invalidateCachedVisibleTabs();
@@ -227,7 +235,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
}
_invalidateCachedVisibleTabs() {
-@@ -1652,8 +1692,8 @@
+@@ -1652,8 +1685,8 @@
#isContainerVerticalPinnedExpanded(tab) {
return (
this.verticalMode &&
@@ -238,7 +246,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
);
}
-@@ -1668,7 +1708,7 @@
+@@ -1668,7 +1701,7 @@
if (node == null) {
// We have a container for non-tab elements at the end of the scrollbox.
@@ -247,7 +255,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
}
node.before(tab);
-@@ -1763,7 +1803,7 @@
+@@ -1763,7 +1796,7 @@
// There are separate "new tab" buttons for horizontal tabs toolbar, vertical tabs and
// for when the tab strip is overflowed (which is shared by vertical and horizontal tabs);
// Attach the long click popup to all of them.
@@ -256,7 +264,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
const newTab2 = this.newTabButton;
const newTabVertical = document.getElementById(
"vertical-tabs-newtab-button"
-@@ -1846,7 +1886,7 @@
+@@ -1846,7 +1879,7 @@
let rect = ele => {
return window.windowUtils.getBoundsWithoutFlushing(ele);
};
@@ -265,7 +273,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
if (tab && rect(tab).width <= this._tabClipWidth) {
this.setAttribute("closebuttons", "activetab");
} else {
-@@ -1858,10 +1898,12 @@
+@@ -1858,10 +1891,12 @@
_handleTabSelect(aInstant) {
let selectedTab = this.selectedItem;
@@ -278,7 +286,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
selectedTab._notselectedsinceload = false;
}
-@@ -1873,7 +1915,7 @@
+@@ -1873,7 +1908,7 @@
return;
}
@@ -287,7 +295,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
if (!tabs.length) {
return;
}
-@@ -1909,7 +1951,7 @@
+@@ -1909,7 +1944,7 @@
if (isEndTab && !this._hasTabTempMaxWidth) {
return;
}
@@ -296,7 +304,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
// Force tabs to stay the same width, unless we're closing the last tab,
// which case we need to let them expand just enough so that the overall
// tabbar width is the same.
-@@ -1924,7 +1966,7 @@
+@@ -1924,7 +1959,7 @@
let tabsToReset = [];
for (let i = numPinned; i < tabs.length; i++) {
let tab = tabs[i];
@@ -305,7 +313,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
if (!isEndTab) {
// keep tabs the same width
tab.style.transition = "none";
-@@ -1990,16 +2032,15 @@
+@@ -1990,16 +2025,15 @@
// Move pinned tabs to another container when the tabstrip is toggled to vertical
// and when session restore code calls _positionPinnedTabs; update styling whenever
// the number of pinned tabs changes.
@@ -328,7 +336,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
}
}
-@@ -2007,9 +2048,7 @@
+@@ -2007,9 +2041,7 @@
}
_resetVerticalPinnedTabs() {
@@ -339,7 +347,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
if (!verticalTabsContainer.children.length) {
return;
-@@ -2022,8 +2061,8 @@
+@@ -2022,8 +2054,8 @@
}
_positionPinnedTabs() {
@@ -350,7 +358,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
let absPositionHorizontalTabs =
this.overflowing && tabs.length > numPinned && numPinned > 0;
-@@ -2032,7 +2071,7 @@
+@@ -2032,7 +2064,7 @@
if (this.verticalMode) {
this._updateVerticalPinnedTabs();
@@ -359,7 +367,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
let layoutData = this._pinnedTabsLayoutCache;
let uiDensity = document.documentElement.getAttribute("uidensity");
if (!layoutData || layoutData.uiDensity != uiDensity) {
-@@ -2104,7 +2143,7 @@
+@@ -2104,7 +2136,7 @@
return;
}
@@ -368,7 +376,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
let directionX = screenX > dragData.animLastScreenX;
let directionY = screenY > dragData.animLastScreenY;
-@@ -2112,7 +2151,7 @@
+@@ -2112,7 +2144,7 @@
dragData.animLastScreenX = screenX;
let { width: tabWidth, height: tabHeight } =
@@ -377,7 +385,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
let shiftSizeX = tabWidth * movingTabs.length;
let shiftSizeY = tabHeight;
dragData.tabWidth = tabWidth;
-@@ -2296,10 +2335,11 @@
+@@ -2296,10 +2328,11 @@
this.#clearDragOverCreateGroupTimer();
let isPinned = draggedTab.pinned;
@@ -393,7 +401,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
);
if (this.#rtlMode) {
-@@ -2348,7 +2388,11 @@
+@@ -2348,7 +2381,11 @@
translate = Math.min(Math.max(translate, firstBound), lastBound);
for (let tab of movingTabs) {
@@ -406,7 +414,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
}
dragData.translatePos = translate;
-@@ -2639,7 +2683,7 @@
+@@ -2639,7 +2676,7 @@
// Shift background tabs to leave a gap where the dragged tab
// would currently be dropped.
for (let item of tabs) {
@@ -415,7 +423,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
continue;
}
-@@ -2649,7 +2693,11 @@
+@@ -2649,7 +2686,11 @@
// Shift the `.tab-group-label-container` to shift the label element.
item = item.parentElement;
}
@@ -427,7 +435,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
}
}
-@@ -2697,8 +2745,9 @@
+@@ -2697,8 +2738,9 @@
);
}
@@ -439,7 +447,15 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
return;
}
-@@ -2754,7 +2803,7 @@
+@@ -2711,6 +2753,7 @@
+ item = item.parentElement;
+ }
+ item.style.transform = "";
++ if (item.group?.hasAttribute("split-view-group")) item.group.style.transform = "";
+ item.removeAttribute("dragover-createGroup");
+ }
+ this.removeAttribute("movingtab-createGroup");
+@@ -2754,7 +2797,7 @@
let postTransitionCleanup = () => {
movingTab._moveTogetherSelectedTabsData.animate = false;
};
@@ -448,7 +464,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0175072d29597633c04724b1824e2187
postTransitionCleanup();
} else {
let onTransitionEnd = transitionendEvent => {
-@@ -2924,7 +2973,7 @@
+@@ -2924,7 +2967,7 @@
}
_notifyBackgroundTab(aTab) {
From 20cb086c76ebe84acbe036a8354a3d9563a84d4b Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 28 Mar 2025 00:02:36 +0100
Subject: [PATCH 036/114] fix: prevent pinned tabs from commingling with
non-pinned tabs in split view
---
.../tabbrowser/content/tabbrowser-js.patch | 31 +++++++++++++------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 1313ff33c..47a8037ea 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 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d9296a455275 100644
+index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2b4b44527 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -424,11 +424,50 @@
@@ -595,7 +595,18 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d929
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5908,6 +6061,9 @@
+@@ -5901,6 +6054,10 @@
+ * Bug 1955388 - prevent pinned tabs from commingling with non-pinned tabs
+ * when there are hidden tabs present
+ */
++ if (targetElement?.group?.hasAttribute("split-view-group")) {
++ targetElement = targetElement.group;
++ }
++
+ if (tab.pinned && !targetElement?.pinned) {
+ // prevent pinned tab from being dragged past a non-pinned tab
+ targetElement = this.tabs[this.pinnedTabCount - 1];
+@@ -5908,6 +6065,9 @@
}
let getContainer = () => {
@@ -605,7 +616,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d929
if (tab.pinned && this.tabContainer.verticalMode) {
return this.tabContainer.verticalPinnedTabsContainer;
}
-@@ -5937,7 +6093,7 @@
+@@ -5937,7 +6097,7 @@
}
moveTabToGroup(aTab, aGroup) {
@@ -614,7 +625,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d929
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -5961,6 +6117,10 @@
+@@ -5961,6 +6121,10 @@
moveActionCallback();
@@ -625,7 +636,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d929
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
-@@ -6015,7 +6175,7 @@
+@@ -6015,7 +6179,7 @@
createLazyBrowser,
};
@@ -634,7 +645,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d929
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
-@@ -6765,7 +6925,7 @@
+@@ -6765,7 +6929,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -643,7 +654,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d929
window.focus();
aEvent.preventDefault();
break;
-@@ -7671,6 +7831,7 @@
+@@ -7671,6 +7835,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -651,7 +662,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d929
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
-@@ -8640,7 +8801,7 @@ var TabContextMenu = {
+@@ -8640,7 +8805,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@@ -660,7 +671,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d929
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
-@@ -8674,7 +8835,7 @@ var TabContextMenu = {
+@@ -8674,7 +8839,7 @@ var TabContextMenu = {
let isFirstTab =
!this.contextTabs[0].group &&
(this.contextTabs[0] == visibleTabs[0] ||
@@ -669,7 +680,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..8e3dc2669c57ff59f66bcc0b0c45d929
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
-@@ -8904,6 +9065,7 @@ var TabContextMenu = {
+@@ -8904,6 +9069,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {
From bfae6d975cd822b204ee70e17c3544d25669ec6a Mon Sep 17 00:00:00 2001
From: ID <info.otero.gabriel@gmail.com>
Date: Fri, 28 Mar 2025 01:02:59 +0100
Subject: [PATCH 037/114] Fixed dialog width in compact view
---
src/browser/base/content/zen-styles/zen-panels/dialog.css | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/browser/base/content/zen-styles/zen-panels/dialog.css b/src/browser/base/content/zen-styles/zen-panels/dialog.css
index 3c8799ee9..02d5f796d 100644
--- a/src/browser/base/content/zen-styles/zen-panels/dialog.css
+++ b/src/browser/base/content/zen-styles/zen-panels/dialog.css
@@ -7,5 +7,6 @@
@media (prefers-color-scheme: dark) {
.dialogBox:not(.spotlightBox) {
border: 1px solid var(--zen-colors-border);
+ min-width: min(80vw, 376px);
}
}
From 3bb11e11c34f35b09bf8f28413442d3fa016126a Mon Sep 17 00:00:00 2001
From: ID <info.otero.gabriel@gmail.com>
Date: Fri, 28 Mar 2025 01:42:28 +0100
Subject: [PATCH 038/114] Fixed dialog width in compact view for light and dark
mode
---
src/browser/base/content/zen-styles/zen-panels/dialog.css | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/browser/base/content/zen-styles/zen-panels/dialog.css b/src/browser/base/content/zen-styles/zen-panels/dialog.css
index 02d5f796d..5fe371f03 100644
--- a/src/browser/base/content/zen-styles/zen-panels/dialog.css
+++ b/src/browser/base/content/zen-styles/zen-panels/dialog.css
@@ -3,10 +3,12 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-/* Zen Welcome idalog override */
+/* Zen Welcome dialog override */
@media (prefers-color-scheme: dark) {
.dialogBox:not(.spotlightBox) {
border: 1px solid var(--zen-colors-border);
- min-width: min(80vw, 376px);
}
}
+.dialogBox:not(.spotlightBox) {
+ min-width: min(80vw, 376px);
+}
From 01b862850492fb19e8c18213a8c53ce2f8e91ba2 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 28 Mar 2025 13:09:28 +0100
Subject: [PATCH 039/114] refactor: remove hover tab change preference and
related functionality in split view
---
src/browser/app/profile/zen-browser.js | 1 -
.../base/zen-components/ZenViewSplitter.mjs | 43 +++++++++++--------
.../components/preferences/zen-settings.js | 5 ---
.../preferences/zenLooksAndFeel.inc.xhtml | 9 ----
4 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index f97d41c21..02ddbc0ae 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -193,7 +193,6 @@ pref('zen.sidebar.use-google-favicons', true);
// Zen Split View
pref('zen.splitView.enable-tab-drop', true);
pref('zen.splitView.min-resize-width', 7);
-pref('zen.splitView.change-on-hover', false);
pref('zen.splitView.rearrange-hover-size', 24);
// Startup flags
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index e536a43f0..4cad491b4 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -61,7 +61,6 @@ class SplitNode extends SplitLeafNode {
class ZenViewSplitter extends ZenDOMOperatedFeature {
currentView = -1;
- canChangeTabOnHover = false;
_data = [];
_tabBrowserPanel = null;
__modifierElement = null;
@@ -78,7 +77,8 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
MAX_TABS = 4;
init() {
- XPCOMUtils.defineLazyPreferenceGetter(this, 'canChangeTabOnHover', 'zen.splitView.change-on-hover', false);
+ this.handleTabEvent = this._handleTabEvent.bind(this);
+
XPCOMUtils.defineLazyPreferenceGetter(this, 'minResizeWidth', 'zen.splitView.min-resize-width', 7);
XPCOMUtils.defineLazyPreferenceGetter(this, '_edgeHoverSize', 'zen.splitView.rearrange-edge-hover-size', 24);
@@ -226,6 +226,11 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
for (const tab of gBrowser.tabs) {
tab.style.removeProperty('transform');
}
+ // Add a min width to all the browser elements to prevent them from resizing
+ for (const browser of gBrowser.browsers) {
+ const width = browser.getBoundingClientRect().width;
+ browser.style.minWidth = `${width}px`;
+ }
const panelsWidth = gBrowser.tabbox.getBoundingClientRect().width;
const halfWidth = panelsWidth / 2;
const side = event.clientX > halfWidth ? 'right' : 'left';
@@ -769,7 +774,6 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
this._removeHeader(container);
this.resetContainerStyle(container);
container.removeEventListener('mousedown', this.handleTabEvent);
- container.removeEventListener('mouseover', this.handleTabEvent);
if (!forUnsplit) {
tab.linkedBrowser.docShellIsActive = false;
}
@@ -1026,13 +1030,13 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
* Deactivates the split view.
*/
deactivateCurrentSplitView() {
+ this.setTabsDocShellState(this._data[this.currentView].tabs, false);
for (const tab of this._data[this.currentView].tabs) {
const container = tab.linkedBrowser.closest('.browserSidebarContainer');
this.resetContainerStyle(container);
}
this.removeSplitters();
this.tabBrowserPanel.removeAttribute('zen-split-view');
- this.setTabsDocShellState(this._data[this.currentView].tabs, false);
this.updateSplitViewButton(true);
this.currentView = -1;
this.toggleWrapperDisplay(false);
@@ -1057,10 +1061,10 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
this.tabBrowserPanel.setAttribute('zen-split-view', 'true');
- this.setTabsDocShellState(splitData.tabs, true);
this.updateSplitViewButton(false);
this.applyGridToTabs(splitData.tabs);
this.applyGridLayout(splitData.layoutTree);
+ this.setTabsDocShellState(splitData.tabs, true);
this.toggleWrapperDisplay(true);
}
@@ -1152,7 +1156,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
const nodeRootPosition = splitNode.positionToRoot;
if (!splitNode.children) {
const browserContainer = splitNode.tab.linkedBrowser.closest('.browserSidebarContainer');
- browserContainer.style.inset = `${nodeRootPosition.top}% ${nodeRootPosition.right}% ${nodeRootPosition.bottom}% ${nodeRootPosition.left}%`;
+ window.requestAnimationFrame(() => {
+ browserContainer.style.inset = `${nodeRootPosition.top}% ${nodeRootPosition.right}% ${nodeRootPosition.bottom}% ${nodeRootPosition.left}%`;
+ });
this._tabToSplitNode.set(splitNode.tab, splitNode);
return;
}
@@ -1183,11 +1189,13 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
if (i < splittersNeeded) {
const splitter = currentSplitters[i];
- if (splitNode.direction === 'column') {
- splitter.style.inset = `${100 - childRootPosition.bottom}% ${childRootPosition.right}% 0% ${childRootPosition.left}%`;
- } else {
- splitter.style.inset = `${childRootPosition.top}% 0% ${childRootPosition.bottom}% ${100 - childRootPosition.right}%`;
- }
+ window.requestAnimationFrame(() => {
+ if (splitNode.direction === 'column') {
+ splitter.style.inset = `${100 - childRootPosition.bottom}% ${childRootPosition.right}% 0% ${childRootPosition.left}%`;
+ } else {
+ splitter.style.inset = `${childRootPosition.top}% 0% ${childRootPosition.bottom}% ${100 - childRootPosition.right}%`;
+ }
+ });
}
});
}
@@ -1247,9 +1255,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
* @param {Element} container - The container element.
*/
styleContainer(container) {
- container.setAttribute('zen-split-anim', 'true');
container.addEventListener('mousedown', this.handleTabEvent);
- container.addEventListener('mouseover', this.handleTabEvent);
}
/**
@@ -1257,8 +1263,8 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
*
* @param {Event} event - The event.
*/
- handleTabEvent = (event) => {
- if (this.rearrangeViewEnabled || (event.type === 'mouseover' && !this.canChangeTabOnHover)) {
+ _handleTabEvent = (event) => {
+ if (this.rearrangeViewEnabled) {
return;
}
const container = event.currentTarget.closest('.browserSidebarContainer');
@@ -1346,8 +1352,8 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
browser.addEventListener('dragstart', this.onBrowserDragStart);
browser.addEventListener('dragend', this.onBrowserDragEnd);
} else {
- browser.removeAttribute('zen-split');
- browser.removeAttribute('style');
+ // browser.removeAttribute('zen-split');
+ // browser.removeAttribute('style');
browser.removeEventListener('dragstart', this.onBrowserDragStart);
browser.removeEventListener('dragend', this.onBrowserDragEnd);
@@ -1537,6 +1543,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
gBrowser.selectedTab = this._draggingTab;
this._draggingTab = null;
}
+ for (const browser of gBrowser.browsers) {
+ browser.removeAttribute('style');
+ }
}
}
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index 1c9f283ec..ad1903850 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -949,11 +949,6 @@ Preferences.addAll([
type: 'bool',
default: true,
},
- {
- id: 'zen.splitView.change-on-hover',
- type: 'bool',
- default: true,
- },
{
id: 'zen.tab-unloader.timeout-minutes',
type: 'int',
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index b6e72e8b1..31efc78a5 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -215,13 +215,4 @@
<html:h1 data-l10n-id="zen-split-view-title"/>
</hbox>
-<groupbox id="zenSplitViewGroup" data-category="paneZenLooks" hidden="true" class="highlighting-group">
- <label><html:h2 data-l10n-id="zen-split-view-header"/></label>
- <description class="description-deemphasized" data-l10n-id="zen-split-view-description" />
-
- <checkbox id="zenLooksAndFeelSplitViewChangeOnHover"
- data-l10n-id="zen-split-view-change-on-hover"
- preference="zen.splitView.change-on-hover"/>
-</groupbox>
-
</html:template>
From b1ef2d237d63ddf166799cb63a550df41848e1ee Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 28 Mar 2025 13:09:49 +0100
Subject: [PATCH 040/114] chore: update subproject commit reference in l10n
---
l10n | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/l10n b/l10n
index 778cb128c..4094426d2 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit 778cb128c659c7b8f57080e99fbc04f8d93c30a2
+Subproject commit 4094426d24cf3e131b5a07775478ed893112e9da
From 12edc9279c109a0ed147ba16539937b3455c14da Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 28 Mar 2025 13:14:14 +0100
Subject: [PATCH 041/114] refactor: remove unused zen split view category from
preferences
---
.../components/preferences/zenLooksAndFeel.inc.xhtml | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index 31efc78a5..e9f5fe73a 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -208,11 +208,4 @@
</hbox>
</groupbox>
-<hbox id="zenSplitViewCategory"
- class="subcategory"
- hidden="true"
- data-category="paneZenLooks">
-<html:h1 data-l10n-id="zen-split-view-title"/>
-</hbox>
-
</html:template>
From 5462f035f8e85809ec3719f62c1e050f84f8eb61 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Sat, 29 Mar 2025 12:31:00 +0100
Subject: [PATCH 042/114] refactor: enhance tab handling in split view and
update script loading method
---
src/browser/base/content/zen-assets.inc.xhtml | 34 ++---
.../base/zen-components/ZenViewSplitter.mjs | 2 +-
.../tabbrowser/content/tabbrowser-js.patch | 135 ++++++++++--------
.../tabbrowser/content/tabs-js.patch | 53 +++++--
4 files changed, 139 insertions(+), 85 deletions(-)
diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 9895f4093..3f08b0834 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -30,20 +30,22 @@
</linkset>
# Scripts used all over the browser
-<script src="chrome://browser/content/zen-components/ZenFolders.mjs" />
-<script src="chrome://browser/content/zen-components/ZenThemesCommon.mjs" />
-<script src="chrome://browser/content/zen-components/ZenThemesImporter.mjs" />
-<script src="chrome://browser/content/zen-components/ZenCompactMode.mjs" />
-<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/ZenPinnedTabsStorage.mjs" />
-<script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
-<script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs" />
-<script src="chrome://browser/content/zen-components/ZenGradientGenerator.mjs" />
-<script src="chrome://browser/content/zen-components/ZenViewSplitter.mjs"/>
-<script src="chrome://browser/content/zen-components/ZenGlanceManager.mjs" />
-<script src="chrome://browser/content/zen-components/ZenMediaController.mjs" />
+<script>
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenFolders.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenThemesCommon.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenThemesImporter.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenCompactMode.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenSidebarManager.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenTabUnloader.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenPinnedTabManager.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenGradientGenerator.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenViewSplitter.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenGlanceManager.mjs", this);
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenMediaController.mjs", this);
-# Unimportant scripts
-<script src="chrome://browser/content/zen-components/ZenRices.mjs" />
+// Unimportant scripts
+Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenRices.mjs", this);
+</script>
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index 4cad491b4..66f9862e7 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -1764,7 +1764,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
onAfterWorkspaceSessionRestore() {
- if (this.currentView >= 0) {
+ if (this.currentView >= 0 && !gBrowser.selectedTab.pinned) {
// Activate all browsers in the split view
this.currentView = -1;
this.onLocationChange(gBrowser.selectedTab.linkedBrowser);
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 47a8037ea..055a05991 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 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2b4b44527 100644
+index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035ace83e08 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -424,11 +424,50 @@
+@@ -424,11 +424,66 @@
return this.tabContainer.visibleTabs;
}
@@ -19,6 +19,22 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
+ return i;
+ }
+
++ get _numVisiblePinTabsWithFolders() {
++ let i = 0;
++ for (let tab of this.tabs) {
++ if (!tab.pinned && !tab.hasAttribute("zen-glance-tab")) {
++ break;
++ }
++ if (!tab.hidden) {
++ i += !tab.hasAttribute("zen-glance-tab");
++ }
++ if (tab.group?.tabs[0] == tab) {
++ i++;
++ }
++ }
++ return i;
++ }
++
+ get _numZenEssentials() {
+ let i = 0;
+ for (let tab of this.tabs) {
@@ -55,7 +71,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
}
return i;
}
-@@ -558,6 +597,7 @@
+@@ -558,6 +613,7 @@
this.tabpanels.appendChild(panel);
let tab = this.tabs[0];
@@ -63,7 +79,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
tab.linkedPanel = uniqueId;
this._selectedTab = tab;
this._selectedBrowser = browser;
-@@ -823,11 +863,13 @@
+@@ -823,11 +879,13 @@
}
this.showTab(aTab);
@@ -80,7 +96,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
}
aTab.setAttribute("pinned", "true");
-@@ -841,12 +883,15 @@
+@@ -841,12 +899,15 @@
}
if (this.tabContainer.verticalMode) {
@@ -97,7 +113,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
});
} else {
this.moveTabTo(aTab, this.pinnedTabCount - 1, {
-@@ -1029,6 +1074,8 @@
+@@ -1029,6 +1090,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -106,7 +122,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (
aIconURL &&
!aLoadingPrincipal &&
-@@ -1039,6 +1086,9 @@
+@@ -1039,6 +1102,9 @@
);
return;
}
@@ -116,7 +132,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
-@@ -1287,6 +1337,7 @@
+@@ -1287,6 +1353,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@@ -124,7 +140,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1439,6 +1490,9 @@
+@@ -1439,6 +1506,9 @@
}
let activeEl = document.activeElement;
@@ -134,7 +150,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
// If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) {
newTab.focus();
-@@ -1762,7 +1816,7 @@
+@@ -1762,7 +1832,7 @@
}
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -143,7 +159,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
return false;
}
-@@ -1865,7 +1919,7 @@
+@@ -1865,7 +1935,7 @@
newIndex = this.selectedTab._tPos + 1;
}
@@ -152,7 +168,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
let browser;
if (targetTab) {
browser = this.getBrowserForTab(targetTab);
-@@ -2122,6 +2176,7 @@
+@@ -2122,6 +2192,7 @@
uriIsAboutBlank,
userContextId,
skipLoad,
@@ -160,7 +176,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
} = {}) {
let b = document.createXULElement("browser");
// Use the JSM global to create the permanentKey, so that if the
-@@ -2195,8 +2250,7 @@
+@@ -2195,8 +2266,7 @@
// we use a different attribute name for this?
b.setAttribute("name", name);
}
@@ -170,7 +186,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
b.setAttribute("transparent", "true");
}
-@@ -2373,7 +2427,7 @@
+@@ -2373,7 +2443,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@@ -179,7 +195,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
-@@ -2432,8 +2486,8 @@
+@@ -2432,8 +2502,8 @@
// If we transitioned from one browser to two browsers, we need to set
// hasSiblings=false on both the existing browser and the new browser.
if (this.tabs.length == 2) {
@@ -190,7 +206,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
-@@ -2655,6 +2709,7 @@
+@@ -2655,6 +2725,7 @@
schemelessInput,
hasValidUserGestureActivation = false,
textDirectiveUserActivation = false,
@@ -198,7 +214,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
} = {}
) {
// all callers of addTab that pass a params object need to pass
-@@ -2665,6 +2720,12 @@
+@@ -2665,6 +2736,12 @@
);
}
@@ -211,7 +227,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
-@@ -2728,6 +2789,15 @@
+@@ -2728,6 +2805,15 @@
noInitialLabel,
skipBackgroundNotify,
});
@@ -227,7 +243,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (insertTab) {
// insert the tab into the tab container in the correct position
this._insertTabAtIndex(t, {
-@@ -2752,6 +2822,7 @@
+@@ -2752,6 +2838,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -235,7 +251,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
}));
if (focusUrlBar) {
-@@ -2871,6 +2942,9 @@
+@@ -2871,6 +2958,9 @@
}
}
@@ -245,7 +261,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
-@@ -2891,12 +2965,15 @@
+@@ -2891,12 +2981,15 @@
* @param {string} [label=]
* @returns {MozTabbrowserTabGroup}
*/
@@ -262,7 +278,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
return group;
}
-@@ -2937,6 +3014,7 @@
+@@ -2937,6 +3030,7 @@
insertBefore = null,
isUserCreated = false,
telemetryUserCreateSource = "unknown",
@@ -270,7 +286,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
} = {}
) {
if (!tabs?.length) {
-@@ -2951,7 +3029,12 @@
+@@ -2951,7 +3045,12 @@
id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
}
let group = this._createTabGroup(id, color, false, label);
@@ -284,7 +300,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
group,
insertBefore?.group ?? insertBefore
);
-@@ -3268,6 +3351,7 @@
+@@ -3268,6 +3367,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -292,7 +308,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
}
) {
// If we don't have a preferred remote type, and we have a remote
-@@ -3331,6 +3415,7 @@
+@@ -3331,6 +3431,7 @@
openWindowInfo,
name,
skipLoad,
@@ -300,7 +316,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
});
}
-@@ -3509,6 +3594,27 @@
+@@ -3509,6 +3610,27 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@@ -328,7 +344,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
-@@ -3522,6 +3628,7 @@
+@@ -3522,6 +3644,7 @@
restoreTabsLazily && !select && !tabData.pinned;
let url = "about:blank";
@@ -336,7 +352,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (tabData.entries?.length) {
let activeIndex = (tabData.index || tabData.entries.length) - 1;
// Ensure the index is in bounds.
-@@ -3557,7 +3664,27 @@
+@@ -3557,7 +3680,27 @@
skipLoad: true,
preferredRemoteType,
});
@@ -365,7 +381,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (select) {
tabToSelect = tab;
}
-@@ -3570,8 +3697,8 @@
+@@ -3570,8 +3713,8 @@
// inserted in the DOM. If the tab is not yet in the DOM,
// just insert it in the right place from the start.
if (!tab.parentNode) {
@@ -376,7 +392,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
tab.toggleAttribute("pinned", true);
this.tabContainer._invalidateCachedTabs();
// Then ensure all the tab open/pinning information is sent.
-@@ -3581,7 +3708,8 @@
+@@ -3581,7 +3724,8 @@
// needs calling:
shouldUpdateForPinnedTabs = true;
}
@@ -386,7 +402,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group
-@@ -3595,7 +3723,10 @@
+@@ -3595,7 +3739,10 @@
tabGroup.stateData.id,
tabGroup.stateData.color,
tabGroup.stateData.collapsed,
@@ -398,7 +414,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
);
tabsFragment.appendChild(tabGroup.node);
}
-@@ -3646,6 +3777,9 @@
+@@ -3646,6 +3793,9 @@
this.selectedTab = tabToSelect;
this.removeTab(leftoverTab);
}
@@ -408,7 +424,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert();
-@@ -3830,7 +3964,7 @@
+@@ -3830,7 +3980,7 @@
// Ensure we have an index if one was not provided.
if (typeof index != "number") {
// Move the new tab after another tab if needed, to the end otherwise.
@@ -417,7 +433,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (
!bulkOrderedOpen &&
((openerTab &&
-@@ -3876,18 +4010,18 @@
+@@ -3876,18 +4026,18 @@
// Ensure index is within bounds.
if (tab.pinned) {
@@ -440,7 +456,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (tabAfter && tabAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, tabAfter);
-@@ -4199,6 +4333,9 @@
+@@ -4199,6 +4349,9 @@
return;
}
@@ -450,7 +466,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
this.removeTabs(selectedTabs);
}
-@@ -4556,6 +4693,7 @@
+@@ -4556,6 +4709,7 @@
skipSessionStore,
} = {}
) {
@@ -458,7 +474,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.finish("browser.tabs.opening", window);
}
-@@ -4572,6 +4710,12 @@
+@@ -4572,6 +4726,12 @@
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
}
@@ -471,7 +487,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
-@@ -4586,7 +4730,9 @@
+@@ -4586,7 +4746,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -482,7 +498,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
-@@ -4600,7 +4746,6 @@
+@@ -4600,7 +4762,6 @@
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
return;
}
@@ -490,7 +506,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
let lockTabSizing =
!this.tabContainer.verticalMode &&
!aTab.pinned &&
-@@ -4739,14 +4884,14 @@
+@@ -4739,14 +4900,14 @@
!!this.tabsInCollapsedTabGroups.length;
if (
aTab.visible &&
@@ -507,7 +523,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4770,6 +4915,7 @@
+@@ -4770,6 +4931,7 @@
newTab = true;
}
@@ -515,7 +531,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4810,9 +4956,7 @@
+@@ -4810,9 +4972,7 @@
aTab._mouseleave();
if (newTab) {
@@ -526,7 +542,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
} else {
TabBarVisibility.update();
}
-@@ -4941,6 +5085,8 @@
+@@ -4941,6 +5101,8 @@
this.tabs[i]._tPos = i;
}
@@ -535,7 +551,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
-@@ -5159,7 +5305,7 @@
+@@ -5159,7 +5321,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -544,7 +560,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
}
// Try to find a remaining tab that comes after the given tab
-@@ -5181,7 +5327,7 @@
+@@ -5181,7 +5343,7 @@
}
if (tab) {
@@ -553,7 +569,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
}
// If no qualifying visible tab was found, see if there is a tab in
-@@ -5599,10 +5745,10 @@
+@@ -5599,10 +5761,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -566,7 +582,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5838,7 +5984,7 @@
+@@ -5838,7 +6000,7 @@
moveTabTo(aTab, aIndex, { forceStandaloneTab = false } = {}) {
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
@@ -575,7 +591,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
} else {
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
-@@ -5848,10 +5994,17 @@
+@@ -5848,10 +6010,17 @@
this.#handleTabMove(aTab, () => {
let neighbor = this.tabs[aIndex];
@@ -595,18 +611,21 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5901,6 +6054,10 @@
+@@ -5901,6 +6070,13 @@
* Bug 1955388 - prevent pinned tabs from commingling with non-pinned tabs
* when there are hidden tabs present
*/
+ if (targetElement?.group?.hasAttribute("split-view-group")) {
+ targetElement = targetElement.group;
+ }
++ if (tab.group?.hasAttribute("split-view-group")) {
++ tab = tab.group;
++ }
+
if (tab.pinned && !targetElement?.pinned) {
// prevent pinned tab from being dragged past a non-pinned tab
targetElement = this.tabs[this.pinnedTabCount - 1];
-@@ -5908,6 +6065,9 @@
+@@ -5908,6 +6084,9 @@
}
let getContainer = () => {
@@ -616,7 +635,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (tab.pinned && this.tabContainer.verticalMode) {
return this.tabContainer.verticalPinnedTabsContainer;
}
-@@ -5937,7 +6097,7 @@
+@@ -5937,7 +6116,7 @@
}
moveTabToGroup(aTab, aGroup) {
@@ -625,7 +644,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -5961,6 +6121,10 @@
+@@ -5961,6 +6140,10 @@
moveActionCallback();
@@ -636,7 +655,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
-@@ -6015,7 +6179,7 @@
+@@ -6015,7 +6198,7 @@
createLazyBrowser,
};
@@ -645,7 +664,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
-@@ -6765,7 +6929,7 @@
+@@ -6765,7 +6948,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -654,7 +673,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
window.focus();
aEvent.preventDefault();
break;
-@@ -7671,6 +7835,7 @@
+@@ -7671,6 +7854,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -662,7 +681,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
-@@ -8640,7 +8805,7 @@ var TabContextMenu = {
+@@ -8640,7 +8824,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@@ -671,7 +690,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
-@@ -8674,7 +8839,7 @@ var TabContextMenu = {
+@@ -8674,7 +8858,7 @@ var TabContextMenu = {
let isFirstTab =
!this.contextTabs[0].group &&
(this.contextTabs[0] == visibleTabs[0] ||
@@ -680,7 +699,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..adc4599c4d1722f8a6a0a636bba074a2
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
-@@ -8904,6 +9069,7 @@ var TabContextMenu = {
+@@ -8904,6 +9088,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index e82a69aba..a018abc45 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb205812e87 100644
+index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb83c74c10 100644
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
@@ -93,7 +93,7 @@
@@ -75,7 +75,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb2
- let tabs = this.ariaFocusableItems.slice(
- isPinned ? 0 : numPinned,
- isPinned ? numPinned : undefined
-+ let numPinned = gBrowser._numVisiblePinTabs;
++ let numPinned = gBrowser._numVisiblePinTabsWithFolders;
+ let essential = draggedTab.hasAttribute("zen-essential");
+ let tabs = this.ariaFocusableItems.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
+ isPinned ? (essential ? 0 : gBrowser._numZenVisibleEssentials) : numPinned,
@@ -393,7 +393,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb2
- let tabs = this.ariaFocusableItems.slice(
- isPinned ? 0 : numPinned,
- isPinned ? numPinned : undefined
-+ let numPinned = gBrowser._numVisiblePinTabs;
++ let numPinned = gBrowser._numVisiblePinTabsWithFolders;
+ let essential = draggedTab.hasAttribute("zen-essential");
+ let tabs = this.ariaFocusableItems.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
+ isPinned ? (essential ? 0 : gBrowser._numZenVisibleEssentials) : numPinned,
@@ -401,7 +401,20 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb2
);
if (this.#rtlMode) {
-@@ -2348,7 +2381,11 @@
+@@ -2325,6 +2358,12 @@
+
+ // Move the dragged tab based on the mouse position.
+ let firstTab = tabs[0];
++ if (isTabGroupLabel(firstTab)) {
++ const group = firstTab.closest("tab-group");
++ if (group?.hasAttribute("split-view-group")) {
++ firstTab = group;
++ }
++ }
+ let lastTab = tabs.at(-1);
+ let lastMovingTab = movingTabs.at(-1);
+ let firstMovingTab = movingTabs[0];
+@@ -2348,7 +2387,11 @@
translate = Math.min(Math.max(translate, firstBound), lastBound);
for (let tab of movingTabs) {
@@ -414,7 +427,27 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb2
}
dragData.translatePos = translate;
-@@ -2639,7 +2676,7 @@
+@@ -2507,6 +2550,10 @@
+ if (!dropElement) {
+ dropElement = this.ariaFocusableItems[oldDropElementIndex];
+ }
++ if (dropElement?.group?.hasAttribute("split-view-group")) {
++ // We focus the group label element, not the group itself.
++ dropElement = dropElement.group.querySelector(".tab-group-label");
++ }
+ let newDropElementIndex = dropElement
+ ? dropElement.elementIndex
+ : oldDropElementIndex;
+@@ -2566,7 +2613,7 @@
+ }
+ }
+
+- if (gBrowser._tabGroupsEnabled && !isPinned) {
++ if (false) {
+ let dragOverGroupingThreshold = 1 - moveOverThreshold;
+
+ // When dragging tab(s) over an ungrouped tab, signal to the user
+@@ -2639,7 +2686,7 @@
// Shift background tabs to leave a gap where the dragged tab
// would currently be dropped.
for (let item of tabs) {
@@ -423,7 +456,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb2
continue;
}
-@@ -2649,7 +2686,11 @@
+@@ -2649,7 +2696,11 @@
// Shift the `.tab-group-label-container` to shift the label element.
item = item.parentElement;
}
@@ -435,7 +468,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb2
}
}
-@@ -2697,8 +2738,9 @@
+@@ -2697,8 +2748,9 @@
);
}
@@ -447,7 +480,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb2
return;
}
-@@ -2711,6 +2753,7 @@
+@@ -2711,6 +2763,7 @@
item = item.parentElement;
}
item.style.transform = "";
@@ -455,7 +488,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb2
item.removeAttribute("dragover-createGroup");
}
this.removeAttribute("movingtab-createGroup");
-@@ -2754,7 +2797,7 @@
+@@ -2754,7 +2807,7 @@
let postTransitionCleanup = () => {
movingTab._moveTogetherSelectedTabsData.animate = false;
};
@@ -464,7 +497,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..8cf754f94ffe6949268c6cb893bdbbb2
postTransitionCleanup();
} else {
let onTransitionEnd = transitionendEvent => {
-@@ -2924,7 +2967,7 @@
+@@ -2924,7 +2977,7 @@
}
_notifyBackgroundTab(aTab) {
From 3e91ecb8d5b521033eee26368c5c20fa567afb37 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 15:25:06 +0100
Subject: [PATCH 043/114] Enhance bug report template and add issue labeling
workflow
---
.github/ISSUE_TEMPLATE/bug_report.yml | 41 +++++++++++++----
.github/advanced-issue-labeler.yml | 64 +++++++++++++++++++++++++++
.github/workflows/clear-cache.yml | 33 --------------
.github/workflows/issue-labeler.yml | 34 ++++++++++++++
4 files changed, 130 insertions(+), 42 deletions(-)
create mode 100644 .github/advanced-issue-labeler.yml
delete mode 100644 .github/workflows/clear-cache.yml
create mode 100644 .github/workflows/issue-labeler.yml
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index d8112de01..b9d68e4c6 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -20,6 +20,7 @@ body:
- label: I have read the instructions.
- label: I have searched existing issues and avoided creating duplicates.
- label: I am not filing an enhancement request.
+ - label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
- type: textarea
id: what-happened
attributes:
@@ -28,19 +29,12 @@ body:
placeholder: Tell us what you see!
validations:
required: true
- - type: checkboxes
- id: firefox
- attributes:
- label: Reproducible?
- description: Is this issue reproducible on Firefox?
- options:
- - label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
- type: input
id: version
attributes:
label: Version
description: What version of our software are you running? Please do not use "latest" or "newest" as version numbers. Go to `Help -> About Zen` to find the version number.
- placeholder: 1.0.0
+ placeholder: 1.0.0b
validations:
required: true
- type: dropdown
@@ -54,10 +48,39 @@ body:
- Linux (Tarball)
- macOS - aarch64
- macOS - Intel
- - Windows
+ - Windows - x64
+ - Windows - aarch64
+ - Other
+ validations:
+ required: true
+ - type: dropdown
+ id: component
+ attributes:
+ label: What component is this issue related to?
+ options:
+ - Sync
+ - Compact Mode
+ - Workspaces
+ - Mods / Themes
+ - Glance
+ - URL Bar
+ - Tabs
+ - Settings
+ - Privacy
+ - Performance
+ - Media Controler
+ - Tab unloading
+ - Tab Folders
+ - Keyboard Shortcuts
+ - Security
+ - Extensions
+ - Customizable UI / Toolbars
+ - Localization
+ - Bookmarks
- Other
validations:
required: true
+
- type: textarea
id: logs
attributes:
diff --git a/.github/advanced-issue-labeler.yml b/.github/advanced-issue-labeler.yml
new file mode 100644
index 000000000..34f5649f6
--- /dev/null
+++ b/.github/advanced-issue-labeler.yml
@@ -0,0 +1,64 @@
+policy:
+ - section:
+ - id: [component]
+ label:
+ # Make sure it's in sync with the dropdown in the issue template
+ - name: 'component: sync'
+ keys: ['Sync']
+ - name: 'component: compact-mode'
+ keys: ['Compact Mode']
+ - name: 'component: workspaces'
+ keys: ['Workspaces']
+ - name: 'component: mods-themes'
+ keys: ['Mods / Themes']
+ - name: 'component: bookmarks'
+ keys: ['Bookmarks']
+ - name: 'component: glance'
+ keys: ['Glance']
+ - name: 'component: url-bar'
+ keys: ['URL Bar']
+ - name: 'component: tabs'
+ keys: ['Tabs']
+ - name: 'component: settings'
+ keys: ['Settings']
+ - name: 'component: privacy'
+ keys: ['Privacy']
+ - name: 'component: performance'
+ keys: ['Performance']
+ - name: 'component: media-controller'
+ keys: ['Media Controler']
+ - name: 'component: tab-unloading'
+ keys: ['Tab unloading']
+ - name: 'component: tab-folders'
+ keys: ['Tab Folders']
+ - name: 'component: keyboard-shortcuts'
+ keys: ['Keyboard Shortcuts']
+ - name: 'component: security'
+ keys: ['Security']
+ - name: 'component: extensions'
+ keys: ['Extensions']
+ - name: 'component: customizable-ui-toolbars'
+ keys: ['Customizable UI / Toolbars']
+ - name: 'component: localization'
+ keys: ['Localization']
+ - name: 'component: other'
+ keys: ['Other']
+
+ - id: [platform]
+ block-list: ['Other']
+ label:
+ # Make sure it's in sync with the dropdown in the issue template
+ - name: 'platform: linux-appimage'
+ keys: ['Linux (AppImage)']
+ - name: 'platform: linux-flatpak'
+ keys: ['Linux (Flatpak)']
+ - name: 'platform: linux-tarball'
+ keys: ['Linux (Tarball)']
+ - name: 'platform: macos-aarch64'
+ keys: ['macOS - aarch64']
+ - name: 'platform: macos-intel'
+ keys: ['macOS - Intel']
+ - name: 'platform: windows-x64'
+ keys: ['Windows - x64']
+ - name: 'platform: windows-aarch64'
+ keys: ['Windows - aarch64']
diff --git a/.github/workflows/clear-cache.yml b/.github/workflows/clear-cache.yml
deleted file mode 100644
index 59085df36..000000000
--- a/.github/workflows/clear-cache.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Clear cache
-
-on:
- workflow_dispatch:
-
-permissions:
- actions: write
-
-jobs:
- clear-cache:
- runs-on: ubuntu-latest
-
- steps:
- - name: Clear cache
- uses: actions/github-script@v7
- with:
- script: |
- console.log("About to clear")
- const caches = await github.rest.actions.getActionsCacheList({
- owner: context.repo.owner,
- repo: context.repo.repo,
- })
-
- for (const cache of caches.data.actions_caches) {
- console.log(cache)
- await github.rest.actions.deleteActionsCacheById({
- owner: context.repo.owner,
- repo: context.repo.repo,
- cache_id: cache.id,
- })
- }
-
- console.log("Clear completed")
diff --git a/.github/workflows/issue-labeler.yml b/.github/workflows/issue-labeler.yml
new file mode 100644
index 000000000..5a8ed16ba
--- /dev/null
+++ b/.github/workflows/issue-labeler.yml
@@ -0,0 +1,34 @@
+name: Issue labeler
+on:
+ issues:
+ types: [opened]
+
+permissions:
+ contents: read
+
+jobs:
+ label-component:
+ runs-on: ubuntu-latest
+
+ permissions:
+ # required for all workflows
+ issues: write
+
+ # only required for workflows in private repositories
+ actions: read
+ contents: read
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Parse issue form
+ uses: stefanbuck/github-issue-parser@v3
+ id: issue-parser
+ with:
+ template-path: .github/ISSUE_TEMPLATE/bug_report.yml
+
+ - name: Set labels based on animals field
+ uses: redhat-plumbers-in-action/advanced-issue-labeler@v2
+ with:
+ issue-form: ${{ steps.issue-parser.outputs.jsonString }}
+ token: ${{ secrets.DEPLOY_KEY }}
From ad79b576a5838177bb788411fcb583c8ea88d1cf Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 15:28:16 +0100
Subject: [PATCH 044/114] Add validation requirement to bug report template
---
.github/ISSUE_TEMPLATE/bug_report.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b9d68e4c6..a22f92804 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -21,6 +21,8 @@ body:
- label: I have searched existing issues and avoided creating duplicates.
- label: I am not filing an enhancement request.
- label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
+ validations:
+ required: true
- type: textarea
id: what-happened
attributes:
From 6f5671e41f329a9660c78d8fd8560c4707d63358 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 15:30:03 +0100
Subject: [PATCH 045/114] Refactor issue template and advanced labeler for
improved platform categorization
---
.github/ISSUE_TEMPLATE/bug_report.yml | 4 ++--
.github/advanced-issue-labeler.yml | 20 ++++++--------------
2 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index a22f92804..d31bfd0f3 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -60,7 +60,7 @@ body:
attributes:
label: What component is this issue related to?
options:
- - Sync
+ - Other
- Compact Mode
- Workspaces
- Mods / Themes
@@ -79,7 +79,7 @@ body:
- Customizable UI / Toolbars
- Localization
- Bookmarks
- - Other
+ - Sync
validations:
required: true
diff --git a/.github/advanced-issue-labeler.yml b/.github/advanced-issue-labeler.yml
index 34f5649f6..bae470aad 100644
--- a/.github/advanced-issue-labeler.yml
+++ b/.github/advanced-issue-labeler.yml
@@ -48,17 +48,9 @@ policy:
block-list: ['Other']
label:
# Make sure it's in sync with the dropdown in the issue template
- - name: 'platform: linux-appimage'
- keys: ['Linux (AppImage)']
- - name: 'platform: linux-flatpak'
- keys: ['Linux (Flatpak)']
- - name: 'platform: linux-tarball'
- keys: ['Linux (Tarball)']
- - name: 'platform: macos-aarch64'
- keys: ['macOS - aarch64']
- - name: 'platform: macos-intel'
- keys: ['macOS - Intel']
- - name: 'platform: windows-x64'
- keys: ['Windows - x64']
- - name: 'platform: windows-aarch64'
- keys: ['Windows - aarch64']
+ - name: 'platform: linux'
+ keys: ['Linux (AppImage)', 'Linux (Flatpak)', 'Linux (Tarball)']
+ - name: 'platform: macOS'
+ keys: ['macOS - aarch64', 'macOS - Intel']
+ - name: 'platform: windows'
+ keys: ['Windows - x64', 'Windows - aarch64']
From c60c9fbd30076473bc68978a128f466d7c029ad7 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 15:42:33 +0100
Subject: [PATCH 046/114] Refactor build process to use a new directory
structure and remove deprecated files
---
.github/workflows/build.yml | 16 ++++++++--------
{AppDir => build/AppDir}/AppRun | 0
.../AppDir}/distribution/policies.json | 0
.../share/icons/hicolor/128x128/apps/.gitkeep | 0
{AppDir => build/AppDir}/zen.desktop | 0
.../firefox-cache}/l10n-last-commit-hash | 0
.../flatpak}/app.zen_browser.zen.yml.template | 0
scripts/update_ff.py | 8 ++++----
8 files changed, 12 insertions(+), 12 deletions(-)
rename {AppDir => build/AppDir}/AppRun (100%)
rename {AppDir => build/AppDir}/distribution/policies.json (100%)
rename {AppDir => build/AppDir}/usr/share/icons/hicolor/128x128/apps/.gitkeep (100%)
rename {AppDir => build/AppDir}/zen.desktop (100%)
rename {firefox-cache => build/firefox-cache}/l10n-last-commit-hash (100%)
rename {flatpak => build/flatpak}/app.zen_browser.zen.yml.template (100%)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e78c79946..a3c8132ea 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -385,23 +385,23 @@ jobs:
set -eux
export ARCH=${{ matrix.arch }}
UPINFO="gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|desktop|latest|zen-$ARCH.AppImage.zsync"
- rm AppDir/.DirIcon || true
- cp configs/branding/${{ inputs.update_branch }}/logo128.png AppDir/usr/share/icons/hicolor/128x128/apps/zen.png
- cp configs/branding/${{ inputs.update_branch }}/logo128.png AppDir/zen.png && ln -s zen.png AppDir/.DirIcon
+ rm build/AppDir/.DirIcon || true
+ cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/usr/share/icons/hicolor/128x128/apps/zen.png
+ cp configs/branding/${{ inputs.update_branch }}/logo128.png build/AppDir/zen.png && ln -s zen.png build/AppDir/.DirIcon
if [ "${{ inputs.update_branch }}" = "twilight" ]; then
- sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' AppDir/zen.desktop
- sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' AppDir/zen.desktop
+ sed -i -e 's/Name=Zen Browser/Name=Zen Twilight/g' build/AppDir/zen.desktop
+ sed -i -e 's/StartupWMClass=zen/StartupWMClass=zen-twilight/g' build/AppDir/zen.desktop
fi
- APPDIR=AppDir
+ APPDIR=build/AppDir
tar -xvf *.tar.* && rm -rf *.tar.*
mv zen/* $APPDIR/
wget "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
wget "https://github.com/VHSgunzo/uruntime/releases/latest/download/uruntime-appimage-squashfs-lite-$ARCH"
chmod +x *.AppImage
chmod +x ./uruntime-appimage-squashfs-lite-"$ARCH"
- chmod +x ./AppDir/AppRun
+ chmod +x ./build/AppDir/AppRun
# keep the uruntime mountpoint (massively speeds up launch time)
sed -i 's|URUNTIME_MOUNT=[0-9]|URUNTIME_MOUNT=0|' ./uruntime-appimage-squashfs-lite-"$ARCH"
@@ -628,7 +628,7 @@ jobs:
pwd
ls .
ls ..
- mv releases.xml ./flatpak/app.zen_browser.zen.metainfo.xml
+ mv releases.xml ./build/flatpak/app.zen_browser.zen.metainfo.xml
# output the version to the file
echo -n ${{ needs.build-data.outputs.version }} > ./flatpak/version
diff --git a/AppDir/AppRun b/build/AppDir/AppRun
similarity index 100%
rename from AppDir/AppRun
rename to build/AppDir/AppRun
diff --git a/AppDir/distribution/policies.json b/build/AppDir/distribution/policies.json
similarity index 100%
rename from AppDir/distribution/policies.json
rename to build/AppDir/distribution/policies.json
diff --git a/AppDir/usr/share/icons/hicolor/128x128/apps/.gitkeep b/build/AppDir/usr/share/icons/hicolor/128x128/apps/.gitkeep
similarity index 100%
rename from AppDir/usr/share/icons/hicolor/128x128/apps/.gitkeep
rename to build/AppDir/usr/share/icons/hicolor/128x128/apps/.gitkeep
diff --git a/AppDir/zen.desktop b/build/AppDir/zen.desktop
similarity index 100%
rename from AppDir/zen.desktop
rename to build/AppDir/zen.desktop
diff --git a/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
similarity index 100%
rename from firefox-cache/l10n-last-commit-hash
rename to build/firefox-cache/l10n-last-commit-hash
diff --git a/flatpak/app.zen_browser.zen.yml.template b/build/flatpak/app.zen_browser.zen.yml.template
similarity index 100%
rename from flatpak/app.zen_browser.zen.yml.template
rename to build/flatpak/app.zen_browser.zen.yml.template
diff --git a/scripts/update_ff.py b/scripts/update_ff.py
index 0784d2f9b..f8e5bc7ec 100644
--- a/scripts/update_ff.py
+++ b/scripts/update_ff.py
@@ -62,13 +62,13 @@ def update_l10n_last_commit_hash():
try:
os.system(f"git clone {L10N_REPO} l10n-temp --depth 1")
if not os.path.exists("firefox-cache"):
- os.mkdir("firefox-cache")
- os.system("cat l10n-temp/.git/refs/heads/main > firefox-cache/l10n-last-commit-hash")
+ os.mkdir("build/firefox-cache")
+ os.system("cat l10n-temp/.git/refs/heads/main > build/firefox-cache/l10n-last-commit-hash")
# Remove new line character
data = ""
- with open("firefox-cache/l10n-last-commit-hash", "r") as f:
+ with open("build/firefox-cache/l10n-last-commit-hash", "r") as f:
data = f.read()
- with open("firefox-cache/l10n-last-commit-hash", "w") as f:
+ with open("build/firefox-cache/l10n-last-commit-hash", "w") as f:
f.write(data.strip())
except KeyboardInterrupt:
print("Exiting...")
From dac08aa4487465832582bd5ad2a95717903d563a Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 15:43:09 +0100
Subject: [PATCH 047/114] Remove obsolete update_newtab script and associated
dependency management
---
package.json | 1 -
scripts/update_newtab.py | 77 ----------------------------------------
2 files changed, 78 deletions(-)
delete mode 100644 scripts/update_newtab.py
diff --git a/package.json b/package.json
index 3c3a548ac..da965dc70 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,6 @@
"package": "surfer package",
"update-ff": "python3 scripts/update_ff.py",
"update-ff:raw": "surfer update",
- "update-newtab": "python3 scripts/update_newtab.py",
"update-ff:rc": "python3 scripts/update_ff.py --rc",
"update-ff:l10n": "python3 scripts/update_ff.py --just-l10n",
"pretty": "prettier . --write && autopep8 -r --in-place scripts/ src/",
diff --git a/scripts/update_newtab.py b/scripts/update_newtab.py
deleted file mode 100644
index 846e7f045..000000000
--- a/scripts/update_newtab.py
+++ /dev/null
@@ -1,77 +0,0 @@
-import os
-import subprocess
-import logging
-
-logging.basicConfig(
- level=logging.INFO,
- format='%(asctime)s - %(levelname)s - %(message)s'
-)
-
-NEW_TAB_DIR = "./engine/browser/components/newtab"
-ENGINE_DIR = "./engine"
-NPM_INSTALL_COMMANDS = ["npm install", "npm install meow@9.0.0"]
-BUNDLE_COMMAND = "npm run bundle --prefix=browser/components/newtab"
-
-
-def install_dependencies():
- if not os.path.isdir(NEW_TAB_DIR):
- logging.error(f"Directory not found: {NEW_TAB_DIR}")
- raise FileNotFoundError(f"New tab directory {NEW_TAB_DIR} does not exist")
-
- for command in NPM_INSTALL_COMMANDS:
- try:
- logging.info(f"Running command: {command} in {NEW_TAB_DIR}")
- subprocess.run(
- command.split(),
- cwd=NEW_TAB_DIR,
- check=True,
- capture_output=True,
- text=True
- )
- logging.info(f"Successfully executed: {command}")
- except subprocess.CalledProcessError as e:
- logging.error(f"Command failed: {command} - {e.stderr}")
- raise
-
-
-def bundle_newtab_components():
- if not os.path.isdir(ENGINE_DIR):
- logging.error(f"Directory not found: {ENGINE_DIR}")
- raise FileNotFoundError(f"Engine directory {ENGINE_DIR} does not exist")
-
- try:
- logging.info(f"Bundling newtab components in {ENGINE_DIR}")
- result = subprocess.run(
- BUNDLE_COMMAND.split(),
- cwd=ENGINE_DIR,
- check=True,
- capture_output=True,
- text=True
- )
- logging.info(f"Bundle completed successfully: {result.stdout}")
- except subprocess.CalledProcessError as e:
- logging.error(f"Bundle failed: {e.stderr}")
- raise
-
-
-def update_newtab(init: bool = True):
- try:
- if init:
- logging.info("Starting dependency installation")
- install_dependencies()
- logging.info("Dependencies installed successfully")
-
- logging.info("Starting bundle process")
- bundle_newtab_components()
- logging.info("Newtab update completed successfully")
-
- except (subprocess.CalledProcessError, FileNotFoundError) as e:
- logging.error(f"Update process failed: {str(e)}")
- raise
- except Exception as e:
- logging.error(f"Unexpected error: {str(e)}")
- raise
-
-
-if __name__ == "__main__":
- update_newtab(init=False)
From ebd9419a94176679572f48bb6b6b4ae6b8c1df15 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 16:16:22 +0100
Subject: [PATCH 048/114] Add validation to bug report template for Mods and
Custom CSS checks
---
.github/ISSUE_TEMPLATE/bug_report.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index d31bfd0f3..2be7b55cc 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -21,6 +21,7 @@ body:
- label: I have searched existing issues and avoided creating duplicates.
- label: I am not filing an enhancement request.
- label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
+ - label: I have checked that this issue cannot be reproduced once I removed all my Mods and Custom CSS.
validations:
required: true
- type: textarea
From 6a52500bd3c1b39399f3f83b8348453203e747ee Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 16:42:10 +0100
Subject: [PATCH 049/114] Add 'Split View' component to bug report template and
advanced issue labeler
---
.github/ISSUE_TEMPLATE/bug_report.yml | 1 +
.github/advanced-issue-labeler.yml | 2 ++
2 files changed, 3 insertions(+)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2be7b55cc..b6e8a8692 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -68,6 +68,7 @@ body:
- Glance
- URL Bar
- Tabs
+ - Split View
- Settings
- Privacy
- Performance
diff --git a/.github/advanced-issue-labeler.yml b/.github/advanced-issue-labeler.yml
index bae470aad..b5c0c7ef1 100644
--- a/.github/advanced-issue-labeler.yml
+++ b/.github/advanced-issue-labeler.yml
@@ -23,6 +23,8 @@ policy:
keys: ['Settings']
- name: 'component: privacy'
keys: ['Privacy']
+ - name: 'component: split-view'
+ keys: ['Split View']
- name: 'component: performance'
keys: ['Performance']
- name: 'component: media-controller'
From 41752dcac5a93b1932b9de8e2efc8d1cc070142b Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 16:45:03 +0100
Subject: [PATCH 050/114] Update bug report template to emphasize importance of
descriptive titles
---
.github/ISSUE_TEMPLATE/bug_report.yml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b6e8a8692..bdc2b6981 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -6,7 +6,8 @@ body:
value: |
Thank you for filing a bug report!
- ## Important
+ ## IMPORTANT READ
+ - Please provide descriptive titles. Bad titles do more harm than good.
- Please search existing issues to avoid creating duplicates.
- For enhancement requests, please use GitHub Discussions.
- Please fill out the template below to the best of your ability.
From da609c17471162d17dabd5eb0b88ed10cac804ee Mon Sep 17 00:00:00 2001
From: mauro-balades <91018726+mauro-balades@users.noreply.github.com>
Date: Sat, 29 Mar 2025 16:05:45 +0000
Subject: [PATCH 051/114] Update monthly issue metrics
---
.../2025_2025-03-01..2025-03-31.md | 760 ++++++++++++++++++
1 file changed, 760 insertions(+)
create mode 100644 docs/issue-metrics/2025_2025-03-01..2025-03-31.md
diff --git a/docs/issue-metrics/2025_2025-03-01..2025-03-31.md b/docs/issue-metrics/2025_2025-03-01..2025-03-31.md
new file mode 100644
index 000000000..2f7ede2af
--- /dev/null
+++ b/docs/issue-metrics/2025_2025-03-01..2025-03-31.md
@@ -0,0 +1,760 @@
+# Issue Metrics
+
+| Metric | Average | Median | 90th percentile |
+| --- | --- | --- | ---: |
+| Time to first response | 6 days, 20:41:49 | 2 days, 2:42:34 | 22 days, 1:54:23 |
+| Time to close | 10 days, 15:55:03 | 8 days, 17:32:26 | 24 days, 2:11:50 |
+
+| Metric | Count |
+| --- | ---: |
+| Number of items that remain open | 17 |
+| Number of items closed | 725 |
+| Total number of items created | 742 |
+
+| Title | URL | Time to first response | Time to close |
+| --- | --- | --- | --- |
+| Mac OS Browser thinks there's one more tab open than there actually is | https://github.com/zen-browser/desktop/issues/6980 | None | None |
+| Scroll bar can't be scrolled from the right edge of the window (Windows) | https://github.com/zen-browser/desktop/issues/6979 | None | None |
+| Close tab buttons slightly cut off when in compact mode (Windows) | https://github.com/zen-browser/desktop/issues/6978 | None | None |
+| "Change theme color" clears previous hex values | https://github.com/zen-browser/desktop/issues/6977 | None | None |
+| Mouse does not become pointer on hover | https://github.com/zen-browser/desktop/issues/6976 | None | None |
+| Change theme color wipes out previous hex codes | https://github.com/zen-browser/desktop/issues/6975 | None | 0:00:57 |
+| Letterboxing adds +1 to width when not in compact mode and sidebar is resized (e.g., 1400 → 1401) | https://github.com/zen-browser/desktop/issues/6974 | None | None |
+| Unable to log in to Pocket | https://github.com/zen-browser/desktop/issues/6973 | None | None |
+| Failing to drag tab for split window when native sidebar is on the right | https://github.com/zen-browser/desktop/issues/6972 | None | None |
+| Windows system theme switching does not work | https://github.com/zen-browser/desktop/issues/6971 | None | None |
+| Compact mode sidebar sticking | https://github.com/zen-browser/desktop/issues/6970 | None | None |
+| Failing to drag tab for split window when native sidebar is on the right | https://github.com/zen-browser/desktop/issues/6969 | None | 0:05:51 |
+| closing tab opened from essentials will leads to blank window | https://github.com/zen-browser/desktop/issues/6968 | None | None |
+| Blank dropdown in bookmark manager | https://github.com/zen-browser/desktop/issues/6967 | None | None |
+| Split tab groups can break your browser in private windows | https://github.com/zen-browser/desktop/issues/6966 | None | None |
+| Theme Color alpha hex functionality broken | https://github.com/zen-browser/desktop/issues/6965 | None | None |
+| High GPU/CPU usage on some youtube videos | https://github.com/zen-browser/desktop/issues/6964 | None | None |
+| workforcenow.adp.com doesn't prompt for passkey | https://github.com/zen-browser/desktop/issues/6963 | 0:14:47 | 0:14:47 |
+| Split tab group favicon missaligned | https://github.com/zen-browser/desktop/issues/6962 | 0:01:05 | None |
+| cmd + m doesn’t work anymore on 1.10.3b | https://github.com/zen-browser/desktop/issues/6961 | 0:00:59 | 0:01:00 |
+| Windows system theme switching does not work | https://github.com/zen-browser/desktop/issues/6960 | 0:01:11 | 0:01:12 |
+| Zen applies themes incorectly | https://github.com/zen-browser/desktop/issues/6959 | 0:01:45 | 0:02:15 |
+| test | https://github.com/zen-browser/desktop/issues/6958 | None | 0:04:09 |
+| URL in email; click to open browser | https://github.com/zen-browser/desktop/issues/6954 | 1:17:19 | 1:17:20 |
+| Google Drive upload limited to 20MBit/s | https://github.com/zen-browser/desktop/issues/6953 | 2:42:08 | 2:42:09 |
+| Using File, Edit etc buttons brings up the sidebar | https://github.com/zen-browser/desktop/issues/6952 | 4:37:18 | 4:37:19 |
+| cmd + m broke | https://github.com/zen-browser/desktop/issues/6951 | 4:42:17 | 4:42:18 |
+| Bug: Search bar breaks UI above tab bar | https://github.com/zen-browser/desktop/issues/6947 | 10:39:20 | 10:39:21 |
+| Clicking non functional for some buttons on websites | https://github.com/zen-browser/desktop/issues/6945 | 13:03:39 | 13:03:40 |
+| High RAM usage with WhatsApp Web | https://github.com/zen-browser/desktop/issues/6944 | 13:09:03 | 13:09:03 |
+| Unloading a Pinned Tab Does Not Correctly Focus the New Tab | https://github.com/zen-browser/desktop/issues/6943 | 13:25:58 | 13:25:59 |
+| Media Playback Continues After Unloading a Pinned Tab | https://github.com/zen-browser/desktop/issues/6942 | 13:28:38 | 13:28:38 |
+| Essential and Pinned tabs icons not loading on startup | https://github.com/zen-browser/desktop/issues/6941 | 14:53:33 | 14:53:33 |
+| Site with Login Popup dialog doesnt work | https://github.com/zen-browser/desktop/issues/6939 | 16:22:37 | 16:22:38 |
+| closing tab opened from essentials will leads to blank window | https://github.com/zen-browser/desktop/issues/6938 | 19:53:55 | 19:53:56 |
+| Keyboard Shortcut Issue When Switching Languages in Zen | https://github.com/zen-browser/desktop/issues/6936 | 21:30:24 | 21:30:25 |
+| Live Stream Performance Issues: Douyu Live Room Loads Slowly and Douyin Live Freezes Every 3 Minutes | https://github.com/zen-browser/desktop/issues/6935 | 22:35:15 | 22:35:15 |
+| Any letter opens the control find box(ctrl + f) | https://github.com/zen-browser/desktop/issues/6934 | 0:51:47 | 23:15:00 |
+| Tab-box overflows into adjacent workspace | https://github.com/zen-browser/desktop/issues/6933 | 1 day, 1:24:50 | 1 day, 1:24:50 |
+| Zen applies themes incorectly | https://github.com/zen-browser/desktop/issues/6931 | 1 day, 2:58:17 | 1 day, 2:59:24 |
+| windows onboarding "idle" chewing 30-40% cpu | https://github.com/zen-browser/desktop/issues/6930 | 1 day, 3:04:32 | 1 day, 3:04:32 |
+| Add to Essentials - option disappears | https://github.com/zen-browser/desktop/issues/6927 | 1 day, 4:48:22 | 1 day, 4:48:22 |
+| Computer overheating | https://github.com/zen-browser/desktop/issues/6926 | 4:14:21 | 1 day, 5:46:28 |
+| File Handler Dialog not opening in Archlinux (Hyprland) | https://github.com/zen-browser/desktop/issues/6925 | 0:55:53 | 1 day, 5:58:11 |
+| Repeated Screen Sharing Permission Prompt Despite Existing Approval for Google Meet | https://github.com/zen-browser/desktop/issues/6924 | 1 day, 6:17:41 | 1 day, 6:17:41 |
+| Bookmark title editing: Left/Right arrows trigger bookmark selection instead of text navigation | https://github.com/zen-browser/desktop/issues/6923 | 1 day, 6:37:50 | 1 day, 6:37:51 |
+| Search Bar selection discarded upon floating | https://github.com/zen-browser/desktop/issues/6922 | 1 day, 6:51:59 | 1 day, 6:52:00 |
+| A new media player starts playing before actual youtube video starts | https://github.com/zen-browser/desktop/issues/6920 | 3:22:39 | 1 day, 7:47:32 |
+| Splitting a non-pinned tab with a pinned tabs pins it | https://github.com/zen-browser/desktop/issues/6918 | 1 day, 8:58:13 | 1 day, 8:58:14 |
+| Default Zen Homepage not accessible | https://github.com/zen-browser/desktop/issues/6915 | 5:02:51 | 7:20:33 |
+| The toolbar layout gets disrupted when I switch between browser layouts. | https://github.com/zen-browser/desktop/issues/6914 | 1 day, 13:03:34 | 1 day, 13:03:35 |
+| Mouse Back button often switches to different workspace | https://github.com/zen-browser/desktop/issues/6913 | 8:00:54 | 1 day, 13:12:41 |
+| New tab does not work properly when typing Chinese. | https://github.com/zen-browser/desktop/issues/6912 | 1 day, 13:33:11 | 1 day, 13:33:12 |
+| Add-ons Affecting Browser Performance and Behavior | https://github.com/zen-browser/desktop/issues/6911 | 1 day, 13:38:12 | 1 day, 13:38:13 |
+| Essentials and pinned tabs go blank (see image) | https://github.com/zen-browser/desktop/issues/6907 | 16:37:51 | 1 day, 15:54:52 |
+| Containerized Tabs Disappearing upon Switching Workspaces | https://github.com/zen-browser/desktop/issues/6904 | 0:21:59 | 2:15:45 |
+| Split tab breaks when placed in a tab group | https://github.com/zen-browser/desktop/issues/6903 | 1:11:36 | 1 day, 18:12:59 |
+| omega long loading times in www.icloud.lt | https://github.com/zen-browser/desktop/issues/6902 | 1 day, 11:09:34 | 12:55:47 |
+| whenever i do ctrl + tab to move between different pages while in compact mode ... i got the side bar pop up for 1-2 seconds... which is not helpful or logical | https://github.com/zen-browser/desktop/issues/6901 | 0:33:37 | 1:13:20 |
+| autofill just fill password without user and vice versa | https://github.com/zen-browser/desktop/issues/6897 | 1 day, 22:28:43 | 1 day, 22:28:43 |
+| Spotify Music Problem | https://github.com/zen-browser/desktop/issues/6895 | 0:28:47 | 2:52:23 |
+| [twilight] downloads icon not aligned to webpage border | https://github.com/zen-browser/desktop/issues/6894 | 0:45:03 | 1 day, 23:31:34 |
+| Icon Rendering Incorrectly in KDE Plasma 6 Wayland Window Switcher | https://github.com/zen-browser/desktop/issues/6892 | 7:33:56 | 2 days, 0:31:16 |
+| Unable to open Zen on an m1 pro | https://github.com/zen-browser/desktop/issues/6890 | 2 days, 2:29:43 | 2 days, 2:29:43 |
+| Laggy keyboard Input | https://github.com/zen-browser/desktop/issues/6889 | 2 days, 2:31:48 | 2 days, 2:31:48 |
+| Glitch for smaller windows heights | https://github.com/zen-browser/desktop/issues/6887 | 2 days, 3:49:40 | 2 days, 3:49:41 |
+| websites not loading ! | https://github.com/zen-browser/desktop/issues/6886 | 1 day, 22:18:25 | 2 days, 4:04:00 |
+| This site can’t provide a secure connection zen-browser.app sent an invalid response. ERR_SSL_PROTOCOL_ERROR | https://github.com/zen-browser/desktop/issues/6885 | 0:09:18 | 22:35:10 |
+| Muted video playing in a pinned tab prevent MacOS from sleeping | https://github.com/zen-browser/desktop/issues/6884 | 2:58:48 | 4:19:38 |
+| [twilight] random redirect to another semi-related website | https://github.com/zen-browser/desktop/issues/6883 | 0:41:41 | 1:20:40 |
+| [twilight] Essentials and workspace emoji are translucent and not in full colour | https://github.com/zen-browser/desktop/issues/6882 | 2 days, 4:52:41 | 2 days, 4:52:41 |
+| Toolobar Theming doesn't fully apply | https://github.com/zen-browser/desktop/issues/6881 | 7:13:07 | 23:34:52 |
+| High GPU/CPU usage on some youtube videos | https://github.com/zen-browser/desktop/issues/6880 | 6:07:33 | 2 days, 6:07:27 |
+| cookie related isssue | https://github.com/zen-browser/desktop/issues/6879 | 2 days, 6:24:50 | 2 days, 6:24:50 |
+| The "add extension" button does not appear on small screens | https://github.com/zen-browser/desktop/issues/6877 | 2 days, 9:33:17 | 2 days, 9:33:17 |
+| Opening new tab in a split tab causes them to disappear. | https://github.com/zen-browser/desktop/issues/6876 | 2 days, 11:09:48 | 2 days, 11:09:48 |
+| Super Url Bar | https://github.com/zen-browser/desktop/issues/6874 | 1:33:49 | 2 days, 14:28:38 |
+| On launch, will open first tab in tab list (can be inconsistent, not sure of exact trigger) | https://github.com/zen-browser/desktop/issues/6873 | 6:07:49 | 2 days, 16:35:57 |
+| Minor uneven UI spacing between essential tabs | https://github.com/zen-browser/desktop/issues/6871 | 2 days, 17:33:23 | 2 days, 17:33:23 |
+| Text blurry | https://github.com/zen-browser/desktop/issues/6870 | 2 days, 17:44:41 | 2 days, 17:44:42 |
+| Option "Open links in tabs instead of new windows" unchecked after restart browser | https://github.com/zen-browser/desktop/issues/6869 | 2 days, 18:08:58 | 2 days, 18:08:59 |
+| KeepassXC is added but i cant link my database | https://github.com/zen-browser/desktop/issues/6868 | 21:32:29 | 1 day, 0:11:31 |
+| Extensions do not open when no tabs are open | https://github.com/zen-browser/desktop/issues/6866 | 1:10:21 | 2 days, 22:06:54 |
+| Split favicon bug | https://github.com/zen-browser/desktop/issues/6864 | 2 days, 22:37:00 | 2 days, 22:37:01 |
+| Icon not visible when playing audio | https://github.com/zen-browser/desktop/issues/6863 | 1 day, 1:04:41 | 2 days, 22:56:26 |
+| Increased ram usage fro just 4-5 tabs | https://github.com/zen-browser/desktop/issues/6862 | 2 days, 22:59:53 | 2 days, 22:59:54 |
+| Screen sharing is not working on newer Macbook | https://github.com/zen-browser/desktop/issues/6861 | 2 days, 23:15:15 | 2 days, 23:15:15 |
+| Screen Sharing Malfunction in Google Meet (Windows) | https://github.com/zen-browser/desktop/issues/6860 | 2 days, 23:36:47 | 2 days, 23:36:47 |
+| "Customize Toolbar" Menu breaks when sidebar is at minimum width | https://github.com/zen-browser/desktop/issues/6859 | 3 days, 0:16:52 | 3 days, 0:16:52 |
+| Split tabs breaking when opening a glance window | https://github.com/zen-browser/desktop/issues/6858 | 3 days, 0:17:15 | 3 days, 0:17:15 |
+| Compact mode adds padding on the left misaligning icons in collapsed sidebar | https://github.com/zen-browser/desktop/issues/6857 | None | 0:08:37 |
+| Flickering unusable menus if `widget.wayland.fractional-scale.enabled` is enabled | https://github.com/zen-browser/desktop/issues/6856 | 3 days, 0:24:24 | 3 days, 0:24:24 |
+| Sidebar/TabBar too small on `multiple toolbar`, but right size in `single toolbars` mode - 1.10.2b (Firefox 136.0.3) (64-bit) | https://github.com/zen-browser/desktop/issues/6855 | 0:16:27 | 3 days, 1:18:50 |
+| extension downloadhelper | https://github.com/zen-browser/desktop/issues/6854 | 3 days, 1:31:24 | 3 days, 1:31:24 |
+| Can only interact with 1 tab when split | https://github.com/zen-browser/desktop/issues/6851 | 3 days, 4:17:12 | 3 days, 4:17:13 |
+| Cannot share screen on MacOS | https://github.com/zen-browser/desktop/issues/6850 | 12:46:43 | 3 days, 4:22:22 |
+| Mouse Cursor doesnt dissapear when watching Fullscreen Youtube Video | https://github.com/zen-browser/desktop/issues/6849 | 3 days, 4:35:46 | 3 days, 4:35:46 |
+| "ALT + C" shortcut key bug has not fixed in 1.10.2b | https://github.com/zen-browser/desktop/issues/6847 | 0:19:13 | 2:19:17 |
+| Tab bar doesnt hide when all tabs closed | https://github.com/zen-browser/desktop/issues/6846 | 1:11:00 | 3 days, 6:06:22 |
+| Issue with hidden sidebar on desktop with margins. | https://github.com/zen-browser/desktop/issues/6845 | 3 days, 6:26:39 | 3 days, 6:26:39 |
+| Google meet is not granted permissions for the first few seconds. | https://github.com/zen-browser/desktop/issues/6844 | 2:23:20 | 3 days, 6:55:39 |
+| Google meet will kick out of meeting on switching to another tab | https://github.com/zen-browser/desktop/issues/6843 | 2:29:00 | 3 days, 7:00:24 |
+| Can't click popup window javascript:setopenerValue | https://github.com/zen-browser/desktop/issues/6842 | 3 days, 8:03:52 | 3 days, 8:03:53 |
+| [1.10.1b] Focusing and Unfocusing out of split view has janky window resizing and rendering delays | https://github.com/zen-browser/desktop/issues/6841 | 3 days, 8:37:54 | 3 days, 8:37:54 |
+| [Twilight 1.10.2] Brief black flash when switching workspaces. | https://github.com/zen-browser/desktop/issues/6839 | None | 0:55:54 |
+| Slow New Window Opening | https://github.com/zen-browser/desktop/issues/6838 | 0:03:51 | 3 days, 9:31:19 |
+| Minimizing Full Screen Video Players make the toolbar temp pop up and slide in | https://github.com/zen-browser/desktop/issues/6836 | 3 days, 11:24:59 | 3 days, 11:24:59 |
+| window alert is hidden behind other split pane | https://github.com/zen-browser/desktop/issues/6832 | 3 days, 17:35:05 | 3 days, 17:35:06 |
+| Compact mode sidebar sticking | https://github.com/zen-browser/desktop/issues/6831 | 3 days, 17:39:13 | 3 days, 17:39:13 |
+| Upscayl site does not work properly | https://github.com/zen-browser/desktop/issues/6830 | 3 days, 18:07:45 | 3 days, 18:07:46 |
+| Unremovable duplicate workspace icon | https://github.com/zen-browser/desktop/issues/6829 | 3 days, 19:38:34 | 3 days, 19:38:35 |
+| Bookmarks Toolbar "Always show" does not work | https://github.com/zen-browser/desktop/issues/6828 | 2 days, 0:52:10 | 3 days, 20:14:50 |
+| Pined & Essential Tabs don't unload | https://github.com/zen-browser/desktop/issues/6827 | 3 days, 23:26:09 | 3 days, 23:26:10 |
+| Entire zen window transparent | https://github.com/zen-browser/desktop/issues/6825 | None | 20:47:40 |
+| Duplicate/duplicating a split tab causes erratic tab movements | https://github.com/zen-browser/desktop/issues/6824 | 3 days, 23:44:29 | 3 days, 23:44:29 |
+| "Full screen" item can be interacted with inside "Customise Toolbar..." Menu which breaks it | https://github.com/zen-browser/desktop/issues/6822 | 4 days, 0:54:03 | 4 days, 0:54:04 |
+| When Web Panel is open split tab movement indicators do not display correctly | https://github.com/zen-browser/desktop/issues/6819 | 4 days, 1:28:54 | 4 days, 1:28:55 |
+| When Web Panel is open Vertical Tab Splits can't be resized | https://github.com/zen-browser/desktop/issues/6817 | 16:18:30 | 4 days, 1:42:11 |
+| Anthropic's Claude freezes only on Zen browser | https://github.com/zen-browser/desktop/issues/6816 | 1 day, 6:43:57 | 4 days, 1:48:02 |
+| Cursor Auto-Highlight on Ctrl+Tab Disrupts Tab Cycling | https://github.com/zen-browser/desktop/issues/6815 | 4 days, 1:59:18 | 4 days, 1:59:19 |
+| Disabling "Use workspace colors as primary color" does nothing | https://github.com/zen-browser/desktop/issues/6812 | 4 days, 2:25:50 | 4 days, 2:25:51 |
+| Sites within WebPanel behaves wrong if navigator API is spoofed vie extension | https://github.com/zen-browser/desktop/issues/6811 | 4 days, 2:41:39 | 4 days, 2:41:40 |
+| When removing an extension, confirmation message has a mistake | https://github.com/zen-browser/desktop/issues/6810 | 4 days, 3:08:04 | 4 days, 3:08:04 |
+| Zen comes pre-installed with an English (United States) dictionary which can't be removed | https://github.com/zen-browser/desktop/issues/6809 | 4 days, 3:29:07 | 4 days, 3:29:07 |
+| UI bug: Responsive Design Mode reload notification being obscured by music player | https://github.com/zen-browser/desktop/issues/6808 | 4 days, 4:28:07 | 4 days, 4:28:07 |
+| Placing the "Zoom Controls" item in the Top Item Row of the Side Toolbar causes zoom indicator to not appear. | https://github.com/zen-browser/desktop/issues/6807 | 4 days, 4:37:37 | 4 days, 4:37:37 |
+| While in the "Customize Toolbar..." Menu the maximise window button is greyed out and not usable | https://github.com/zen-browser/desktop/issues/6806 | 4 days, 5:01:40 | 4 days, 5:01:40 |
+| Placing a Large Item as the first item in the Top Item Row of the Side Toolbar breaks entire Side Toolbar when in Collapsed Toolbar Layout | https://github.com/zen-browser/desktop/issues/6805 | 4 days, 5:38:36 | 4 days, 5:38:37 |
+| Top item row in Side Toolbar not aligned with items in Top Toolbar when using Collapsed Toolbar | https://github.com/zen-browser/desktop/issues/6804 | 2:30:37 | 4 days, 6:01:27 |
+| Toolbar with a lot of items can break single toolbar | https://github.com/zen-browser/desktop/issues/6803 | 4 days, 6:51:09 | 4 days, 6:51:09 |
+| Zen Webpanel (Sidebar) does not move | https://github.com/zen-browser/desktop/issues/6802 | 4 days, 6:56:53 | 4 days, 6:56:53 |
+| [Twilight 1.10.1t] All tabs are loading after update | https://github.com/zen-browser/desktop/issues/6801 | 0:08:03 | 21:25:15 |
+| Side flap bug | https://github.com/zen-browser/desktop/issues/6800 | None | 0:00:08 |
+| Pinned tabs glance does not reset | https://github.com/zen-browser/desktop/issues/6799 | 0:06:08 | 4 days, 9:00:07 |
+| [Twilight 1.10.1t] Last selected tab not respected if restoring split view group on launch | https://github.com/zen-browser/desktop/issues/6798 | None | 3 days, 5:15:16 |
+| [Twilight 1.10.1] Switching workspaces is not as fluid as before with a brief black flash when moving to new workspace. | https://github.com/zen-browser/desktop/issues/6797 | None | 1 day, 2:14:58 |
+| Theme not correctly working/resetting when switching workspace | https://github.com/zen-browser/desktop/issues/6796 | 4 days, 11:30:51 | 4 days, 11:30:51 |
+| Zen Browser Freeze When Downloading | https://github.com/zen-browser/desktop/issues/6795 | 4 days, 11:54:20 | 4 days, 11:54:21 |
+| Default Translucency Not Working - Toolbar and Sidebar Colors Forced to Windows Theme | https://github.com/zen-browser/desktop/issues/6794 | 4 days, 13:11:15 | 4 days, 13:11:16 |
+| Invisible Floating Bar | https://github.com/zen-browser/desktop/issues/6792 | None | 22:04:52 |
+| Unable to log in to Pocket | https://github.com/zen-browser/desktop/issues/6790 | 4 days, 17:42:50 | 4 days, 17:42:51 |
+| Workspaces working as tab groups and not as workspaces | https://github.com/zen-browser/desktop/issues/6789 | 4:18:48 | 4 days, 17:46:34 |
+| [Privacy] Unwanted Connections, Transparency and Default Search Engine | https://github.com/zen-browser/desktop/issues/6787 | 4 days, 20:40:43 | 4 days, 20:40:43 |
+| glance in Google drive | https://github.com/zen-browser/desktop/issues/6785 | 4 days, 22:23:09 | 4 days, 22:23:10 |
+| Winget adds desktop shortcut | https://github.com/zen-browser/desktop/issues/6784 | 0:22:29 | 4 days, 22:41:24 |
+| Theme Color alpha hex functionality broken | https://github.com/zen-browser/desktop/issues/6783 | 4 days, 6:08:04 | 5 days, 0:00:15 |
+| Kernel panics on macOS | https://github.com/zen-browser/desktop/issues/6781 | 4:00:11 | 5 days, 1:16:46 |
+| workforcenow.adp.com doesn't prompt for passkey | https://github.com/zen-browser/desktop/issues/6780 | 5 days, 1:58:56 | 5 days, 1:58:56 |
+| macOS Title Bar reg/yellow/green Buttons Are Colorless | https://github.com/zen-browser/desktop/issues/6776 | 0:12:16 | 5:53:54 |
+| Cant login to netflix | https://github.com/zen-browser/desktop/issues/6773 | 1:34:11 | 11:31:40 |
+| Tab unloader disregards preferences on unsaved tabs | https://github.com/zen-browser/desktop/issues/6770 | 5 days, 17:40:09 | 5 days, 17:40:09 |
+| Inconsistent sizes for bottom icons | https://github.com/zen-browser/desktop/issues/6769 | 5 days, 18:00:19 | 5 days, 18:00:20 |
+| Blank Screen Insted of Home screen | https://github.com/zen-browser/desktop/issues/6768 | 13:18:07 | 5 days, 18:57:14 |
+| Pin syncing on new devices | https://github.com/zen-browser/desktop/issues/6767 | 4 days, 3:54:28 | 5 days, 19:11:28 |
+| zen.mediacontrols.enabled doesn't appear in about:config | https://github.com/zen-browser/desktop/issues/6766 | 8:19:56 | 11:30:57 |
+| Address bar closes when switching input language with Cmd+Space on Wayland (Ubuntu) | https://github.com/zen-browser/desktop/issues/6765 | 1 day, 6:03:22 | 5 days, 20:53:14 |
+| New tab overlay hides when CTRL key is pressed | https://github.com/zen-browser/desktop/issues/6764 | 21:36:14 | 5 days, 21:13:53 |
+| New Tab Button | Error | https://github.com/zen-browser/desktop/issues/6762 | 16:35:56 | 21:18:08 |
+| Extensions doesn't load automatically | https://github.com/zen-browser/desktop/issues/6760 | 5 days, 22:22:05 | 5 days, 22:22:06 |
+| PowerToys Run still not working correctly (web search) | https://github.com/zen-browser/desktop/issues/6759 | 6 days, 0:37:43 | 6 days, 0:37:44 |
+| URL which beging with HTTPS Glace does not recognize | https://github.com/zen-browser/desktop/issues/6758 | 6 days, 0:46:54 | 6 days, 0:46:54 |
+| opening external files and links | https://github.com/zen-browser/desktop/issues/6757 | 6 days, 1:30:57 | 6 days, 1:30:58 |
+| editing pdfs do not export correctly | https://github.com/zen-browser/desktop/issues/6756 | 6 days, 1:32:26 | 6 days, 1:32:27 |
+| spotify can't play songs | https://github.com/zen-browser/desktop/issues/6755 | 1:46:04 | 2:43:09 |
+| Scrolling seems to be lagging back again in `v1.10.1b` while the browser rounded corner was disabled | https://github.com/zen-browser/desktop/issues/6754 | 6 days, 2:13:52 | 6 days, 2:13:53 |
+| Can't install mods | https://github.com/zen-browser/desktop/issues/6752 | 1 day, 10:42:01 | 6 days, 2:50:15 |
+| Ctrl-Q closes current tab before exit | https://github.com/zen-browser/desktop/issues/6751 | 6 days, 3:34:38 | 6 days, 3:34:38 |
+| Extensions spilling out of the sidebar | https://github.com/zen-browser/desktop/issues/6750 | 5:04:56 | 6 days, 4:23:46 |
+| heylogin popup empty | https://github.com/zen-browser/desktop/issues/6749 | None | 1 day, 8:42:50 |
+| The pip option often fails after a reboot | https://github.com/zen-browser/desktop/issues/6748 | 6 days, 4:59:02 | 6 days, 4:59:02 |
+| Movie Player error 6007-1001-3102: Please use an updated version of your browser or use another device | https://github.com/zen-browser/desktop/issues/6747 | None | 2:09:47 |
+| Zen crashes on right click on tab | https://github.com/zen-browser/desktop/issues/6746 | 1:10:39 | 6 days, 5:37:54 |
+| It would be useful to have a Restore/Reset icon next to changed keyboard shortcuts. | https://github.com/zen-browser/desktop/issues/6744 | 6 days, 5:49:25 | 6 days, 5:49:26 |
+| Opening the settings page not selecting the unloaded tab | https://github.com/zen-browser/desktop/issues/6743 | 6 days, 7:14:48 | 6 days, 7:14:49 |
+| Pinned Essentials clipping thorugh Workspace/Tabs area in Compact Mode | https://github.com/zen-browser/desktop/issues/6741 | 6 days, 9:36:36 | 6 days, 9:36:37 |
+| split with essentials not working | https://github.com/zen-browser/desktop/issues/6739 | 6 days, 16:29:52 | 6 days, 16:29:53 |
+| Media player music animation should respect animation accessibility settings | https://github.com/zen-browser/desktop/issues/6737 | 6 days, 17:23:48 | 6 days, 17:23:49 |
+| Unable to swipe through workspaces. | https://github.com/zen-browser/desktop/issues/6735 | 6 days, 19:53:12 | 6 days, 19:53:12 |
+| Automatically leaving meetings when expanding a glance tab containing the meeting | https://github.com/zen-browser/desktop/issues/6734 | 1 day, 15:01:01 | 6 days, 21:10:19 |
+| Zen crashes my Computer completely | https://github.com/zen-browser/desktop/issues/6732 | 3:56:33 | 6 days, 22:54:38 |
+| Tab bar width issues | https://github.com/zen-browser/desktop/issues/6730 | 6 days, 23:26:00 | 6 days, 23:26:01 |
+| Transparency no longer works with the 1.10.1b update on Linux | https://github.com/zen-browser/desktop/issues/6729 | 0:00:56 | 7 days, 0:06:00 |
+| Issues with css live edit | https://github.com/zen-browser/desktop/issues/6728 | 7 days, 0:43:26 | 7 days, 0:43:27 |
+| corner case: Media Player handling long media names | https://github.com/zen-browser/desktop/issues/6727 | 7 days, 0:46:48 | 7 days, 0:46:49 |
+| Vimium tab navigation broken since 1.9b | https://github.com/zen-browser/desktop/issues/6726 | 7 days, 0:50:09 | 7 days, 0:50:09 |
+| When i open zen it only shows black screen home page | https://github.com/zen-browser/desktop/issues/6725 | 0:22:12 | 7 days, 1:14:36 |
+| Shortcuts not working as intended/unclear. i.e: Does X instead of Y as stated in the Keyboard Shortcuts section. | https://github.com/zen-browser/desktop/issues/6724 | 7 days, 1:20:26 | 7 days, 1:20:26 |
+| Zen icon not showing in Plasma title bar | https://github.com/zen-browser/desktop/issues/6723 | 7 days, 1:38:55 | 7 days, 1:38:55 |
+| Windows system theme switching does not work | https://github.com/zen-browser/desktop/issues/6722 | 7 days, 2:41:59 | 7 days, 2:41:59 |
+| All of Essentials suddenly disappearing | https://github.com/zen-browser/desktop/issues/6721 | 4 days, 5:40:42 | 7 days, 2:43:33 |
+| New tab shortcut broken | https://github.com/zen-browser/desktop/issues/6719 | 4 days, 4:59:23 | 7 days, 3:40:03 |
+| having a lot of workspaces still require from me to have wide sidebar | https://github.com/zen-browser/desktop/issues/6718 | 22:37:20 | 23:25:25 |
+| YouTube essential disappear when reopening the browser | https://github.com/zen-browser/desktop/issues/6717 | 7 days, 5:24:03 | 7 days, 5:24:03 |
+| Window Control Buttons Misaligned in Compact Mode | https://github.com/zen-browser/desktop/issues/6716 | 0:24:05 | 7 days, 6:18:13 |
+| Certificate Manager is mostly broken | https://github.com/zen-browser/desktop/issues/6713 | 9:53:59 | 7 days, 7:51:20 |
+| Zen browser's implementation of Content Security Policy | https://github.com/zen-browser/desktop/issues/6712 | 6 days, 22:36:46 | 7 days, 8:01:58 |
+| macOS passkeys not working on certain websites | https://github.com/zen-browser/desktop/issues/6709 | 3 days, 0:44:40 | 7 days, 13:20:09 |
+| Website Appearance: Automatic broken on macOS | https://github.com/zen-browser/desktop/issues/6708 | 2 days, 20:48:35 | 7 days, 13:22:04 |
+| zen new tab process in new window is cpu heavy | https://github.com/zen-browser/desktop/issues/6707 | None | 1:22:09 |
+| Stopping YouTube video on Zen forcing Alcove (dynamic island app) to quit and cannot be launched again | https://github.com/zen-browser/desktop/issues/6704 | 0:32:40 | 7 days, 14:46:10 |
+| New tabs open on new windows | https://github.com/zen-browser/desktop/issues/6703 | 7 days, 15:11:33 | 7 days, 15:11:34 |
+| Query input dialog disappears when changing the language | https://github.com/zen-browser/desktop/issues/6702 | 7 days, 17:44:36 | 7 days, 17:44:36 |
+| adding new tab while being on full screen | https://github.com/zen-browser/desktop/issues/6701 | 17:49:38 | 7 days, 18:20:09 |
+| Trying to export/share Rice softlocks the browser | https://github.com/zen-browser/desktop/issues/6700 | 7 days, 18:55:49 | 7 days, 18:55:50 |
+| Changing tabs scrolls the tab bar to the top | https://github.com/zen-browser/desktop/issues/6699 | None | 1 day, 4:31:48 |
+| External Links - Opens the browser, but not the link. (ZenBrowser.x86_64.AppImage + POP!_os 22.04) | https://github.com/zen-browser/desktop/issues/6698 | 2 days, 15:10:42 | 7 days, 20:37:03 |
+| Problem with Youtube Music | https://github.com/zen-browser/desktop/issues/6697 | 2:07:46 | 7 days, 21:15:12 |
+| some website/graph is not rendered correctly | https://github.com/zen-browser/desktop/issues/6692 | None | 0:10:52 |
+| Preference "zen.workspaces.show-icon-strip=false" no-longer hides non-current workspaces. | https://github.com/zen-browser/desktop/issues/6690 | 0:03:14 | 8 days, 0:46:14 |
+| some sites wont load properly | https://github.com/zen-browser/desktop/issues/6689 | None | 16:58:42 |
+| 如何保证常驻标签页在关闭浏览器后，重新打开浏览器后常驻标签页的URL保持不变，而不是上一次关闭浏览器前最后访问的地址 | https://github.com/zen-browser/desktop/issues/6687 | 0:19:22 | 8 days, 3:16:36 |
+| Youtube and Youtube Music seeking in Media player is not synced | https://github.com/zen-browser/desktop/issues/6685 | 0:32:27 | 8 days, 3:18:50 |
+| Screen Sharing Bug on Mac | https://github.com/zen-browser/desktop/issues/6683 | 8 days, 3:49:00 | 8 days, 3:49:01 |
+| Weird workspace scroll change behaviour with sidebar to the right | https://github.com/zen-browser/desktop/issues/6680 | 8 days, 4:52:43 | 8 days, 4:52:44 |
+| Zen not drawing properly when first opened | https://github.com/zen-browser/desktop/issues/6679 | 3 days, 22:17:55 | 8 days, 5:02:06 |
+| The browser.tabs.allow_transparent_browser stoped working | https://github.com/zen-browser/desktop/issues/6678 | 0:14:11 | 8 days, 5:49:04 |
+| "Reading List" extension: Can't read or change data on this site | https://github.com/zen-browser/desktop/issues/6677 | 8 days, 6:42:58 | 8 days, 6:42:59 |
+| Media Control does not respect playback speed | https://github.com/zen-browser/desktop/issues/6675 | None | 3:03:07 |
+| Extension install confirm dialog goes offscreen in single toolbar mode | https://github.com/zen-browser/desktop/issues/6674 | 0:29:54 | 8 days, 7:25:57 |
+| bug: media player applet doesn't respect current progress when paused | https://github.com/zen-browser/desktop/issues/6672 | 0:18:24 | 8 days, 7:45:39 |
+| media playing asks if i want to leave | https://github.com/zen-browser/desktop/issues/6671 | 3:56:03 | 4:27:20 |
+| Showing previous version even after Updating | https://github.com/zen-browser/desktop/issues/6669 | 1:54:14 | 8 days, 12:38:12 |
+| Pin Tabs & Essential Tabs are Removed | https://github.com/zen-browser/desktop/issues/6668 | 8 days, 13:06:17 | 8 days, 13:06:17 |
+| Google Docs breaking | https://github.com/zen-browser/desktop/issues/6664 | 19:28:30 | 8 days, 16:13:47 |
+| Media freezes after toggling Zen from different window | https://github.com/zen-browser/desktop/issues/6663 | 8 days, 17:32:25 | 8 days, 17:32:26 |
+| CPU | https://github.com/zen-browser/desktop/issues/6662 | 22:12:03 | 8 days, 18:02:57 |
+| [ Twilight ] Loosing transparency | https://github.com/zen-browser/desktop/issues/6660 | 18:34:05 | 1 day, 0:27:29 |
+| Automaticallty leaving google meets. | https://github.com/zen-browser/desktop/issues/6659 | 0:51:01 | 13:36:13 |
+| Cannot reorder tabs or open split view in private browsing | https://github.com/zen-browser/desktop/issues/6658 | 8 days, 20:34:09 | 8 days, 20:34:09 |
+| Extension icons overflowing when pinned to toolbar | https://github.com/zen-browser/desktop/issues/6657 | 16:23:15 | 8 days, 20:53:25 |
+| Essential tabs frequently exhibit an overlay that obscures their content | https://github.com/zen-browser/desktop/issues/6655 | 8 days, 21:20:37 | 8 days, 21:20:37 |
+| Workspaces Icon Strip STILL never scrolls or stops expanding and it makes the browser unusable | https://github.com/zen-browser/desktop/issues/6652 | 16:08:33 | 16:08:33 |
+| Roboform extension is not filling logon form fields in Zen browswer | https://github.com/zen-browser/desktop/issues/6650 | None | 5 days, 18:03:32 |
+| Media player controller causes youtube music to stop playing after sometime | https://github.com/zen-browser/desktop/issues/6648 | 23:18:57 | 1 day, 0:47:45 |
+| Shortcut Override Disables Backspace Input | https://github.com/zen-browser/desktop/issues/6647 | 9 days, 1:23:39 | 9 days, 1:23:39 |
+| "leave"message keeps popping-up | https://github.com/zen-browser/desktop/issues/6646 | 0:19:09 | 9 days, 1:27:14 |
+| UI Scaling issue on linux desktop | https://github.com/zen-browser/desktop/issues/6644 | 9 days, 1:37:58 | 9 days, 1:37:58 |
+| Update 1.10b removes option to toggle displaying workspaces as icon strip | https://github.com/zen-browser/desktop/issues/6643 | 1:56:58 | 20:11:36 |
+| Flatpak theming issue with GTK | https://github.com/zen-browser/desktop/issues/6642 | 9 days, 2:15:14 | 9 days, 2:15:14 |
+| Some websites doesnt load but others load!!! | https://github.com/zen-browser/desktop/issues/6641 | 3:22:02 | 21:31:59 |
+| Problem with Zen In instagram | https://github.com/zen-browser/desktop/issues/6640 | 4 days, 3:24:24 | 9 days, 3:47:22 |
+| Media Control Keys Not Working | https://github.com/zen-browser/desktop/issues/6639 | 6:49:55 | 2 days, 1:54:44 |
+| DRM content get's paused abruptly | https://github.com/zen-browser/desktop/issues/6638 | 4 days, 5:05:32 | 4 days, 5:05:32 |
+| Google Meet disconnects after a few seconds if I switch tabs | https://github.com/zen-browser/desktop/issues/6637 | 0:28:11 | 2:43:39 |
+| Problems with Google meet, unusable in call continuos down | https://github.com/zen-browser/desktop/issues/6636 | 0:05:47 | 2:56:40 |
+| Deleted workpaces with tabs still exist(?) | https://github.com/zen-browser/desktop/issues/6635 | 9 days, 6:03:15 | 9 days, 6:03:15 |
+| Audio shut off after about 25 seconds on some website. | https://github.com/zen-browser/desktop/issues/6634 | 3:41:06 | 3:41:06 |
+| Essential and Pinned tabs not opening on startup | https://github.com/zen-browser/desktop/issues/6630 | 9 days, 11:09:25 | 9 days, 11:09:25 |
+| Youtube Music randomly switch to tab and showing leave page dialog. | https://github.com/zen-browser/desktop/issues/6627 | 0:27:21 | 10:06:53 |
+| Rendering Issues for Startpage, Vercel and other websites | https://github.com/zen-browser/desktop/issues/6626 | 4:36:44 | 9 days, 12:48:07 |
+| Few bugs | https://github.com/zen-browser/desktop/issues/6623 | 9 days, 15:23:47 | 9 days, 15:23:47 |
+| Dark mode on Google has darker boxes around each result compared to the background | https://github.com/zen-browser/desktop/issues/6622 | 15:46:04 | 9 days, 15:32:25 |
+| [1.10b] Focusing back into split windows causes janky resizing of websites along with rendering delay when exiting out of split view into other tabs | https://github.com/zen-browser/desktop/issues/6621 | None | 6 days, 6:36:15 |
+| Blur behind new tab isn't centered properly | https://github.com/zen-browser/desktop/issues/6620 | 0:23:52 | 0:43:53 |
+| The media animation causes high CPU usage | https://github.com/zen-browser/desktop/issues/6619 | 9 days, 16:13:08 | 9 days, 16:13:08 |
+| white streak on left side of window when i fullscreen | https://github.com/zen-browser/desktop/issues/6617 | 1:29:28 | 9 days, 17:18:57 |
+| [1.10b] Focusing back into split windows causes janky resizing animation | https://github.com/zen-browser/desktop/issues/6614 | None | 2:09:32 |
+| Color is not theme switching on audio widget | https://github.com/zen-browser/desktop/issues/6613 | 9 days, 17:54:09 | 9 days, 17:54:10 |
+| Authentication on sites via a certificate (such as a Smart Card) broken on macOS in 1.10b | https://github.com/zen-browser/desktop/issues/6612 | 9 days, 18:33:37 | 9 days, 18:33:37 |
+| Pinned tab separator inconsistent width | https://github.com/zen-browser/desktop/issues/6611 | 9 days, 19:23:43 | 9 days, 19:23:44 |
+| Sidebar/Tab Bar navigation buttons overflow | https://github.com/zen-browser/desktop/issues/6610 | 9 days, 19:28:07 | 9 days, 19:28:08 |
+| Inconsistent spacing in compact modes | https://github.com/zen-browser/desktop/issues/6609 | 9 days, 19:40:12 | 9 days, 19:40:13 |
+| No default favicon for sites without Favicon | https://github.com/zen-browser/desktop/issues/6608 | 20:08:49 | 9 days, 19:44:17 |
+| Music playback from Jellyfin fails if tab not focused | https://github.com/zen-browser/desktop/issues/6607 | None | 17:48:12 |
+| New "Media player controller" autoscrolls to top of tab list | https://github.com/zen-browser/desktop/issues/6605 | 21:45:39 | 2 days, 10:48:27 |
+| Autofill does not work in Mac OS | https://github.com/zen-browser/desktop/issues/6604 | 9 days, 20:41:25 | 9 days, 20:41:26 |
+| warning pop up randomly | https://github.com/zen-browser/desktop/issues/6603 | 0:20:03 | 18:13:51 |
+| Controls not visible in new media player controller | https://github.com/zen-browser/desktop/issues/6601 | 1:42:38 | 9 days, 21:46:37 |
+| Unexplained Black Background in full screen mode | https://github.com/zen-browser/desktop/issues/6600 | 9 days, 21:59:10 | 9 days, 21:59:11 |
+| can't delete a shortcut | https://github.com/zen-browser/desktop/issues/6599 | 0:02:25 | 19:13:46 |
+| With Media Player, pinned tabs playing audio/video do not unload | https://github.com/zen-browser/desktop/issues/6598 | None | 0:09:27 |
+| workspaces being displayed in a line made sidebar too wide resulting in multiple visual issues | https://github.com/zen-browser/desktop/issues/6597 | 1:21:34 | 1 day, 17:31:25 |
+| Close page alert appears out of nowhere randomly whenever using YouTube Music in the background | https://github.com/zen-browser/desktop/issues/6596 | 0:40:11 | 9 days, 23:14:36 |
+| All tabs keep crashing on Windows | https://github.com/zen-browser/desktop/issues/6595 | 9 days, 23:41:59 | 9 days, 23:42:00 |
+| Missing Profile Manager in Application Menu | https://github.com/zen-browser/desktop/issues/6594 | 7 days, 20:01:45 | 9 days, 23:51:00 |
+| google slides stops | https://github.com/zen-browser/desktop/issues/6592 | 0:18:30 | 10 days, 0:18:42 |
+| [1.10b] Google meet auto leaves if tab not in focus | https://github.com/zen-browser/desktop/issues/6591 | 0:51:20 | 21:44:10 |
+| Buggy UI when switching from Single toolbar to Collapsed toolbar [1.10b] | https://github.com/zen-browser/desktop/issues/6590 | 10 days, 0:56:02 | 10 days, 0:56:02 |
+| [1.10b] Unloaded pinned tab with middle click is still loaded | https://github.com/zen-browser/desktop/issues/6589 | None | 2 days, 18:22:26 |
+| Essentials tab with "messages.google.com", after browser restart, is now just an empty essentials window. | https://github.com/zen-browser/desktop/issues/6587 | 10 days, 1:47:23 | 10 days, 1:47:23 |
+| Customize toolbar glitch | https://github.com/zen-browser/desktop/issues/6584 | None | 0:07:05 |
+| Weird behaviour of media player | https://github.com/zen-browser/desktop/issues/6583 | 0:28:23 | 19:58:25 |
+| weird behavior of pinned tab when in unload state. (1.10b) | https://github.com/zen-browser/desktop/issues/6582 | None | 3 days, 4:21:05 |
+| Sidebar(Bookmarks) not resizable when on the right | https://github.com/zen-browser/desktop/issues/6581 | 10 days, 3:38:17 | 10 days, 3:38:17 |
+| Shortcut key (ALT + C) not working as it shoud | https://github.com/zen-browser/desktop/issues/6580 | 8:01:15 | 10 days, 3:47:52 |
+| Extension's options pop-up in the address after switching between single and multiple toolbars | https://github.com/zen-browser/desktop/issues/6579 | 7 days, 23:16:56 | 10 days, 3:48:18 |
+| search bar cuts out of screen | https://github.com/zen-browser/desktop/issues/6578 | 7 days, 7:58:30 | 10 days, 4:05:13 |
+| new media player controls invisible | https://github.com/zen-browser/desktop/issues/6577 | 2:40:31 | 4 days, 1:29:05 |
+| Broke layout when resizing on gnome | https://github.com/zen-browser/desktop/issues/6574 | 10 days, 5:06:32 | 10 days, 5:06:33 |
+| Split screen is still unusable | https://github.com/zen-browser/desktop/issues/6573 | 10 days, 5:22:13 | 10 days, 5:22:14 |
+| Bookmark toolbar hidden forever, cannot re-enable | https://github.com/zen-browser/desktop/issues/6572 | 4:29:45 | 10 days, 5:30:23 |
+| Music player disappears when I enter fullscreen mode. | https://github.com/zen-browser/desktop/issues/6571 | 10 days, 5:46:36 | 10 days, 5:46:37 |
+| Shortcut for compact mode not working | https://github.com/zen-browser/desktop/issues/6570 | 23:53:56 | 10 days, 5:48:07 |
+| The tab playing music suddenly tries to close | https://github.com/zen-browser/desktop/issues/6569 | 2:34:44 | 1 day, 3:41:49 |
+| pages are not loading. | https://github.com/zen-browser/desktop/issues/6568 | 0:36:26 | 6:12:21 |
+| [1.10b] Problem reproducing music after new update | https://github.com/zen-browser/desktop/issues/6567 | 4:36:27 | 1 day, 4:05:32 |
+| Website for `grok.com` unable to be opened | https://github.com/zen-browser/desktop/issues/6566 | 0:34:25 | 4:23:14 |
+| I don't see the new media player | https://github.com/zen-browser/desktop/issues/6565 | 0:01:31 | 0:19:53 |
+| Grouping tabs bug | https://github.com/zen-browser/desktop/issues/6564 | 1:25:58 | 10 days, 7:29:16 |
+| [1.10b]Music controls not visible in the sidebar media player - light mode | https://github.com/zen-browser/desktop/issues/6562 | 0:57:05 | 4 days, 5:49:17 |
+| [1.10b] The default icon for tabs with no favicon is a bit strange, kinda preferred the default globe icon. | https://github.com/zen-browser/desktop/issues/6558 | 9:12:57 | 10 days, 15:57:17 |
+| extension icons being cut off | https://github.com/zen-browser/desktop/issues/6556 | 5:21:38 | 10 days, 17:11:42 |
+| Cornerradius on websites | https://github.com/zen-browser/desktop/issues/6554 | 10 days, 17:31:17 | 10 days, 17:31:18 |
+| Floating tab bar breaks without any shortcuts set | https://github.com/zen-browser/desktop/issues/6552 | 10 days, 23:11:25 | 10 days, 23:11:25 |
+| Profiles manage page not open | https://github.com/zen-browser/desktop/issues/6549 | 1 day, 3:51:56 | 11 days, 1:55:12 |
+| SImple tab group is locked loading in a new window | https://github.com/zen-browser/desktop/issues/6547 | 11 days, 2:09:36 | 11 days, 2:09:36 |
+| Save to Koofr extension not working | https://github.com/zen-browser/desktop/issues/6546 | None | 0:20:09 |
+| Buttons not loading in ChatGPT | https://github.com/zen-browser/desktop/issues/6545 | 1 day, 1:59:28 | 11 days, 3:04:35 |
+| Multiple toolbars prevents access to window controls | https://github.com/zen-browser/desktop/issues/6544 | 8 days, 2:31:30 | 11 days, 3:12:41 |
+| Master Password not recognised | https://github.com/zen-browser/desktop/issues/6543 | None | 0:08:37 |
+| The 1.9.1B version of the browser is not compatible with Baidu Input Method, which may cause the page to freeze when text is entered into the search bar. | https://github.com/zen-browser/desktop/issues/6542 | 11 days, 3:44:20 | 11 days, 3:44:21 |
+| [ twilight ] Set alternatives languages issues | https://github.com/zen-browser/desktop/issues/6541 | 14:16:10 | 1 day, 3:56:17 |
+| Browser takes theme color on websites which don't have any background color #bug | https://github.com/zen-browser/desktop/issues/6539 | 11 days, 7:02:47 | 11 days, 7:02:48 |
+| Opening Zen via a keyboard shortcut causes a Open in troubleshoot mode. | https://github.com/zen-browser/desktop/issues/6538 | 8:37:13 | 11 days, 9:21:17 |
+| Microsoft Teams fails to init | https://github.com/zen-browser/desktop/issues/6537 | 11 days, 9:52:46 | 11 days, 9:52:46 |
+| logs off from every account on restart | https://github.com/zen-browser/desktop/issues/6536 | 13:39:58 | 11 days, 10:19:55 |
+| Page screenshot buttons, `about:logins` and `Secure Site Not Available` page [seem to] use default accent color | https://github.com/zen-browser/desktop/issues/6534 | 11 days, 16:25:09 | 11 days, 16:25:09 |
+| Enhanced tracking protection ("shield" icon) is gone | https://github.com/zen-browser/desktop/issues/6533 | 11 days, 6:57:39 | 11 days, 15:54:58 |
+| Browser does not record history | https://github.com/zen-browser/desktop/issues/6532 | 6:33:00 | 11 days, 18:30:23 |
+| White bar at the bottom of the window when having windows "Hide Taskbar" on | https://github.com/zen-browser/desktop/issues/6531 | 0:38:42 | 11 days, 20:09:24 |
+| Closing zen not working | https://github.com/zen-browser/desktop/issues/6529 | None | 9:45:39 |
+| Closing and reopening essentials results in pinned tab | https://github.com/zen-browser/desktop/issues/6528 | 11 days, 21:21:41 | 11 days, 21:21:42 |
+| Zen not opening last used tab when opening new window | https://github.com/zen-browser/desktop/issues/6527 | 11 days, 21:28:58 | 11 days, 21:28:58 |
+| Tab Reordering Issue when in Always Private Browsing Mode | https://github.com/zen-browser/desktop/issues/6526 | 11 days, 21:33:54 | 11 days, 21:33:55 |
+| Tab close button clickable area smaller than hover-highlighted area | https://github.com/zen-browser/desktop/issues/6525 | 11 days, 22:43:11 | 11 days, 22:43:11 |
+| On startup browser does not respect spacers in the tolbar customisation | https://github.com/zen-browser/desktop/issues/6524 | 11 days, 23:06:57 | 11 days, 23:06:57 |
+| Issues with opening link in a new tab from Essential tab from a different workspace/container | https://github.com/zen-browser/desktop/issues/6523 | 21:19:50 | 10 days, 7:52:33 |
+| pressing any key opens "Find in page..." | https://github.com/zen-browser/desktop/issues/6517 | 2:10:33 | 5:11:26 |
+| reopen closed window | https://github.com/zen-browser/desktop/issues/6516 | 12 days, 3:30:16 | 12 days, 3:30:16 |
+| Links should open in the Default Workspace (and assigned container, if set) instead of the last used one | https://github.com/zen-browser/desktop/issues/6515 | 12 days, 3:52:21 | 12 days, 3:52:21 |
+| Unable to download files from drive.google.com or gmail. | https://github.com/zen-browser/desktop/issues/6514 | 1 day, 10:45:46 | 12 days, 4:36:11 |
+| Code signature changed? | https://github.com/zen-browser/desktop/issues/6513 | 1 day, 16:33:41 | 3 days, 19:57:51 |
+| Closing mini window tab opened from pinned essential goes to new tab | https://github.com/zen-browser/desktop/issues/6510 | 12 days, 7:04:31 | 12 days, 7:04:32 |
+| New Tab -> Back to old tab doesn't work. | https://github.com/zen-browser/desktop/issues/6509 | 12 days, 7:37:46 | 12 days, 7:37:47 |
+| Multiple windows reopen on launch despite disabling "Open previous windows and tabs" | https://github.com/zen-browser/desktop/issues/6508 | 12 days, 8:13:19 | 12 days, 8:13:20 |
+| Canva Verify Payment Window Not Loading | https://github.com/zen-browser/desktop/issues/6506 | 12 days, 14:36:55 | 12 days, 14:36:56 |
+| New zen window / instance is opening by itself | https://github.com/zen-browser/desktop/issues/6504 | 12 days, 18:03:52 | 12 days, 18:03:53 |
+| External programs can't open links (Log in) using zen browser. | https://github.com/zen-browser/desktop/issues/6503 | None | 0:09:07 |
+| Opens first tab after update | https://github.com/zen-browser/desktop/issues/6502 | 0:16:15 | 0:16:15 |
+| Minimize and restore down buttons are not shown in KDE wayland session | https://github.com/zen-browser/desktop/issues/6501 | 12 days, 20:18:10 | 12 days, 20:18:11 |
+| Cannot bind certain keys for shortcuts | https://github.com/zen-browser/desktop/issues/6498 | 18:29:44 | 13 days, 1:18:14 |
+| Back and Forward Buttons Switch Workspace Instead of Page | https://github.com/zen-browser/desktop/issues/6497 | 11:07:22 | 11 days, 8:39:41 |
+| Can't close windows in compact mode (Windows) | https://github.com/zen-browser/desktop/issues/6495 | 13 days, 2:10:59 | 13 days, 2:10:59 |
+| URL bar narrow after compact mode | https://github.com/zen-browser/desktop/issues/6493 | 1 day, 12:31:52 | 13 days, 2:31:24 |
+| Cant rearrange tabs and splitview when in incogito | https://github.com/zen-browser/desktop/issues/6492 | 13 days, 3:15:56 | 13 days, 3:15:56 |
+| Web panels no longer appear when watching a fullscreen video. | https://github.com/zen-browser/desktop/issues/6491 | 13 days, 5:01:16 | 13 days, 5:01:17 |
+| Problem watching DRM content (specifically www.crunchyroll.com content) | https://github.com/zen-browser/desktop/issues/6490 | 11:50:38 | 13 days, 6:05:20 |
+| When using Baidu to search, the search bar appears blank and it is impossible to input text. If you force an input by using the space bar, the web page will return to the previous one. | https://github.com/zen-browser/desktop/issues/6489 | None | 2 days, 2:54:25 |
+| Major contrast/transparency visual background glitch | https://github.com/zen-browser/desktop/issues/6488 | 13 days, 7:25:57 | 13 days, 7:25:58 |
+| Tab page jitter in Split View mode | https://github.com/zen-browser/desktop/issues/6487 | 1 day, 13:01:10 | 13 days, 8:17:37 |
+| "command + shift + C" doesn't work for inspect element | https://github.com/zen-browser/desktop/issues/6485 | 1 day, 14:44:49 | 13 days, 14:53:24 |
+| Top edge of browser scaling on hover | https://github.com/zen-browser/desktop/issues/6484 | 13 days, 15:42:29 | 13 days, 15:42:30 |
+| Black screen, after reopen on Win10, than most tabs missing | https://github.com/zen-browser/desktop/issues/6483 | 13 days, 16:57:29 | 13 days, 16:57:29 |
+| Favicons not displayed for some websites | https://github.com/zen-browser/desktop/issues/6482 | 13 days, 17:29:54 | 13 days, 17:29:55 |
+| Background transparency flickering when OBS is on the background | https://github.com/zen-browser/desktop/issues/6479 | 13 days, 18:50:41 | 13 days, 18:50:42 |
+| Only five web panel icons show | https://github.com/zen-browser/desktop/issues/6478 | 1:04:04 | 1:05:50 |
+| Zen using too much system resources | https://github.com/zen-browser/desktop/issues/6477 | 12:40:56 | 12:40:58 |
+| Caton when playing video full-screen | https://github.com/zen-browser/desktop/issues/6476 | 14 days, 5:46:49 | 14 days, 5:46:49 |
+| Minor bug perhaps, click the current workspaces shortcut breaks scroll limit on tab list. | https://github.com/zen-browser/desktop/issues/6475 | 14 days, 5:55:03 | 14 days, 5:55:04 |
+| Missing icons in pdf viewer interface | https://github.com/zen-browser/desktop/issues/6471 | 8 days, 16:45:52 | 14 days, 8:31:01 |
+| Zen elastic scrolling | https://github.com/zen-browser/desktop/issues/6470 | 8:32:23 | 8:32:30 |
+| Slide Graphics Blinking (PowerPoint) | https://github.com/zen-browser/desktop/issues/6469 | 14 days, 13:37:01 | 14 days, 13:37:02 |
+| Zen ignores policies.json and keeps update popup | https://github.com/zen-browser/desktop/issues/6468 | 14 days, 13:56:24 | 14 days, 13:56:24 |
+| Drag to Split only works for creating new vertical splits | https://github.com/zen-browser/desktop/issues/6463 | 14 days, 21:31:52 | 14 days, 21:31:53 |
+| Scroll bar can't be scrolled from the right edge of the window (Windows) | https://github.com/zen-browser/desktop/issues/6461 | 7:04:49 | 15 days, 0:54:05 |
+| Discord does not play video on zen | https://github.com/zen-browser/desktop/issues/6459 | 22:26:18 | 12 days, 1:57:02 |
+| Close tab buttons slightly cut off when in compact mode (Windows) | https://github.com/zen-browser/desktop/issues/6458 | 6:26:54 | 15 days, 1:11:08 |
+| Screen sharing is not working for calls on teams and google meet after the update | https://github.com/zen-browser/desktop/issues/6457 | 4 days, 18:07:16 | 15 days, 1:12:33 |
+| The scroll is not smooth as on other browser | https://github.com/zen-browser/desktop/issues/6454 | 1:43:43 | 1 day, 1:36:57 |
+| When there are no tabs in the browser, the sidebar gets stuck in the expanded state, blocking the view and not retracting. | https://github.com/zen-browser/desktop/issues/6453 | 1:53:35 | 2:31:06 |
+| New window created when 3rd tab is split on the right | https://github.com/zen-browser/desktop/issues/6451 | None | 1 day, 11:40:57 |
+| Opening links in other apps open a new Zen window with just a blank page | https://github.com/zen-browser/desktop/issues/6450 | 2 days, 0:05:56 | 15 days, 3:37:39 |
+| Bug on pinned tabs | https://github.com/zen-browser/desktop/issues/6447 | 15 days, 5:27:45 | 15 days, 5:27:46 |
+| Tabs randomly mix all over the place when you split | https://github.com/zen-browser/desktop/issues/6446 | 15 days, 6:21:12 | 15 days, 6:21:13 |
+| The Extensions popup while adding new extensions is going out of the screen | https://github.com/zen-browser/desktop/issues/6445 | 4 days, 8:05:02 | 15 days, 6:25:14 |
+| Fullscreen mode shows window border (Linux) | https://github.com/zen-browser/desktop/issues/6443 | 2 days, 4:01:19 | 15 days, 7:41:07 |
+| Split view bug | https://github.com/zen-browser/desktop/issues/6442 | 15 days, 9:37:40 | 15 days, 9:37:40 |
+| Maxed out all 16 cores, 64GB of RAM and 16GB of swap | https://github.com/zen-browser/desktop/issues/6441 | 4:14:00 | 15 days, 9:40:52 |
+| Closing unpinned tabs below an Essential tab leaves the window stuck | https://github.com/zen-browser/desktop/issues/6437 | 7 days, 5:43:28 | 15 days, 12:15:12 |
+| Unexpected bottom border when fullscreen on Windows | https://github.com/zen-browser/desktop/issues/6435 | 4:16:15 | 15 days, 13:47:02 |
+| Right clicking for pasting new link on the address bar selects the current tab's link and overrides it when trying to open new tab through Ctrl+t | https://github.com/zen-browser/desktop/issues/6434 | 8 days, 6:34:51 | 15 days, 16:34:09 |
+| Sidebar UI Problem | https://github.com/zen-browser/desktop/issues/6433 | None | 4 days, 1:48:19 |
+| Zen forgets all tabs when the main browser is closed while Private Browsing is open | https://github.com/zen-browser/desktop/issues/6432 | 7 days, 0:32:05 | 15 days, 16:47:13 |
+| Websites refuse to work | https://github.com/zen-browser/desktop/issues/6431 | 11:01:23 | 15 days, 17:06:27 |
+| Sidebar Dragging Moves Entire Window | https://github.com/zen-browser/desktop/issues/6429 | 1 day, 12:51:50 | 2 days, 4:15:34 |
+| Chatbot support disabled by default | https://github.com/zen-browser/desktop/issues/6428 | 0:39:39 | 15 days, 20:17:43 |
+| Twitch: FrankerFaceZ extenstion | https://github.com/zen-browser/desktop/issues/6426 | 2:14:12 | 22:59:33 |
+| Kagi search page has bad font rendering when using flatpak | https://github.com/zen-browser/desktop/issues/6425 | 8 days, 17:42:46 | 15 days, 22:26:02 |
+| Failing to drag tab for split window when native sidebar is on the right | https://github.com/zen-browser/desktop/issues/6424 | 15 days, 23:02:32 | 15 days, 23:02:33 |
+| Open any url/tab = nothing happens | https://github.com/zen-browser/desktop/issues/6423 | 15 days, 23:23:46 | 15 days, 23:23:47 |
+| I have a problem creating a new tab in the browser. | https://github.com/zen-browser/desktop/issues/6420 | 0:29:25 | 16 days, 0:13:53 |
+| Dark theme menu bar glitched | https://github.com/zen-browser/desktop/issues/6419 | 16 days, 0:20:20 | 16 days, 0:20:20 |
+| New tab opens black page with only search option | https://github.com/zen-browser/desktop/issues/6418 | 1:30:09 | 1 day, 20:19:37 |
+| Black text on dark theme | https://github.com/zen-browser/desktop/issues/6416 | 1 day, 0:41:57 | 16 days, 1:56:48 |
+| Login pop-ups instant crashed. | https://github.com/zen-browser/desktop/issues/6414 | None | 3 days, 11:52:50 |
+| Only last workspace tabs are synced via firefox account | https://github.com/zen-browser/desktop/issues/6413 | 3:29:46 | 16 days, 2:45:09 |
+| Open in split window in split window undefined behaviour | https://github.com/zen-browser/desktop/issues/6412 | 16 days, 2:55:23 | 16 days, 2:55:24 |
+| Sidebar Stucked | https://github.com/zen-browser/desktop/issues/6411 | 16 days, 3:17:38 | 16 days, 3:17:39 |
+| Keyboard shortcuts not working with non-English layouts (e.g., Turkish) | https://github.com/zen-browser/desktop/issues/6410 | 16 days, 3:27:56 | 16 days, 3:27:56 |
+| Chinese input not work in Baidu search engine | https://github.com/zen-browser/desktop/issues/6409 | 4:27:38 | 16 days, 4:36:48 |
+| sidebar/toolbar overlap | https://github.com/zen-browser/desktop/issues/6408 | 13 days, 4:37:38 | 16 days, 4:54:10 |
+| Sidebar on the right | https://github.com/zen-browser/desktop/issues/6406 | 16 days, 5:57:44 | 16 days, 5:57:45 |
+| Floating video player doesn't follow virtual desktops | https://github.com/zen-browser/desktop/issues/6405 | 3 days, 3:21:41 | 16 days, 6:47:00 |
+| Opening an external link when browser is closed have a different behavior than when the browser is opened | https://github.com/zen-browser/desktop/issues/6404 | 16 days, 7:01:57 | 16 days, 7:01:57 |
+| Zen Browser opens on the last used virtual desktop instead of the current one | https://github.com/zen-browser/desktop/issues/6403 | 3 days, 11:14:01 | 16 days, 7:21:44 |
+| Workspace assigned to bookmarks not editable after creation | https://github.com/zen-browser/desktop/issues/6402 | 16 days, 7:27:34 | 16 days, 7:27:34 |
+| Split Tabs not Restored upon Hard Computer Reset | https://github.com/zen-browser/desktop/issues/6401 | 16 days, 7:41:46 | 16 days, 7:41:46 |
+| (Critical) refresh button broken! | https://github.com/zen-browser/desktop/issues/6399 | 16 days, 8:13:05 | 16 days, 8:13:06 |
+| Ai ChatBot unavailable in sidebar | https://github.com/zen-browser/desktop/issues/6398 | 5:17:58 | 1 day, 7:41:37 |
+| Browser slow to load on launch on notebook | https://github.com/zen-browser/desktop/issues/6397 | 16 days, 9:22:29 | 16 days, 9:22:29 |
+| Zen 1.9.1b auto-update from 1.9b breaks MacOS code-signature | https://github.com/zen-browser/desktop/issues/6394 | 5 days, 23:17:44 | 8 days, 4:56:29 |
+| Flexible space bug when placed on either sides of the URL bar in Multiple toolbars in Browser Layout | https://github.com/zen-browser/desktop/issues/6392 | 16 days, 12:08:43 | 16 days, 12:08:43 |
+| Pinned tabs aren't restored properly when multiple windows are open | https://github.com/zen-browser/desktop/issues/6391 | 16:40:17 | 16 days, 12:11:56 |
+| Compact Mode Toggle Shortcut Not Working | https://github.com/zen-browser/desktop/issues/6389 | 15:23:17 | 16 days, 14:30:44 |
+| Split View beyond two tabs fails | https://github.com/zen-browser/desktop/issues/6388 | 16 days, 14:45:49 | 16 days, 14:45:49 |
+| Access Violation (0xc0000005) Crash When Running with SentinelOne EDR Active (Windows ARM64) | https://github.com/zen-browser/desktop/issues/6386 | 16 days, 15:59:44 | 16 days, 15:59:44 |
+| book.ark toolbar and window controls persists when opening folder | https://github.com/zen-browser/desktop/issues/6385 | 16 days, 16:01:37 | 16 days, 16:01:38 |
+| Right click menu to Move tab to other Workspace does not show | https://github.com/zen-browser/desktop/issues/6384 | 0:20:11 | 1 day, 23:55:41 |
+| Windows Window Handling Is Problematic | https://github.com/zen-browser/desktop/issues/6382 | 16 days, 18:50:00 | 16 days, 18:50:01 |
+| Glance opens on magnet links | https://github.com/zen-browser/desktop/issues/6381 | 0:03:28 | 16 days, 19:56:51 |
+| Confirm Closing Feature for Glance does not Work | https://github.com/zen-browser/desktop/issues/6380 | 2:04:46 | 16 days, 19:57:26 |
+| Cant open extensions when no tab open. | https://github.com/zen-browser/desktop/issues/6378 | 12 days, 15:43:18 | 16 days, 20:11:00 |
+| Weird zooming and window placement issues on Windows | https://github.com/zen-browser/desktop/issues/6374 | 16 days, 22:37:04 | 16 days, 22:37:04 |
+| Search Engine Shortcuts Dont work after 1.9b, no mods on | https://github.com/zen-browser/desktop/issues/6373 | 2 days, 16:37:00 | 16 days, 22:41:27 |
+| Dragging Tabs to open Split view only works on the left, when the tabs are on the right | https://github.com/zen-browser/desktop/issues/6372 | None | 9 days, 2:10:52 |
+| misclick caused by tab context menu | https://github.com/zen-browser/desktop/issues/6371 | 16 days, 23:25:28 | 16 days, 23:25:29 |
+| URL Bar only showing up when typing. | https://github.com/zen-browser/desktop/issues/6369 | 1 day, 20:40:08 | 1 day, 23:49:44 |
+| why is it grayed out ? | https://github.com/zen-browser/desktop/issues/6368 | 22:27:41 | 22:28:35 |
+| SuperPins (v1.4.4) not wrapping to new row | https://github.com/zen-browser/desktop/issues/6365 | 0:36:25 | 17 days, 2:47:47 |
+| icons missaligned adress bar | https://github.com/zen-browser/desktop/issues/6364 | None | 1:46:18 |
+| Move selected tab(s) to new window opens a new window while CLOSING the (first) selected tab | https://github.com/zen-browser/desktop/issues/6363 | 1:36:57 | 1 day, 2:54:10 |
+| Japanese font doesn't work | https://github.com/zen-browser/desktop/issues/6362 | 17 days, 5:34:27 | 17 days, 5:34:27 |
+| --zen-sidebar-width not set correctly when opening Zen with compact mode enabled | https://github.com/zen-browser/desktop/issues/6361 | 17 days, 6:23:51 | 17 days, 6:23:52 |
+| Change tab from workspace (with default container) to other workspace loses tab | https://github.com/zen-browser/desktop/issues/6360 | 1 day, 7:46:11 | 15 days, 15:16:51 |
+| Browser gives no visual indication that a browser window is private | https://github.com/zen-browser/desktop/issues/6358 | 14:08:22 | 17 days, 7:14:46 |
+| Windows version eating up too much RAM | https://github.com/zen-browser/desktop/issues/6357 | 1:49:59 | 1 day, 5:24:46 |
+| Zen is being updated by another instance | https://github.com/zen-browser/desktop/issues/6355 | 14 days, 21:48:28 | 17 days, 12:00:20 |
+| Collapsed and Multiple toolbar does not hide completely (1.9b -> 1.10b still) | https://github.com/zen-browser/desktop/issues/6354 | 0:02:49 | 17 days, 12:07:24 |
+| Browser unresponsive after closing large amount of tabs | https://github.com/zen-browser/desktop/issues/6353 | 3 days, 17:13:21 | 17 days, 13:01:01 |
+| url bar icon not aligned center | https://github.com/zen-browser/desktop/issues/6352 | 17:24:58 | 17 days, 13:31:25 |
+| Incorrect user interface in side panel | https://github.com/zen-browser/desktop/issues/6351 | 5 days, 16:07:57 | 17 days, 14:06:04 |
+| Every time opening tabs in Essentials | https://github.com/zen-browser/desktop/issues/6350 | 17 days, 14:18:21 | 17 days, 14:18:21 |
+| Link is ignored if there's no active windows AND if Zen remembers history | https://github.com/zen-browser/desktop/issues/6349 | 0:06:18 | 3 days, 9:53:01 |
+| Dragging window into a new desktop results in blank zen window | https://github.com/zen-browser/desktop/issues/6348 | 0:26:07 | 1 day, 23:33:25 |
+| restoring pinned tabs converts it to blank | https://github.com/zen-browser/desktop/issues/6347 | None | 11 days, 13:47:41 |
+| mica broke again | https://github.com/zen-browser/desktop/issues/6346 | 17 days, 16:46:21 | 17 days, 16:46:21 |
+| Search engine selector gone | https://github.com/zen-browser/desktop/issues/6345 | 4 days, 20:07:21 | 17 days, 17:17:10 |
+| PDF files open to a blank page when Zen is closed | https://github.com/zen-browser/desktop/issues/6343 | 12:43:24 | 17 days, 18:13:02 |
+| Tab peek controls overlap firefox ai chat sidebar | https://github.com/zen-browser/desktop/issues/6342 | 17 days, 18:38:25 | 17 days, 18:38:26 |
+| Cant open a link with left click. | https://github.com/zen-browser/desktop/issues/6341 | 17 days, 18:56:56 | 17 days, 18:56:57 |
+| Distorted UI during first use - fresh install | https://github.com/zen-browser/desktop/issues/6340 | 17 days, 19:04:58 | 17 days, 19:04:59 |
+| Ctrl+Tab fails to switch tabs when dragging a file | https://github.com/zen-browser/desktop/issues/6339 | 17 days, 20:59:02 | 17 days, 20:59:03 |
+| freeze content when scrolling | https://github.com/zen-browser/desktop/issues/6338 | 1 day, 13:52:29 | 17 days, 20:59:52 |
+| Web Panel resets to initial state on tab change | https://github.com/zen-browser/desktop/issues/6336 | 17 days, 23:33:45 | 17 days, 23:33:45 |
+| New tab search bar doesn’t open when address bar suggestions are disabled | https://github.com/zen-browser/desktop/issues/6335 | 18 days, 2:21:42 | 18 days, 2:21:42 |
+| Sidebar gadient breaks | https://github.com/zen-browser/desktop/issues/6333 | 18 days, 3:30:31 | 18 days, 3:30:31 |
+| Show Sidebar is greyed out | https://github.com/zen-browser/desktop/issues/6332 | 7 days, 23:54:34 | 18 days, 3:42:42 |
+| Sidebar overlaps with page content in 'multiple toolbar' mode | https://github.com/zen-browser/desktop/issues/6330 | 18 days, 3:57:58 | 18 days, 3:57:58 |
+| Search shortcuts are missing in URL and Quick search bar | https://github.com/zen-browser/desktop/issues/6329 | 11 days, 11:42:02 | 18 days, 4:42:24 |
+| Tab order disrupted [Bug] | https://github.com/zen-browser/desktop/issues/6328 | None | 7 days, 22:29:09 |
+| Extension data being corrupted? (Bitwarden losing accounts) | https://github.com/zen-browser/desktop/issues/6327 | 18 days, 6:51:22 | 18 days, 6:51:22 |
+| Hovering over tabs now displays an x to close them | https://github.com/zen-browser/desktop/issues/6325 | 0:46:18 | 18 days, 8:15:53 |
+| Cannot split private tabs | https://github.com/zen-browser/desktop/issues/6323 | 0:15:38 | 8 days, 8:41:36 |
+| URL Bar is blocked when typing in it | https://github.com/zen-browser/desktop/issues/6322 | None | 6:17:45 |
+| Bookmark Bar not Minimizing | https://github.com/zen-browser/desktop/issues/6320 | None | 5:08:00 |
+| Buggy behaviour when dragging tab from the bar | https://github.com/zen-browser/desktop/issues/6319 | 0:49:26 | 18 days, 15:48:26 |
+| Bookmarks in Toolbar disappearing when entering fullscreen | https://github.com/zen-browser/desktop/issues/6318 | 1 day, 14:07:49 | 18 days, 16:41:09 |
+| Alt + Clicking a link to open it in glance mode does not work in http pages | https://github.com/zen-browser/desktop/issues/6317 | 18 days, 17:40:56 | 18 days, 17:40:56 |
+| iCloud Passwords extension broken | https://github.com/zen-browser/desktop/issues/6315 | 0:05:10 | 18 days, 19:11:03 |
+| High CPU Usage | https://github.com/zen-browser/desktop/issues/6311 | 2:11:38 | 2:11:38 |
+| Bookmark bad placement | https://github.com/zen-browser/desktop/issues/6310 | 11:00:26 | 1 day, 4:55:26 |
+| Missing top and bottom margins for the URL bar. | https://github.com/zen-browser/desktop/issues/6308 | 1 day, 5:38:11 | 1 day, 5:38:11 |
+| The knob for setting grains in theme setter is not circular | https://github.com/zen-browser/desktop/issues/6307 | 0:02:54 | 18 days, 23:12:49 |
+| zen.workspaces.natural-scroll. workspace gestures animation are the wrong direction | https://github.com/zen-browser/desktop/issues/6305 | 18 days, 23:51:15 | 18 days, 23:51:15 |
+| split screen moves pdfs | https://github.com/zen-browser/desktop/issues/6304 | 0:34:48 | 19 days, 0:38:55 |
+| Why are search box icons positioned differently? | https://github.com/zen-browser/desktop/issues/6303 | 0:34:03 | 1 day, 7:25:16 |
+| Zen does not get scrolling optimizations | https://github.com/zen-browser/desktop/issues/6302 | 4:31:26 | None |
+| Save files do not correctly remember last saving location | https://github.com/zen-browser/desktop/issues/6301 | 19 days, 1:03:38 | 19 days, 1:03:38 |
+| Close tab button tiny and at wrong position since update 1.9b | https://github.com/zen-browser/desktop/issues/6300 | 0:00:43 | 0:00:42 |
+| New tab (ctrl-t) often replaces current tab as if i pressed (ctrl-l) | https://github.com/zen-browser/desktop/issues/6299 | 2:40:29 | 19 days, 3:40:52 |
+| Gradient disappears if the window is unfocused | https://github.com/zen-browser/desktop/issues/6298 | 3:33:50 | 19 days, 3:46:23 |
+| New tab in container | https://github.com/zen-browser/desktop/issues/6296 | 4:14:30 | 4:17:52 |
+| Toolbar Doesn't Collapse When Hovering Over Tab Preview in Compact Mode | https://github.com/zen-browser/desktop/issues/6295 | 19 days, 4:41:23 | 19 days, 4:41:24 |
+| Some website have overlay graphics at the wrong location | https://github.com/zen-browser/desktop/issues/6294 | 4:49:46 | 19 days, 4:48:39 |
+| No way to open the sidebar while in compact mode on touchscreen | https://github.com/zen-browser/desktop/issues/6293 | 19 days, 5:01:49 | 19 days, 5:01:50 |
+| Copying Problem While Watching Something on YouTube | https://github.com/zen-browser/desktop/issues/6291 | 19 days, 5:25:06 | 19 days, 5:25:07 |
+| Zen Browser - Audio Icon Not Visible in "Audio TabIcon Plus" Mode | https://github.com/zen-browser/desktop/issues/6290 | 5:48:29 | 19 days, 5:44:15 |
+| when i start zen after 1.9b update it doesn't show anything except the top bar | https://github.com/zen-browser/desktop/issues/6288 | 7:21:54 | 4 days, 14:26:52 |
+| Expand sidebar button has no priority when shrunk | https://github.com/zen-browser/desktop/issues/6287 | 19 days, 6:36:54 | 19 days, 6:36:55 |
+| Zen stuck on Syncing... on MacOS | https://github.com/zen-browser/desktop/issues/6286 | 19 days, 6:50:36 | 19 days, 6:50:37 |
+| I can’t delete the profile. | https://github.com/zen-browser/desktop/issues/6285 | 2 days, 20:28:06 | 19 days, 7:25:46 |
+| Split tab shortcut not working in split view and other weird behavior | https://github.com/zen-browser/desktop/issues/6284 | 19 days, 7:35:52 | 19 days, 7:35:53 |
+| Split view blocks Zen now | https://github.com/zen-browser/desktop/issues/6280 | 19 days, 10:26:31 | 19 days, 10:26:32 |
+| Video Playback Issues | https://github.com/zen-browser/desktop/issues/6279 | 23:01:38 | 19 days, 10:46:34 |
+| Tab Sidebar opens due to irrelivent command | https://github.com/zen-browser/desktop/issues/6278 | None | 15 days, 6:43:34 |
+| Workspace Selector not working on bookmarks create/edit modal | https://github.com/zen-browser/desktop/issues/6277 | 1 day, 17:07:14 | 7 days, 3:18:48 |
+| Home showing blank page | https://github.com/zen-browser/desktop/issues/6275 | 0:09:49 | 4 days, 20:03:39 |
+| You can no longer split essentials | https://github.com/zen-browser/desktop/issues/6273 | 11:22:32 | 19 days, 16:19:50 |
+| Extensions no longer stay pinned to the toolbar | https://github.com/zen-browser/desktop/issues/6272 | 0:09:02 | 19 days, 17:20:49 |
+| Firefox tracker protection, PiP, and bookmark icons bugged | https://github.com/zen-browser/desktop/issues/6271 | 5:23:54 | 2 days, 0:09:16 |
+| 2FAS Extension problem - abnormal CPU usage in 1.9b - no problems on Firefox | https://github.com/zen-browser/desktop/issues/6270 | 10:04:32 | 19 days, 17:44:32 |
+| Be nice if I didn't have to install it every time I wanted to run it due to some bull sh t 0000000132 error. Pay nothing get nothing I suppose. Nothing ZEN about that. | https://github.com/zen-browser/desktop/issues/6269 | 1:44:24 | 19 days, 17:56:03 |
+| New Window action always creates to default newtab page | https://github.com/zen-browser/desktop/issues/6268 | 3:23:22 | 19 days, 18:32:03 |
+| Can't open new tab by dragging selected text to sidebar | https://github.com/zen-browser/desktop/issues/6267 | None | 23:14:40 |
+| Shortcuts don't work when they conflict with standard character key binds | https://github.com/zen-browser/desktop/issues/6266 | 19 days, 21:18:44 | 19 days, 21:18:44 |
+| All profiles Deleted automatically when using zen , can't restore them with about:profiles also | https://github.com/zen-browser/desktop/issues/6265 | 2:59:57 | 19 days, 21:40:08 |
+| Windows processes / the entire windows unresponsive when using any kind of AI chats on Zen | https://github.com/zen-browser/desktop/issues/6264 | 19 days, 22:04:11 | 19 days, 22:04:11 |
+| New window and tab doesnt work | https://github.com/zen-browser/desktop/issues/6263 | None | 0:12:28 |
+| New window and tab doesnt work | https://github.com/zen-browser/desktop/issues/6262 | None | 0:00:07 |
+| Spotify jumps through music by itself | https://github.com/zen-browser/desktop/issues/6261 | 10 days, 1:21:21 | 20 days, 0:00:17 |
+| refocusing new tab will change to current url instead | https://github.com/zen-browser/desktop/issues/6260 | 12:27:25 | 20 days, 0:08:48 |
+| Split view issue | https://github.com/zen-browser/desktop/issues/6255 | 0:50:33 | 20 days, 2:40:30 |
+| bookmark toolbar not animating out | https://github.com/zen-browser/desktop/issues/6253 | 8:32:28 | 1 day, 12:54:00 |
+| If I pick 3 colors in color picker, I can't set one color on sidebar like before | https://github.com/zen-browser/desktop/issues/6252 | 3:19:01 | 20 days, 3:41:14 |
+| Sub-tabs in Account tab have no text | https://github.com/zen-browser/desktop/issues/6250 | 20 days, 4:11:08 | 20 days, 4:11:09 |
+| Shield and Bookmark icon in searchbar is not aligned properly after new update 1.9b | https://github.com/zen-browser/desktop/issues/6248 | 4:10:26 | 16:34:35 |
+| Bookmarks on the bookmark toolbar duplicates when opening a new window while in fullscreen mode | https://github.com/zen-browser/desktop/issues/6246 | 20 days, 7:00:27 | 20 days, 7:00:27 |
+| Pin Tab Unpins When Using New Splitscreen Feature | https://github.com/zen-browser/desktop/issues/6245 | 9:32:04 | 20 days, 8:07:03 |
+| AppImage (64 bit) on Nobara Linux 41 fails to launch. | https://github.com/zen-browser/desktop/issues/6241 | 3:04:51 | 14:51:45 |
+| Alt+C not working as keybind | https://github.com/zen-browser/desktop/issues/6239 | 13:50:06 | 20 days, 13:12:19 |
+| Empty Split View is shown when dragging a tab out into a new window | https://github.com/zen-browser/desktop/issues/6238 | 1 day, 7:08:21 | 5 days, 9:50:49 |
+| Sidebar stays open when dragging/moving a tab out when using Compact mode | https://github.com/zen-browser/desktop/issues/6237 | 2:05:00 | 20 days, 13:17:36 |
+| Profile switcher button is gone/changed | https://github.com/zen-browser/desktop/issues/6235 | 3:32:55 | 9:09:52 |
+| blank tab (that shows when no tabs are open) is a dark grey instead of the theme colour | https://github.com/zen-browser/desktop/issues/6232 | 1:50:18 | 16:17:08 |
+| Zen ignores system trusted certs when run in flatpak | https://github.com/zen-browser/desktop/issues/6231 | 11 days, 15:50:17 | 20 days, 15:59:42 |
+| Taking a tab out of the window | https://github.com/zen-browser/desktop/issues/6230 | 12:03:30 | 12:03:30 |
+| Tabs not displaying correctly when opening second window | https://github.com/zen-browser/desktop/issues/6229 | 12:28:08 | 12:28:08 |
+| Tab list still scrolls to top sometimes | https://github.com/zen-browser/desktop/issues/6228 | 15 days, 16:02:36 | 20 days, 17:17:25 |
+| New tab opens alongside essentials! [kinda critical] | https://github.com/zen-browser/desktop/issues/6226 | 1 day, 17:57:06 | 20 days, 17:50:03 |
+| Cmd + K behaves strangely | https://github.com/zen-browser/desktop/issues/6225 | None | 12:31:04 |
+| Zen doesnt load default homepage, nor custom one | https://github.com/zen-browser/desktop/issues/6223 | 13 days, 13:41:38 | 20 days, 18:25:02 |
+| url is not centered on linux | https://github.com/zen-browser/desktop/issues/6222 | 8:05:01 | 13:46:11 |
+| Clicking on Links in non-zen applications opens Blank Page | https://github.com/zen-browser/desktop/issues/6221 | 15:46:23 | 17:06:20 |
+| Zen not working properly with PowerToys Run module | https://github.com/zen-browser/desktop/issues/6220 | 9:21:55 | 14:04:26 |
+| Three bugs UI and Functionality Issues in Browser Behavior | https://github.com/zen-browser/desktop/issues/6218 | 20 days, 19:06:04 | 20 days, 19:06:05 |
+| Essentials no longer have a highlight around them | https://github.com/zen-browser/desktop/issues/6217 | 20 days, 19:31:42 | 20 days, 19:31:43 |
+| right sidebar animation | https://github.com/zen-browser/desktop/issues/6216 | None | 14 days, 16:42:31 |
+| Picture in picture icon (URL Bar) | https://github.com/zen-browser/desktop/issues/6214 | 10:04:23 | 15:30:11 |
+| Sidebar glitching out and not showing items / having incorrect offset when switching workspaces in collapsed mode | https://github.com/zen-browser/desktop/issues/6213 | 8 days, 11:36:11 | 8 days, 23:24:08 |
+| Empty browser window from dragged out tab | https://github.com/zen-browser/desktop/issues/6210 | 4:54:45 | 16:18:40 |
+| Zen browser not displaying anything besides the UI | https://github.com/zen-browser/desktop/issues/6209 | 5 days, 13:43:00 | 20 days, 21:04:51 |
+| Home page shortcuts became smaller | https://github.com/zen-browser/desktop/issues/6208 | 6:20:48 | 20 days, 21:12:56 |
+| Icons at the end of the URL bar are misaligned | https://github.com/zen-browser/desktop/issues/6207 | 5:08:25 | 3 days, 4:04:54 |
+| 1.9b: Zen opens as a Blank page | https://github.com/zen-browser/desktop/issues/6205 | 3:41:04 | 20 days, 22:09:55 |
+| "change theme colors" cannot be undone and breaks other theming features | https://github.com/zen-browser/desktop/issues/6202 | 18 days, 0:58:38 | 20 days, 22:13:51 |
+| ISSUE WITH THE FLOATING URL BAR AND THE SIDEBAR | https://github.com/zen-browser/desktop/issues/6201 | 0:43:32 | 20 days, 23:03:13 |
+| "restore previous session" does not work, it opens blank windows without ever restoring the tabs | https://github.com/zen-browser/desktop/issues/6200 | 21:37:27 | 21:37:27 |
+| The appimage install command for Linux stops working in 1.9b version | https://github.com/zen-browser/desktop/issues/6199 | 18:11:44 | 5 days, 4:19:07 |
+| Homepage looks like this in the new version, could you improve it or return it to how it was before? | https://github.com/zen-browser/desktop/issues/6195 | 21 days, 1:14:05 | 21 days, 1:14:06 |
+| Profile switcher not showing in sidebar | https://github.com/zen-browser/desktop/issues/6194 | 0:14:44 | 1:42:41 |
+| position browser notifications are broken | https://github.com/zen-browser/desktop/issues/6192 | 19:51:41 | 20:57:09 |
+| Can't drag scrollbar because it's too small | https://github.com/zen-browser/desktop/issues/6191 | 13:33:59 | 21 days, 1:54:05 |
+| Searcbar not autofocused when zen.urlbar.replace-newtab is set to false | https://github.com/zen-browser/desktop/issues/6189 | 21 days, 2:14:02 | 21 days, 2:14:03 |
+| Need to drag a tab to the left half of the screen in tabs on the right mode | https://github.com/zen-browser/desktop/issues/6183 | 1 day, 18:38:34 | 2 days, 10:35:50 |
+| Closing private tab re-open non-private tab | https://github.com/zen-browser/desktop/issues/6182 | 4:18:20 | 4:51:14 |
+| New Tab Bug After the Update 1.8.1b | https://github.com/zen-browser/desktop/issues/6181 | None | 0:23:37 |
+| Previous profiles not showing in updated profiles tab (1.9b) | https://github.com/zen-browser/desktop/issues/6180 | 20:27:53 | 21 days, 4:01:07 |
+| Left Corners of Viewport not rounded | https://github.com/zen-browser/desktop/issues/6179 | 13:37:46 | 21 days, 4:06:34 |
+| The slider in the homepage settings looks broken | https://github.com/zen-browser/desktop/issues/6178 | 21 days, 4:19:49 | 21 days, 4:19:50 |
+| Dragging tab out to new window broken. | https://github.com/zen-browser/desktop/issues/6177 | 0:03:05 | 23:47:11 |
+| Opening existing tab in the new window kills it | https://github.com/zen-browser/desktop/issues/6176 | 0:03:18 | 23:48:12 |
+| Window Restoring Does not work | https://github.com/zen-browser/desktop/issues/6175 | 1 day, 21:28:01 | 21 days, 4:40:42 |
+| Splitscreen by dragging tabs is flickering when changing the size. | https://github.com/zen-browser/desktop/issues/6173 | 21 days, 5:10:19 | 21 days, 5:10:20 |
+| Top search input | https://github.com/zen-browser/desktop/issues/6172 | 21 days, 5:18:21 | 21 days, 5:18:21 |
+| In a new tab, the search bar appears on the left side of the screen and across the screen. | https://github.com/zen-browser/desktop/issues/6171 | 1:34:32 | 1:34:32 |
+| Tabs sometimes change places suddenly | https://github.com/zen-browser/desktop/issues/6170 | 21 days, 6:20:00 | 21 days, 6:20:00 |
+| In a new tab, the search bar appears on the left side of the screen and across the screen. | https://github.com/zen-browser/desktop/issues/6168 | 1:55:46 | 1:55:46 |
+| Zen browser remains at version 1.8.2b | https://github.com/zen-browser/desktop/issues/6167 | 0:05:28 | 1:57:40 |
+| Opening new tabs with CTRL-Enter to quickfill .com domains opens wrong URL | https://github.com/zen-browser/desktop/issues/6166 | 9 days, 8:44:39 | 21 days, 7:57:03 |
+| Extension→ Cant import Yomitan dictionaries when using Containers | https://github.com/zen-browser/desktop/issues/6164 | 21 days, 11:45:50 | 21 days, 11:45:50 |
+| Compact right tabs has gap | https://github.com/zen-browser/desktop/issues/6163 | 5:20:43 | 21 days, 15:35:02 |
+| Tab bar resizing area is tiny | https://github.com/zen-browser/desktop/issues/6162 | None | 5:44:57 |
+| Pinned Tabs are invisible | https://github.com/zen-browser/desktop/issues/6161 | 0:11:58 | 1:02:43 |
+| Videos wont go fullscreen in split view | https://github.com/zen-browser/desktop/issues/6159 | 21 days, 20:44:47 | 21 days, 20:44:47 |
+| YouTube is slow | https://github.com/zen-browser/desktop/issues/6157 | 1 day, 16:27:54 | 21 days, 21:07:26 |
+| Remapped picture-in-picture shortcut does not work for closing PIP | https://github.com/zen-browser/desktop/issues/6155 | 21 days, 21:18:40 | 21 days, 21:18:41 |
+| Zen mod Cleaned URL bar blur not working outside settings | https://github.com/zen-browser/desktop/issues/6154 | 21 days, 21:23:41 | 21 days, 21:23:42 |
+| Animated Dialog Element Does not Appear In Zen | https://github.com/zen-browser/desktop/issues/6153 | 21 days, 21:40:57 | 21 days, 21:40:57 |
+| When resizing the window, the buttons on the right don't disappear and stay in front of the URL bar. | https://github.com/zen-browser/desktop/issues/6152 | 21 days, 22:50:00 | 21 days, 22:50:01 |
+| Links opened by Thunderbird not recognised | https://github.com/zen-browser/desktop/issues/6150 | 21 days, 23:43:25 | 21 days, 23:43:26 |
+| Low contrast text if lighter background colors are chosen | https://github.com/zen-browser/desktop/issues/6149 | None | 5 days, 0:37:32 |
+| Color picker is not able to pick light colors, there's effectively no "light mode" | https://github.com/zen-browser/desktop/issues/6148 | 1 day, 7:05:26 | 5 days, 0:46:22 |
+| Some essentials missing after moving to a new tab | https://github.com/zen-browser/desktop/issues/6147 | 22 days, 1:10:02 | 22 days, 1:10:03 |
+| UI Config Saving issue with Toolbar | https://github.com/zen-browser/desktop/issues/6146 | 22 days, 1:20:51 | 22 days, 1:20:52 |
+| Unable to login into youtube with google account | https://github.com/zen-browser/desktop/issues/6144 | 1:24:03 | 22 days, 1:55:36 |
+| Close buttons on Mac positioned wrong when sidebar is collapsed | https://github.com/zen-browser/desktop/issues/6143 | 22 days, 1:58:07 | 22 days, 1:58:08 |
+| Video bug when entering a Google meeting | https://github.com/zen-browser/desktop/issues/6142 | 22 days, 2:21:19 | 22 days, 2:21:19 |
+| Theme colors leak into websites | https://github.com/zen-browser/desktop/issues/6141 | 2:13:26 | 22 days, 2:48:29 |
+| Imaginary tab when `zen.urlbar.replace-newtab` set to `false` | https://github.com/zen-browser/desktop/issues/6138 | 4 days, 14:49:34 | 22 days, 3:54:57 |
+| [1.9t] Icon sizing and positioning issues across UI | https://github.com/zen-browser/desktop/issues/6137 | 1 day, 1:23:48 | 11 days, 21:11:06 |
+| Extension icons hang off the side of the sidebar, and extension addition confirmation window hangs off the screen | https://github.com/zen-browser/desktop/issues/6135 | 18 days, 8:19:50 | 22 days, 6:38:20 |
+| Settings show zen-split-view-modifier which is unclear, I think it should be with spaces? | https://github.com/zen-browser/desktop/issues/6134 | 22 days, 7:27:49 | 22 days, 7:27:50 |
+| Grayish White Rounded Corners Visible when fullscreen in a video on youtube | https://github.com/zen-browser/desktop/issues/6132 | 8:50:42 | 22 days, 9:35:57 |
+| Zen Browser local building and running shows firefox only not zen type visual | https://github.com/zen-browser/desktop/issues/6128 | None | 3 days, 10:31:16 |
+| Cannot download files with the flatpak version of Zen | https://github.com/zen-browser/desktop/issues/6127 | 10:53:18 | 22 days, 18:27:20 |
+| File Browser doesnt list user home directory files | https://github.com/zen-browser/desktop/issues/6126 | 22 days, 18:35:54 | 22 days, 18:35:55 |
+| Dragging sidebar moves the window | https://github.com/zen-browser/desktop/issues/6125 | 19:01:23 | 22 days, 19:16:45 |
+| Option to add new tab to the sidebar dissappeared. | https://github.com/zen-browser/desktop/issues/6123 | 22 days, 21:12:43 | 22 days, 21:12:44 |
+| The sidebar shrinks too much when switching to compact mode while floating is enabled | https://github.com/zen-browser/desktop/issues/6122 | 22 days, 21:15:20 | 22 days, 21:15:20 |
+| Unable to define a Ctrl+Alt+Tab keyboard shortcut | https://github.com/zen-browser/desktop/issues/6121 | 22 days, 22:08:26 | 22 days, 22:08:26 |
+| Broken keyboard shortcuts for compact mode | https://github.com/zen-browser/desktop/issues/6120 | 22 days, 22:11:00 | 22 days, 22:11:01 |
+| Confusing case-insensitivity in the keyboard shortcuts configuration page | https://github.com/zen-browser/desktop/issues/6119 | 22 days, 22:20:02 | 22 days, 22:20:03 |
+| Keyboard shortcuts stop working in the keyboard shortcuts configuration page | https://github.com/zen-browser/desktop/issues/6118 | 22 days, 22:28:25 | 22 days, 22:28:26 |
+| "Bookmark this page" and "Show your bookmarks" show the same icon in the tool bar | https://github.com/zen-browser/desktop/issues/6117 | 22 days, 23:37:40 | 22 days, 23:37:41 |
+| cmd+t toolbar partly hidden form the viewport | https://github.com/zen-browser/desktop/issues/6115 | 21:52:58 | 23 days, 4:34:42 |
+| [1.8.2b] Print dialog invisible/does not appear. | https://github.com/zen-browser/desktop/issues/6113 | 6:55:27 | 9:17:48 |
+| Blinking issue when activating window | https://github.com/zen-browser/desktop/issues/6112 | 23 days, 6:09:34 | 23 days, 6:09:35 |
+| Workspace bottom indicator is not updated when scrolling the sidebar while another Zen window is focused | https://github.com/zen-browser/desktop/issues/6111 | 23 days, 6:38:54 | 23 days, 6:38:55 |
+| 'Restore Window' feature not restoring tabs | https://github.com/zen-browser/desktop/issues/6109 | 5 days, 9:13:22 | 23 days, 9:27:14 |
+| Can't open item in history | https://github.com/zen-browser/desktop/issues/6107 | 0:30:19 | 0:30:20 |
+| Opening browser changes tab order | https://github.com/zen-browser/desktop/issues/6106 | 12:05:44 | 23 days, 12:02:25 |
+| Sidebery box position incorrect for autohide | https://github.com/zen-browser/desktop/issues/6105 | 23 days, 14:15:07 | 23 days, 14:15:08 |
+| Tabs on right has an empty margin | https://github.com/zen-browser/desktop/issues/6103 | 23 days, 14:47:19 | 23 days, 14:47:20 |
+| Sidebery Mod page incorrect author | https://github.com/zen-browser/desktop/issues/6102 | 4:41:28 | 4:41:51 |
+| Top toolbar is shown when hovering the top side of the screen in "single toolbar" layout with "compact mode" | https://github.com/zen-browser/desktop/issues/6101 | 21 days, 17:27:45 | 23 days, 16:12:17 |
+| Blank Display when closing all non-pinned and non-essentials tabs | https://github.com/zen-browser/desktop/issues/6100 | 0:32:08 | 0:32:08 |
+| Unable to Move Last Tab to Second Last Position | https://github.com/zen-browser/desktop/issues/6099 | 1 day, 14:33:30 | 5 days, 14:21:59 |
+| New tab bar popup doesn't open when in full screen mode | https://github.com/zen-browser/desktop/issues/6098 | 23 days, 18:38:04 | 23 days, 18:38:05 |
+| research bar not showing text | https://github.com/zen-browser/desktop/issues/6097 | 8:21:53 | 23 days, 18:52:30 |
+| Research obscuring the bar | https://github.com/zen-browser/desktop/issues/6096 | 8:22:31 | 23 days, 18:53:34 |
+| Browser does not render pages even after minutes of being open | https://github.com/zen-browser/desktop/issues/6095 | 23 days, 19:59:56 | 23 days, 19:59:56 |
+| Status bar graphical issue | https://github.com/zen-browser/desktop/issues/6094 | 23 days, 20:00:58 | 23 days, 20:00:59 |
+| Can't scroll when cursor is all the way to the right | https://github.com/zen-browser/desktop/issues/6093 | 0:48:37 | 23 days, 20:47:17 |
+| Browser Freezes and Fails to Open | https://github.com/zen-browser/desktop/issues/6092 | None | 4 days, 16:43:45 |
+| Essential Tabs Are Forgetting the URL | https://github.com/zen-browser/desktop/issues/6090 | 16:29:57 | 17:55:06 |
+| Google Flights date picker slowing the browser | https://github.com/zen-browser/desktop/issues/6089 | 23 days, 22:28:19 | 23 days, 22:28:19 |
+| URL suggestions cover the URL bar while typing in "multiple toolbars" and "collapsed toolbar" modes | https://github.com/zen-browser/desktop/issues/6088 | 23 days, 22:50:14 | 23 days, 22:50:15 |
+| Cross-site cookies being blocked when they are allowed, only appearing with Salesforce | https://github.com/zen-browser/desktop/issues/6087 | 23 days, 22:50:41 | 23 days, 22:50:41 |
+| High Memory usage on windows | https://github.com/zen-browser/desktop/issues/6085 | 4:09:52 | 24 days, 0:01:10 |
+| Browser not properly filling up entire screen | https://github.com/zen-browser/desktop/issues/6084 | 24 days, 0:17:39 | 24 days, 0:17:40 |
+| Cannot Bind Specific Keyboard Shortcuts | https://github.com/zen-browser/desktop/issues/6083 | 24 days, 0:51:36 | 24 days, 0:51:37 |
+| Opening previous windows and tabs on start up | https://github.com/zen-browser/desktop/issues/6080 | 20:13:06 | 24 days, 1:31:18 |
+| YouTube not opening in theater mode | https://github.com/zen-browser/desktop/issues/6078 | 24 days, 1:55:03 | 24 days, 1:55:03 |
+| Cannot Finish Initial Config due to missing Next Button on Color / Accent Chooser | https://github.com/zen-browser/desktop/issues/6076 | 24 days, 2:23:02 | 24 days, 2:23:02 |
+| Unable to fully integrate GTK and QT themes | https://github.com/zen-browser/desktop/issues/6074 | 1 day, 4:58:09 | 24 days, 4:44:34 |
+| can not install any firefox themes | https://github.com/zen-browser/desktop/issues/6073 | 18:28:31 | 18:28:31 |
+| No icon on windows | https://github.com/zen-browser/desktop/issues/6071 | 0:12:31 | 0:23:42 |
+| Twilight Browser: Unexpected Blur Transparency After Update | https://github.com/zen-browser/desktop/issues/6069 | 7:36:42 | 24 days, 11:03:57 |
+| New tabs open as essentials; essentials do not retain order | https://github.com/zen-browser/desktop/issues/6068 | None | 1 day, 15:21:33 |
+| [macOS] Close, minimize, and maximize buttons remain grayed out in active window | https://github.com/zen-browser/desktop/issues/6067 | 2:27:22 | 19:10:27 |
+| [Regression 1.8b+] Tab session extensions cannot record across workspaces anymore | https://github.com/zen-browser/desktop/issues/6066 | 24 days, 15:28:29 | 24 days, 15:28:29 |
+| Address Bar Shifts Slightly When Clicking to Edit | https://github.com/zen-browser/desktop/issues/6065 | 24 days, 16:38:42 | 24 days, 16:38:43 |
+| Drag and Dropping files causes Zen to hang the system literally | https://github.com/zen-browser/desktop/issues/6062 | 24 days, 19:32:45 | 24 days, 19:32:46 |
+| Interfering tabs | https://github.com/zen-browser/desktop/issues/6061 | 16:53:50 | 24 days, 21:13:04 |
+| crashes on startup | https://github.com/zen-browser/desktop/issues/6060 | None | 5:35:50 |
+| Extension icons and buttons are behaving strangely | https://github.com/zen-browser/desktop/issues/6058 | None | 5 days, 2:56:33 |
+| Pink Youtube Filter | https://github.com/zen-browser/desktop/issues/6057 | 0:17:06 | 4 days, 17:58:17 |
+| Essentials & Pinned tabs icons disappear when browser history is cleared | https://github.com/zen-browser/desktop/issues/6056 | 24 days, 23:31:36 | 24 days, 23:31:37 |
+| word processor lag | https://github.com/zen-browser/desktop/issues/6055 | 10:55:49 | 24 days, 23:41:56 |
+| Renamed Tabs Not Detected | https://github.com/zen-browser/desktop/issues/6054 | 2:36:44 | 24 days, 23:42:42 |
+| Browser Freezes When Expanding Toolbar Options Menu in Shrinked Window State | https://github.com/zen-browser/desktop/issues/6052 | 25 days, 1:06:47 | 25 days, 1:06:47 |
+| [Nobara GNOME44] Modal dialog appears almost out of screen | https://github.com/zen-browser/desktop/issues/6051 | 6:11:27 | 8 days, 4:40:40 |
+| Zen doesn't follow KDE Plasma accent colors | https://github.com/zen-browser/desktop/issues/6050 | 25 days, 4:07:30 | 25 days, 4:07:30 |
+| [Twilight] Cannot get Drag and Drop split view to work. | https://github.com/zen-browser/desktop/issues/6049 | None | 8 days, 8:33:12 |
+| Browser lockup when closing tabs on prolonged browser usage | https://github.com/zen-browser/desktop/issues/6048 | 25 days, 4:22:26 | 25 days, 4:22:26 |
+| Sidebar icons off-center | https://github.com/zen-browser/desktop/issues/6047 | 25 days, 4:34:30 | 25 days, 4:34:31 |
+| Muffled headset after using Google Meet never worked again | https://github.com/zen-browser/desktop/issues/6045 | 8:04:31 | 25 days, 4:58:54 |
+| Zen only allows me to save file not open it with anything | https://github.com/zen-browser/desktop/issues/6044 | 25 days, 4:59:47 | 25 days, 4:59:47 |
+| Troubleshoot Mode dialog permanently opening | https://github.com/zen-browser/desktop/issues/6043 | 9 days, 0:26:55 | 25 days, 5:09:25 |
+| Sidebar greyed out + Error with split view | https://github.com/zen-browser/desktop/issues/6041 | 0:46:52 | 25 days, 6:00:03 |
+| Sidebar and toolbar permanently greyed out | https://github.com/zen-browser/desktop/issues/6039 | 8:32:06 | 25 days, 15:50:20 |
+| Audio glitches when playback in resource intensive situations | https://github.com/zen-browser/desktop/issues/6038 | 25 days, 16:36:18 | 25 days, 16:36:19 |
+| Appears unfocused when focused | https://github.com/zen-browser/desktop/issues/6036 | 25 days, 16:50:21 | 25 days, 16:50:22 |
+| Zen browser having blank window before starting ( Have to launch zen two times ) | https://github.com/zen-browser/desktop/issues/6033 | 25 days, 19:11:18 | 25 days, 19:11:19 |
+| 'Ask before closing multiple tabs' feature does not work as intended. | https://github.com/zen-browser/desktop/issues/6032 | 2 days, 9:20:00 | 25 days, 21:20:12 |
+| Can't focus on Tiktok live comments | https://github.com/zen-browser/desktop/issues/6029 | 25 days, 22:11:33 | 25 days, 22:11:34 |
+| can´t see downloads in toolbar | https://github.com/zen-browser/desktop/issues/6028 | 2:33:42 | 25 days, 22:22:07 |
+| New Tab popup does not allow right click context menu (for pasting etc) | https://github.com/zen-browser/desktop/issues/6027 | 25 days, 23:06:49 | 25 days, 23:06:50 |
+| Tab Resizing Bug on macOS on tab split (16" Integrated Display) | https://github.com/zen-browser/desktop/issues/6025 | 26 days, 1:01:54 | 26 days, 1:01:54 |
+| Floating url goes outside of the window | https://github.com/zen-browser/desktop/issues/6024 | 1:04:46 | 5 days, 20:24:46 |
+| Private Window - Focus URL bar when the window is opened | https://github.com/zen-browser/desktop/issues/6023 | 26 days, 2:29:05 | 26 days, 2:29:05 |
+| "grain" UI effect cause scroll lag | https://github.com/zen-browser/desktop/issues/6022 | 26 days, 2:58:31 | 26 days, 2:58:32 |
+| Sidebar buttons are visible on the devtools notification | https://github.com/zen-browser/desktop/issues/6020 | 6 days, 0:38:52 | 26 days, 3:20:13 |
+| Tabs from closed workspace appears in other workspace after reopening Zen | https://github.com/zen-browser/desktop/issues/6019 | 4 days, 4:06:04 | 26 days, 3:24:29 |
+| Bounce not working properly | https://github.com/zen-browser/desktop/issues/6018 | 4 days, 15:57:50 | 6 days, 18:00:59 |
+| [Twilight] Glance not auto opening in external links anymore | https://github.com/zen-browser/desktop/issues/6017 | None | 9 days, 8:55:46 |
+| Toolbar customisation doesn't update until window is moved | https://github.com/zen-browser/desktop/issues/6015 | 9 days, 3:38:13 | 26 days, 5:53:48 |
+| Websocket application not working. | https://github.com/zen-browser/desktop/issues/6014 | None | 1 day, 1:51:42 |
+| Bug when Title bar is turned off | https://github.com/zen-browser/desktop/issues/6013 | 26 days, 6:21:07 | 26 days, 6:21:07 |
+| Zen won't follow my system theme | https://github.com/zen-browser/desktop/issues/6011 | 26 days, 9:23:29 | 26 days, 9:23:30 |
+| Why WidevineCDM is not present if there is posible to include it for free | https://github.com/zen-browser/desktop/issues/6009 | None | 1 day, 3:10:51 |
+| Weird animation with lag in single toolbar | https://github.com/zen-browser/desktop/issues/6007 | 26 days, 11:57:52 | 26 days, 11:57:53 |
+| Zen-specific HotKey to forward workspace (Option + Cmd + E) does not work on MacOS | https://github.com/zen-browser/desktop/issues/6006 | 26 days, 12:26:40 | 26 days, 12:26:41 |
+| minor DRM popup compact mode bug | https://github.com/zen-browser/desktop/issues/6005 | 26 days, 12:55:13 | 26 days, 12:55:13 |
+| Can't skip revamped welcome page | https://github.com/zen-browser/desktop/issues/6004 | 26 days, 13:00:01 | 26 days, 13:00:01 |
+| Improve Chiniese translation | https://github.com/zen-browser/desktop/issues/6003 | 26 days, 13:28:27 | 26 days, 13:28:27 |
+| Restoring Windows and Tab orders. | https://github.com/zen-browser/desktop/issues/6002 | 26 days, 14:11:17 | 26 days, 14:11:17 |
+| Drag & drop images not working in compact mode | https://github.com/zen-browser/desktop/issues/6001 | 26 days, 14:11:20 | 26 days, 14:11:21 |
+| New tab is not a new tab, space bar is weird | https://github.com/zen-browser/desktop/issues/5997 | 12:24:08 | 26 days, 16:41:26 |
+| Bookmarks Menu Toolbar Keyboard Shortcut Opens Library, not List | https://github.com/zen-browser/desktop/issues/5996 | 26 days, 19:20:52 | 26 days, 19:20:53 |
+| Cannot open links in History menu | https://github.com/zen-browser/desktop/issues/5995 | 1:46:38 | 13:52:31 |
+| Gnome keeps asking to make it default browser | https://github.com/zen-browser/desktop/issues/5994 | 1:19:34 | 26 days, 20:28:53 |
+| Toggle floating sidebar shortcut doesn´t work | https://github.com/zen-browser/desktop/issues/5993 | 26 days, 20:30:19 | 26 days, 20:30:20 |
+| Unable to render PDF on Overleaf | https://github.com/zen-browser/desktop/issues/5992 | 26 days, 21:03:38 | 26 days, 21:03:39 |
+| half shown url bar when using compact mode | https://github.com/zen-browser/desktop/issues/5991 | 26 days, 21:20:04 | 26 days, 21:20:04 |
+| new tab floating bar in wrong location on 16:9 ultrawide display | https://github.com/zen-browser/desktop/issues/5990 | 0:20:32 | 26 days, 22:57:02 |
+| Electron has a weird thin white line at the top | https://github.com/zen-browser/desktop/issues/5989 | 26 days, 23:50:00 | 26 days, 23:50:01 |
+| Opens a weird tab after closing all tabs | https://github.com/zen-browser/desktop/issues/5985 | 20:00:45 | 27 days, 1:37:50 |
+| No option to close active "Essential" tabs | https://github.com/zen-browser/desktop/issues/5984 | None | 7:19:02 |
+| Not possible to open links from Bookmark Library Window | https://github.com/zen-browser/desktop/issues/5983 | 1 day, 1:26:26 | 4 days, 21:49:49 |
+| Location icon way too small visually | https://github.com/zen-browser/desktop/issues/5982 | 27 days, 2:18:13 | 27 days, 2:18:14 |
+| History links cannot be clicked/opened | https://github.com/zen-browser/desktop/issues/5975 | 1:28:47 | 1:33:11 |
+| Shows unnecessary scroll bar when maximized | https://github.com/zen-browser/desktop/issues/5974 | 27 days, 5:25:43 | 27 days, 5:25:44 |
+| Missing pinned tabs and big empty space in tab bar | https://github.com/zen-browser/desktop/issues/5973 | 3:37:37 | 27 days, 6:18:53 |
+| Browser switches to blank page instead of wrapping to the first/last tab when tabs switching is done by an add-on | https://github.com/zen-browser/desktop/issues/5970 | 4:23:43 | 13:37:22 |
+| Floating URL bar breaks after clearing browsing history | https://github.com/zen-browser/desktop/issues/5967 | 7:33:33 | 27 days, 15:10:30 |
+| taking its sweet time | https://github.com/zen-browser/desktop/issues/5966 | None | 6 days, 1:48:55 |
+| keyboard shortcut priority | https://github.com/zen-browser/desktop/issues/5963 | 7 days, 20:54:12 | 27 days, 15:42:11 |
+| M365 COPILOT OFFICE | https://github.com/zen-browser/desktop/issues/5962 | 2 days, 15:34:29 | 27 days, 15:43:50 |
+| Tab selection panel is visible as transparent after exiting full-screen while watching media on YouTube, Netflix and more.. | https://github.com/zen-browser/desktop/issues/5959 | 20:40:11 | 22:08:11 |
+| Moving a tab moves it one tab lower than it's supposed to | https://github.com/zen-browser/desktop/issues/5958 | 2 days, 18:28:41 | 27 days, 19:19:20 |
+| Profiles switcher gone | https://github.com/zen-browser/desktop/issues/5957 | 0:03:37 | 0:18:58 |
+| [Twilight] More split group issues | https://github.com/zen-browser/desktop/issues/5955 | 5:30:25 | 5:30:25 |
+| [Twilight] Split View Tabs Can be Removed From Group | https://github.com/zen-browser/desktop/issues/5954 | None | 6:17:14 |
+| ublock functionality is inconsistent in side panel | https://github.com/zen-browser/desktop/issues/5953 | 27 days, 23:14:03 | 27 days, 23:14:04 |
+| Unable to install CA certificate | https://github.com/zen-browser/desktop/issues/5951 | 3:31:20 | 28 days, 1:29:01 |
+| Glance (alt+click) in split tabs | https://github.com/zen-browser/desktop/issues/5950 | 8 days, 10:42:00 | 28 days, 1:32:54 |
+| No such native application org.gnome.chrome_gnome_shell | https://github.com/zen-browser/desktop/issues/5949 | 28 days, 1:33:24 | 28 days, 1:33:24 |
+| Solved / iCloud bookmarks extension won't work | https://github.com/zen-browser/desktop/issues/5948 | None | 0:06:26 |
+| Telemtry and privacy issues with the browser | https://github.com/zen-browser/desktop/issues/5947 | 10:18:42 | 10:27:06 |
+| Scrolling with Pen Tablet Only Works in Pinned Tabs | https://github.com/zen-browser/desktop/issues/5946 | 28 days, 3:05:38 | 28 days, 3:05:38 |
+| Scrolling with Pen Tablet Only Works in Pinned Tabs | https://github.com/zen-browser/desktop/issues/5945 | None | 0:00:59 |
+| Inconsistent Window Dragging | https://github.com/zen-browser/desktop/issues/5944 | 1 day, 10:40:42 | 28 days, 3:10:15 |
+| Inconsistent Window Dragging | https://github.com/zen-browser/desktop/issues/5943 | None | 0:01:24 |
+| Unload Tabs not working for pinned and essentials tabs | https://github.com/zen-browser/desktop/issues/5942 | 28 days, 3:40:31 | 28 days, 3:40:31 |
+| Randomized tabs | https://github.com/zen-browser/desktop/issues/5940 | 0:39:53 | 28 days, 5:15:03 |
+| Certificate Manager | https://github.com/zen-browser/desktop/issues/5936 | None | 2:37:58 |
+| Essential tabs keep getting re-arranged after closing zen | https://github.com/zen-browser/desktop/issues/5935 | None | 0:05:14 |
+| zen.urlbar.replace-newtab & zen.workspaces.open-new-tab-if-last-unpinned-tab-is-closed - Not working as intended in combination | https://github.com/zen-browser/desktop/issues/5933 | 22:25:28 | 28 days, 8:04:42 |
+| Do the new privacy changes to Firefox apply to zen? | https://github.com/zen-browser/desktop/issues/5932 | 2:05:45 | 2:35:47 |
+| security key is not being recognized | https://github.com/zen-browser/desktop/issues/5931 | 0:16:40 | 4:43:16 |
+| I can't watch anything on netflix | https://github.com/zen-browser/desktop/issues/5930 | 0:05:38 | 4:45:35 |
+| External links open in no container | https://github.com/zen-browser/desktop/issues/5929 | 2 days, 2:53:20 | 9 days, 6:53:45 |
+| CTRL + Shift + H (History) Is not working | https://github.com/zen-browser/desktop/issues/5928 | 22:03:13 | 2 days, 3:44:26 |
+| Automatically opens pinned tabs in the background without user action | https://github.com/zen-browser/desktop/issues/5927 | 2 days, 21:08:37 | 28 days, 10:24:22 |
+| Drag and Drop File Causes Browser to Close | https://github.com/zen-browser/desktop/issues/5926 | 25 days, 22:32:51 | 28 days, 10:31:17 |
+| App Takes Longer to Open After Update | https://github.com/zen-browser/desktop/issues/5925 | 28 days, 10:35:41 | 28 days, 10:35:42 |
+| system extensions don't work | https://github.com/zen-browser/desktop/issues/5923 | 28 days, 11:29:06 | 28 days, 11:29:06 |
+| If you pin a tab then try to switch to any other tab, the browser hangs trying to switch tabs. | https://github.com/zen-browser/desktop/issues/5922 | 28 days, 13:43:19 | 28 days, 13:43:19 |
+| DuckDuckGo Fills Suggestions & History | https://github.com/zen-browser/desktop/issues/5921 | 28 days, 13:44:28 | 28 days, 13:44:28 |
+| Restoring window from "Recently Closed Windows" does not work | https://github.com/zen-browser/desktop/issues/5920 | 2 days, 18:33:35 | 28 days, 14:10:13 |
+| [Twilight] Tab groups not persistent through session restart | https://github.com/zen-browser/desktop/issues/5919 | 21:48:30 | 21:48:30 |
+
+_This report was generated with the [Issue Metrics Action](https://github.com/github/issue-metrics)_
+Search query used to find these items: `repo:zen-browser/desktop is:issue created:2025-03-01..2025-03-31`
From 2656f9e641a47b4efa747c857d2ae3c9cf935145 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Sat, 29 Mar 2025 17:40:24 +0100
Subject: [PATCH 052/114] Update bug_report.yml
Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com>
---
.github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index bdc2b6981..81ce7483b 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -22,7 +22,7 @@ body:
- label: I have searched existing issues and avoided creating duplicates.
- label: I am not filing an enhancement request.
- label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
- - label: I have checked that this issue cannot be reproduced once I removed all my Mods and Custom CSS.
+ - label: I have checked that this issue can be reproduced once I removed all my Mods and Custom CSS.
validations:
required: true
- type: textarea
From 0c6fe6f77cd822a76536f9c74f1fdeef433e2703 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 18:26:23 +0100
Subject: [PATCH 053/114] refactor: improve tab group handling and visibility
in split view
---
.../base/content/zen-styles/zen-folders.css | 3 +-
.../base/zen-components/ZenFolders.mjs | 18 +++
.../tabbrowser/content/tabbrowser-js.patch | 125 +++++++++---------
.../tabbrowser/content/tabs-js.patch | 90 +++++++++----
4 files changed, 145 insertions(+), 91 deletions(-)
diff --git a/src/browser/base/content/zen-styles/zen-folders.css b/src/browser/base/content/zen-styles/zen-folders.css
index c3f5aa8a5..761aab182 100644
--- a/src/browser/base/content/zen-styles/zen-folders.css
+++ b/src/browser/base/content/zen-styles/zen-folders.css
@@ -120,8 +120,7 @@ tab-group[split-view-group] .tabbrowser-tab {
}
tab-group[split-view-group] .tab-group-label-container {
- display: none;
- width: 100%;
+ visibility: collapse;
}
tab-group[split-view-group] .tab-close-button {
diff --git a/src/browser/base/zen-components/ZenFolders.mjs b/src/browser/base/zen-components/ZenFolders.mjs
index 976598bef..a4c499854 100644
--- a/src/browser/base/zen-components/ZenFolders.mjs
+++ b/src/browser/base/zen-components/ZenFolders.mjs
@@ -9,6 +9,8 @@
document.addEventListener('TabUngrouped', this.#onTabUngrouped.bind(this));
document.addEventListener('TabGroupRemoved', this.#onTabGroupRemoved.bind(this));
document.addEventListener('TabGroupCreate', this.#onTabGroupCreate.bind(this));
+ document.addEventListener('TabPinned', this.#onTabPinned.bind(this));
+ document.addEventListener('TabUnpinned', this.#onTabUnpinned.bind(this));
}
#onTabGrouped(event) {
@@ -49,6 +51,22 @@
#onTabGroupRemoved(event) {}
+ #onTabPinned(event) {
+ const tab = event.target;
+ const group = tab.group;
+ if (group && group.hasAttribute('split-view-group')) {
+ group.pinned = true;
+ }
+ }
+
+ #onTabUnpinned(event) {
+ const tab = event.target;
+ const group = tab.group;
+ if (group && group.hasAttribute('split-view-group')) {
+ group.pinned = false;
+ }
+ }
+
expandGroupTabs(group) {
for (const tab of group.tabs.reverse()) {
gBrowser.ungroupTab(tab);
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 055a05991..8778f7c8c 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 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035ace83e08 100644
+index 5f406ea5d09273c9b70b84eee24c6267f88692f8..25076e5fdbe5a60cc0f35640652ba8525a55b093 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -424,11 +424,66 @@
+@@ -424,11 +424,67 @@
return this.tabContainer.visibleTabs;
}
@@ -19,17 +19,18 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
+ return i;
+ }
+
-+ get _numVisiblePinTabsWithFolders() {
++ get _numVisiblePinTabsWithoutCollapsed() {
+ let i = 0;
-+ for (let tab of this.tabs) {
-+ if (!tab.pinned && !tab.hasAttribute("zen-glance-tab")) {
-+ break;
++ for (let item of this.tabContainer.ariaFocusableItems) {
++ if (!!item?.classList?.contains("tab-group-label")) {
++ i += 1;
++ continue;
+ }
-+ if (!tab.hidden) {
-+ i += !tab.hasAttribute("zen-glance-tab");
++ if (!item.pinned && !item.hasAttribute("zen-glance-tab")) {
++ break;
+ }
-+ if (tab.group?.tabs[0] == tab) {
-+ i++;
++ if ((!item.group?.hasAttribute("split-view-group") && !item.group?.collapsed) && !item.hidden) {
++ i += !item.hasAttribute("zen-glance-tab");
+ }
+ }
+ return i;
@@ -71,7 +72,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
}
return i;
}
-@@ -558,6 +613,7 @@
+@@ -558,6 +614,7 @@
this.tabpanels.appendChild(panel);
let tab = this.tabs[0];
@@ -79,7 +80,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
tab.linkedPanel = uniqueId;
this._selectedTab = tab;
this._selectedBrowser = browser;
-@@ -823,11 +879,13 @@
+@@ -823,11 +880,13 @@
}
this.showTab(aTab);
@@ -96,7 +97,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
}
aTab.setAttribute("pinned", "true");
-@@ -841,12 +899,15 @@
+@@ -841,12 +900,15 @@
}
if (this.tabContainer.verticalMode) {
@@ -113,7 +114,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
});
} else {
this.moveTabTo(aTab, this.pinnedTabCount - 1, {
-@@ -1029,6 +1090,8 @@
+@@ -1029,6 +1091,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -122,7 +123,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (
aIconURL &&
!aLoadingPrincipal &&
-@@ -1039,6 +1102,9 @@
+@@ -1039,6 +1103,9 @@
);
return;
}
@@ -132,7 +133,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
-@@ -1287,6 +1353,7 @@
+@@ -1287,6 +1354,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@@ -140,7 +141,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1439,6 +1506,9 @@
+@@ -1439,6 +1507,9 @@
}
let activeEl = document.activeElement;
@@ -150,7 +151,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
// If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) {
newTab.focus();
-@@ -1762,7 +1832,7 @@
+@@ -1762,7 +1833,7 @@
}
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -159,7 +160,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
return false;
}
-@@ -1865,7 +1935,7 @@
+@@ -1865,7 +1936,7 @@
newIndex = this.selectedTab._tPos + 1;
}
@@ -168,7 +169,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
let browser;
if (targetTab) {
browser = this.getBrowserForTab(targetTab);
-@@ -2122,6 +2192,7 @@
+@@ -2122,6 +2193,7 @@
uriIsAboutBlank,
userContextId,
skipLoad,
@@ -176,7 +177,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
} = {}) {
let b = document.createXULElement("browser");
// Use the JSM global to create the permanentKey, so that if the
-@@ -2195,8 +2266,7 @@
+@@ -2195,8 +2267,7 @@
// we use a different attribute name for this?
b.setAttribute("name", name);
}
@@ -186,7 +187,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
b.setAttribute("transparent", "true");
}
-@@ -2373,7 +2443,7 @@
+@@ -2373,7 +2444,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@@ -195,7 +196,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
-@@ -2432,8 +2502,8 @@
+@@ -2432,8 +2503,8 @@
// If we transitioned from one browser to two browsers, we need to set
// hasSiblings=false on both the existing browser and the new browser.
if (this.tabs.length == 2) {
@@ -206,7 +207,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
-@@ -2655,6 +2725,7 @@
+@@ -2655,6 +2726,7 @@
schemelessInput,
hasValidUserGestureActivation = false,
textDirectiveUserActivation = false,
@@ -214,7 +215,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
} = {}
) {
// all callers of addTab that pass a params object need to pass
-@@ -2665,6 +2736,12 @@
+@@ -2665,6 +2737,12 @@
);
}
@@ -227,7 +228,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
-@@ -2728,6 +2805,15 @@
+@@ -2728,6 +2806,15 @@
noInitialLabel,
skipBackgroundNotify,
});
@@ -243,7 +244,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (insertTab) {
// insert the tab into the tab container in the correct position
this._insertTabAtIndex(t, {
-@@ -2752,6 +2838,7 @@
+@@ -2752,6 +2839,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -251,7 +252,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
}));
if (focusUrlBar) {
-@@ -2871,6 +2958,9 @@
+@@ -2871,6 +2959,9 @@
}
}
@@ -261,7 +262,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
-@@ -2891,12 +2981,15 @@
+@@ -2891,12 +2982,15 @@
* @param {string} [label=]
* @returns {MozTabbrowserTabGroup}
*/
@@ -278,7 +279,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
return group;
}
-@@ -2937,6 +3030,7 @@
+@@ -2937,6 +3031,7 @@
insertBefore = null,
isUserCreated = false,
telemetryUserCreateSource = "unknown",
@@ -286,7 +287,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
} = {}
) {
if (!tabs?.length) {
-@@ -2951,7 +3045,12 @@
+@@ -2951,7 +3046,12 @@
id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
}
let group = this._createTabGroup(id, color, false, label);
@@ -300,7 +301,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
group,
insertBefore?.group ?? insertBefore
);
-@@ -3268,6 +3367,7 @@
+@@ -3268,6 +3368,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -308,7 +309,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
}
) {
// If we don't have a preferred remote type, and we have a remote
-@@ -3331,6 +3431,7 @@
+@@ -3331,6 +3432,7 @@
openWindowInfo,
name,
skipLoad,
@@ -316,7 +317,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
});
}
-@@ -3509,6 +3610,27 @@
+@@ -3509,6 +3611,27 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@@ -344,7 +345,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
-@@ -3522,6 +3644,7 @@
+@@ -3522,6 +3645,7 @@
restoreTabsLazily && !select && !tabData.pinned;
let url = "about:blank";
@@ -352,7 +353,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (tabData.entries?.length) {
let activeIndex = (tabData.index || tabData.entries.length) - 1;
// Ensure the index is in bounds.
-@@ -3557,7 +3680,27 @@
+@@ -3557,7 +3681,27 @@
skipLoad: true,
preferredRemoteType,
});
@@ -381,7 +382,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (select) {
tabToSelect = tab;
}
-@@ -3570,8 +3713,8 @@
+@@ -3570,8 +3714,8 @@
// inserted in the DOM. If the tab is not yet in the DOM,
// just insert it in the right place from the start.
if (!tab.parentNode) {
@@ -392,7 +393,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
tab.toggleAttribute("pinned", true);
this.tabContainer._invalidateCachedTabs();
// Then ensure all the tab open/pinning information is sent.
-@@ -3581,7 +3724,8 @@
+@@ -3581,7 +3725,8 @@
// needs calling:
shouldUpdateForPinnedTabs = true;
}
@@ -402,7 +403,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group
-@@ -3595,7 +3739,10 @@
+@@ -3595,7 +3740,10 @@
tabGroup.stateData.id,
tabGroup.stateData.color,
tabGroup.stateData.collapsed,
@@ -414,7 +415,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
);
tabsFragment.appendChild(tabGroup.node);
}
-@@ -3646,6 +3793,9 @@
+@@ -3646,6 +3794,9 @@
this.selectedTab = tabToSelect;
this.removeTab(leftoverTab);
}
@@ -424,7 +425,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert();
-@@ -3830,7 +3980,7 @@
+@@ -3830,7 +3981,7 @@
// Ensure we have an index if one was not provided.
if (typeof index != "number") {
// Move the new tab after another tab if needed, to the end otherwise.
@@ -433,7 +434,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (
!bulkOrderedOpen &&
((openerTab &&
-@@ -3876,18 +4026,18 @@
+@@ -3876,18 +4027,18 @@
// Ensure index is within bounds.
if (tab.pinned) {
@@ -456,7 +457,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (tabAfter && tabAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, tabAfter);
-@@ -4199,6 +4349,9 @@
+@@ -4199,6 +4350,9 @@
return;
}
@@ -466,7 +467,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
this.removeTabs(selectedTabs);
}
-@@ -4556,6 +4709,7 @@
+@@ -4556,6 +4710,7 @@
skipSessionStore,
} = {}
) {
@@ -474,7 +475,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.finish("browser.tabs.opening", window);
}
-@@ -4572,6 +4726,12 @@
+@@ -4572,6 +4727,12 @@
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
}
@@ -487,7 +488,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
-@@ -4586,7 +4746,9 @@
+@@ -4586,7 +4747,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -498,7 +499,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
-@@ -4600,7 +4762,6 @@
+@@ -4600,7 +4763,6 @@
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
return;
}
@@ -506,7 +507,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
let lockTabSizing =
!this.tabContainer.verticalMode &&
!aTab.pinned &&
-@@ -4739,14 +4900,14 @@
+@@ -4739,14 +4901,14 @@
!!this.tabsInCollapsedTabGroups.length;
if (
aTab.visible &&
@@ -523,7 +524,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4770,6 +4931,7 @@
+@@ -4770,6 +4932,7 @@
newTab = true;
}
@@ -531,7 +532,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4810,9 +4972,7 @@
+@@ -4810,9 +4973,7 @@
aTab._mouseleave();
if (newTab) {
@@ -542,7 +543,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
} else {
TabBarVisibility.update();
}
-@@ -4941,6 +5101,8 @@
+@@ -4941,6 +5102,8 @@
this.tabs[i]._tPos = i;
}
@@ -551,7 +552,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
-@@ -5159,7 +5321,7 @@
+@@ -5159,7 +5322,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -560,7 +561,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
}
// Try to find a remaining tab that comes after the given tab
-@@ -5181,7 +5343,7 @@
+@@ -5181,7 +5344,7 @@
}
if (tab) {
@@ -569,7 +570,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
}
// If no qualifying visible tab was found, see if there is a tab in
-@@ -5599,10 +5761,10 @@
+@@ -5599,10 +5762,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -582,7 +583,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5838,7 +6000,7 @@
+@@ -5838,7 +6001,7 @@
moveTabTo(aTab, aIndex, { forceStandaloneTab = false } = {}) {
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
@@ -591,7 +592,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
} else {
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
-@@ -5848,10 +6010,17 @@
+@@ -5848,10 +6011,17 @@
this.#handleTabMove(aTab, () => {
let neighbor = this.tabs[aIndex];
@@ -611,13 +612,10 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5901,6 +6070,13 @@
+@@ -5901,13 +6071,22 @@
* Bug 1955388 - prevent pinned tabs from commingling with non-pinned tabs
* when there are hidden tabs present
*/
-+ if (targetElement?.group?.hasAttribute("split-view-group")) {
-+ targetElement = targetElement.group;
-+ }
+ if (tab.group?.hasAttribute("split-view-group")) {
+ tab = tab.group;
+ }
@@ -625,9 +623,12 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..52e9414c9b6606510538a9f565cb0035
if (tab.pinned && !targetElement?.pinned) {
// prevent pinned tab from being dragged past a non-pinned tab
targetElement = this.tabs[this.pinnedTabCount - 1];
-@@ -5908,6 +6084,9 @@
+ moveBefore = false;
}
-
+-
++ if (targetElement?.group?.hasAttribute("split-view-group")) {
++ targetElement = targetElement.group;
++ }
let getContainer = () => {
+ if (tab.hasAttribute("zen-essential")) {
+ return document.getElementById("zen-essentials-container");
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index a018abc45..a3634fb2b 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb83c74c10 100644
+index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..40593b305688d24a0b702714a91af551c7f833f9 100644
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
@@ -93,7 +93,7 @@
@@ -75,7 +75,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb
- let tabs = this.ariaFocusableItems.slice(
- isPinned ? 0 : numPinned,
- isPinned ? numPinned : undefined
-+ let numPinned = gBrowser._numVisiblePinTabsWithFolders;
++ let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
+ let essential = draggedTab.hasAttribute("zen-essential");
+ let tabs = this.ariaFocusableItems.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
+ isPinned ? (essential ? 0 : gBrowser._numZenVisibleEssentials) : numPinned,
@@ -195,7 +195,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb
}
return this.#visibleTabs;
}
-@@ -1601,16 +1641,11 @@
+@@ -1601,23 +1641,18 @@
}
let elementIndex = 0;
@@ -215,6 +215,14 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb
if (isTab(child) && child.visible) {
child.elementIndex = elementIndex++;
focusableItems.push(child);
+ } else if (isTabGroup(child)) {
+ child.labelElement.elementIndex = elementIndex++;
+ focusableItems.push(child.labelElement);
+- if (!child.collapsed) {
++ if (!child.collapsed && !child.hasAttribute("split-view-group")) {
+ let visibleTabsInGroup = child.tabs.filter(tab => tab.visible);
+ visibleTabsInGroup.forEach(tab => {
+ tab.elementIndex = elementIndex++;
@@ -1627,10 +1662,7 @@
}
}
@@ -385,7 +393,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb
let shiftSizeX = tabWidth * movingTabs.length;
let shiftSizeY = tabHeight;
dragData.tabWidth = tabWidth;
-@@ -2296,10 +2328,11 @@
+@@ -2296,11 +2328,15 @@
this.#clearDragOverCreateGroupTimer();
let isPinned = draggedTab.pinned;
@@ -393,28 +401,32 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb
- let tabs = this.ariaFocusableItems.slice(
- isPinned ? 0 : numPinned,
- isPinned ? numPinned : undefined
-+ let numPinned = gBrowser._numVisiblePinTabsWithFolders;
++ let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
+ let essential = draggedTab.hasAttribute("zen-essential");
+ let tabs = this.ariaFocusableItems.filter(tab => !tab.hasAttribute("zen-glance-tab")).slice(
+ isPinned ? (essential ? 0 : gBrowser._numZenVisibleEssentials) : numPinned,
+ isPinned ? (essential ? gBrowser._numZenVisibleEssentials : numPinned) : undefined
);
++ if (draggedTab.group?.hasAttribute("split-view-group")) {
++ draggedTab = draggedTab.group.labelElement;
++ }
if (this.#rtlMode) {
-@@ -2325,6 +2358,12 @@
-
- // Move the dragged tab based on the mouse position.
- let firstTab = tabs[0];
-+ if (isTabGroupLabel(firstTab)) {
-+ const group = firstTab.closest("tab-group");
-+ if (group?.hasAttribute("split-view-group")) {
-+ firstTab = group;
-+ }
-+ }
+ tabs.reverse();
+@@ -2328,6 +2364,12 @@
let lastTab = tabs.at(-1);
let lastMovingTab = movingTabs.at(-1);
let firstMovingTab = movingTabs[0];
-@@ -2348,7 +2387,11 @@
++ if (lastMovingTab.group?.hasAttribute("split-view-group")) {
++ lastMovingTab = lastMovingTab.group;
++ }
++ if (firstMovingTab.group?.hasAttribute("split-view-group")) {
++ firstMovingTab = firstMovingTab.group;
++ }
+ let endEdge = ele => ele[screenAxis] + bounds(ele)[size];
+ let lastMovingTabScreen = endEdge(lastMovingTab);
+ let firstMovingTabScreen = firstMovingTab[screenAxis];
+@@ -2348,7 +2390,11 @@
translate = Math.min(Math.max(translate, firstBound), lastBound);
for (let tab of movingTabs) {
@@ -427,27 +439,42 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb
}
dragData.translatePos = translate;
-@@ -2507,6 +2550,10 @@
+@@ -2379,7 +2425,7 @@
+ let getTabShift = (item, dropElementIndex) => {
+ if (
+ item.elementIndex < draggedTab.elementIndex &&
+- item.elementIndex >= dropElementIndex
++ item.elementIndex + !!item.closest("tab-group")?.hasAttribute("split-view-group") >= dropElementIndex
+ ) {
+ return this.#rtlMode ? -shiftSize : shiftSize;
+ }
+@@ -2507,6 +2553,10 @@
if (!dropElement) {
dropElement = this.ariaFocusableItems[oldDropElementIndex];
}
+ if (dropElement?.group?.hasAttribute("split-view-group")) {
+ // We focus the group label element, not the group itself.
-+ dropElement = dropElement.group.querySelector(".tab-group-label");
++ dropElement = dropElement.group.labelElement;
+ }
let newDropElementIndex = dropElement
? dropElement.elementIndex
: oldDropElementIndex;
-@@ -2566,7 +2613,7 @@
+@@ -2566,12 +2616,12 @@
}
}
- if (gBrowser._tabGroupsEnabled && !isPinned) {
-+ if (false) {
++ if (true) {
let dragOverGroupingThreshold = 1 - moveOverThreshold;
// When dragging tab(s) over an ungrouped tab, signal to the user
-@@ -2639,7 +2686,7 @@
+ // that dropping the tab(s) will create a new tab group.
+- shouldCreateGroupOnDrop =
++ shouldCreateGroupOnDrop = false &&
+ dropElement != draggedTab &&
+ isTab(dropElement) &&
+ !dropElement?.group &&
+@@ -2639,7 +2689,7 @@
// Shift background tabs to leave a gap where the dragged tab
// would currently be dropped.
for (let item of tabs) {
@@ -456,9 +483,13 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb
continue;
}
-@@ -2649,7 +2696,11 @@
+@@ -2648,8 +2698,15 @@
+ if (isTabGroupLabel(item)) {
// Shift the `.tab-group-label-container` to shift the label element.
item = item.parentElement;
++ if (item.parentElement?.hasAttribute("split-view-group")) {
++ item = item.parentElement;
++ }
}
+ if (item.group?.hasAttribute("split-view-group")) {
+ item.group.style.transform = transform;
@@ -468,7 +499,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb
}
}
-@@ -2697,8 +2748,9 @@
+@@ -2697,8 +2754,9 @@
);
}
@@ -480,15 +511,20 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb
return;
}
-@@ -2711,6 +2763,7 @@
+@@ -2711,6 +2769,12 @@
item = item.parentElement;
}
item.style.transform = "";
-+ if (item.group?.hasAttribute("split-view-group")) item.group.style.transform = "";
++ if (item.closest("tab-group")?.hasAttribute("split-view-group")) item.closest("tab-group").style.transform = "";
++ if (item.closest("tab-group")?.hasAttribute("split-view-group")) {
++ for (let tab of item.closest("tab-group").tabs) {
++ tab.style.transform = "";
++ }
++ }
item.removeAttribute("dragover-createGroup");
}
this.removeAttribute("movingtab-createGroup");
-@@ -2754,7 +2807,7 @@
+@@ -2754,7 +2818,7 @@
let postTransitionCleanup = () => {
movingTab._moveTogetherSelectedTabsData.animate = false;
};
@@ -497,7 +533,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0f809f610f78f672716b9af66ddf3cfb
postTransitionCleanup();
} else {
let onTransitionEnd = transitionendEvent => {
-@@ -2924,7 +2977,7 @@
+@@ -2924,7 +2988,7 @@
}
_notifyBackgroundTab(aTab) {
From 00d8f60a02b501865dcbda716e030ef443948c36 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 20:39:42 +0100
Subject: [PATCH 054/114] Small fixes to split view groups
---
.../base/zen-components/ZenViewSplitter.mjs | 7 ++++
.../tabbrowser/content/tabbrowser-js.patch | 4 +--
.../tabbrowser/content/tabs-js.patch | 34 +++++++++++--------
3 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index 66f9862e7..de1f4d118 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -225,6 +225,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
this._hasAnimated = true;
for (const tab of gBrowser.tabs) {
tab.style.removeProperty('transform');
+ if (tab.group) {
+ tab.group.style.removeProperty('transform');
+ }
}
// Add a min width to all the browser elements to prevent them from resizing
for (const browser of gBrowser.browsers) {
@@ -998,6 +1001,10 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
}
}
+
+ if (this._sessionRestoring) {
+ return;
+ }
this.activateSplitView(splitData);
}
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 8778f7c8c..c00eedd9a 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 5f406ea5d09273c9b70b84eee24c6267f88692f8..25076e5fdbe5a60cc0f35640652ba8525a55b093 100644
+index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc885cb760 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -424,11 +424,67 @@
@@ -22,7 +22,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..25076e5fdbe5a60cc0f35640652ba852
+ get _numVisiblePinTabsWithoutCollapsed() {
+ let i = 0;
+ for (let item of this.tabContainer.ariaFocusableItems) {
-+ if (!!item?.classList?.contains("tab-group-label")) {
++ if (!!item?.classList?.contains("tab-group-label") && item.closest("tab-group").pinned) {
+ i += 1;
+ continue;
+ }
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index a3634fb2b..7c716a423 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..40593b305688d24a0b702714a91af551c7f833f9 100644
+index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..bf956639f7d17d6d652f3b2d6cb174904b5b5da9 100644
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
@@ -93,7 +93,7 @@
@@ -448,7 +448,17 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..40593b305688d24a0b702714a91af551
) {
return this.#rtlMode ? -shiftSize : shiftSize;
}
-@@ -2507,6 +2553,10 @@
+@@ -2485,6 +2531,9 @@
+ break;
+ }
+ let element = tabs[mid];
++ if (element?.group?.hasAttribute("split-view-group")) {
++ element = element.group.labelElement;
++ }
+ let elementForSize = isTabGroupLabel(element)
+ ? element.parentElement
+ : element;
+@@ -2507,6 +2556,10 @@
if (!dropElement) {
dropElement = this.ariaFocusableItems[oldDropElementIndex];
}
@@ -459,7 +469,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..40593b305688d24a0b702714a91af551
let newDropElementIndex = dropElement
? dropElement.elementIndex
: oldDropElementIndex;
-@@ -2566,12 +2616,12 @@
+@@ -2566,12 +2619,12 @@
}
}
@@ -474,7 +484,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..40593b305688d24a0b702714a91af551
dropElement != draggedTab &&
isTab(dropElement) &&
!dropElement?.group &&
-@@ -2639,7 +2689,7 @@
+@@ -2639,7 +2692,7 @@
// Shift background tabs to leave a gap where the dragged tab
// would currently be dropped.
for (let item of tabs) {
@@ -483,7 +493,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..40593b305688d24a0b702714a91af551
continue;
}
-@@ -2648,8 +2698,15 @@
+@@ -2648,6 +2701,9 @@
if (isTabGroupLabel(item)) {
// Shift the `.tab-group-label-container` to shift the label element.
item = item.parentElement;
@@ -491,15 +501,9 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..40593b305688d24a0b702714a91af551
+ item = item.parentElement;
+ }
}
-+ if (item.group?.hasAttribute("split-view-group")) {
-+ item.group.style.transform = transform;
-+ } else {
item.style.transform = transform;
-+ }
}
- }
-
-@@ -2697,8 +2754,9 @@
+@@ -2697,8 +2753,9 @@
);
}
@@ -511,7 +515,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..40593b305688d24a0b702714a91af551
return;
}
-@@ -2711,6 +2769,12 @@
+@@ -2711,6 +2768,12 @@
item = item.parentElement;
}
item.style.transform = "";
@@ -524,7 +528,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..40593b305688d24a0b702714a91af551
item.removeAttribute("dragover-createGroup");
}
this.removeAttribute("movingtab-createGroup");
-@@ -2754,7 +2818,7 @@
+@@ -2754,7 +2817,7 @@
let postTransitionCleanup = () => {
movingTab._moveTogetherSelectedTabsData.animate = false;
};
@@ -533,7 +537,7 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..40593b305688d24a0b702714a91af551
postTransitionCleanup();
} else {
let onTransitionEnd = transitionendEvent => {
-@@ -2924,7 +2988,7 @@
+@@ -2924,7 +2987,7 @@
}
_notifyBackgroundTab(aTab) {
From 00d9b0ad5528e829f41efa040854c2f007c74cda Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 20:40:48 +0100
Subject: [PATCH 055/114] Fixed split tab group favicon missaligned (closes
https://github.com/zen-browser/desktop/issues/6962)
---
src/browser/base/content/zen-styles/zen-folders.css | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/browser/base/content/zen-styles/zen-folders.css b/src/browser/base/content/zen-styles/zen-folders.css
index 761aab182..22c7c13fc 100644
--- a/src/browser/base/content/zen-styles/zen-folders.css
+++ b/src/browser/base/content/zen-styles/zen-folders.css
@@ -61,7 +61,9 @@ tab-group[split-view-group] {
& .tab-content {
min-width: 0;
- justify-content: unset !important;
+ :root[zen-sidebar-expanded='true'] & {
+ justify-content: unset !important;
+ }
}
}
From 35107c20cb51e98dcb6cdbf870d5b39862399044 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 20:41:03 +0100
Subject: [PATCH 056/114] Format project before review
---
src/browser/base/zen-components/ZenViewSplitter.mjs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index de1f4d118..5a1aa091f 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -1771,7 +1771,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
onAfterWorkspaceSessionRestore() {
- if (this.currentView >= 0 && !gBrowser.selectedTab.pinned) {
+ if (this.currentView >= 0 && !gBrowser.selectedTab.pinned) {
// Activate all browsers in the split view
this.currentView = -1;
this.onLocationChange(gBrowser.selectedTab.linkedBrowser);
From 60e96a73eb73792bb59c96690ff29f1c88343eee Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 20:41:50 +0100
Subject: [PATCH 057/114] fix: log errors in zenUpdateLayoutBreakout for better
debugging
---
src/browser/base/content/ZenUIManager.mjs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 637aac71b..6454fcd47 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -644,7 +644,9 @@ var gZenVerticalTabsManager = {
} else {
try {
gURLBar.zenUpdateLayoutBreakout();
- } catch (e) {}
+ } catch (e) {
+ console.error(e);
+ }
}
// Always move the splitter next to the sidebar
From a78f8586f41ed49fe9683176baf881645fb838e2 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Sat, 29 Mar 2025 20:45:44 +0100
Subject: [PATCH 058/114] Update src/browser/base/content/ZenUIManager.mjs
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com>
---
src/browser/base/content/ZenUIManager.mjs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 6454fcd47..b1283fad6 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -65,7 +65,11 @@ var gZenUIManager = {
tabs.style.removeProperty('flex');
tabs.style.maxHeight = height + 'px';
gZenVerticalTabsManager.actualWindowButtons.removeAttribute('zen-has-hover');
- gURLBar.zenUpdateLayoutBreakout();
+ try {
+ gURLBar.zenUpdateLayoutBreakout();
+ } catch (error) {
+ console.error('Error updating layout breakout:', error);
+ }
},
get tabsWrapper() {
From 923b049b857c0b8e3e735514deb87a73815cbced Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Sat, 29 Mar 2025 21:23:55 +0100
Subject: [PATCH 059/114] Fixed path for updating l10n hashes
Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com>
---
scripts/update_ff.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/update_ff.py b/scripts/update_ff.py
index f8e5bc7ec..0acb6e9e0 100644
--- a/scripts/update_ff.py
+++ b/scripts/update_ff.py
@@ -61,7 +61,7 @@ def update_l10n_last_commit_hash():
L10N_REPO = "https://github.com/mozilla-l10n/firefox-l10n"
try:
os.system(f"git clone {L10N_REPO} l10n-temp --depth 1")
- if not os.path.exists("firefox-cache"):
+ if not os.path.exists("build/firefox-cache"):
os.mkdir("build/firefox-cache")
os.system("cat l10n-temp/.git/refs/heads/main > build/firefox-cache/l10n-last-commit-hash")
# Remove new line character
From 7b18c407812e644e729e87ea5eed67abea870404 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Sat, 29 Mar 2025 21:24:17 +0100
Subject: [PATCH 060/114] Fixed fetching l10n from mozilla
Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com>
---
scripts/download-language-packs.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/download-language-packs.sh b/scripts/download-language-packs.sh
index 4363c6f21..2c4b929d2 100644
--- a/scripts/download-language-packs.sh
+++ b/scripts/download-language-packs.sh
@@ -7,7 +7,7 @@ git config --global fetch.prune true
cd $CURRENT_DIR
-LAST_FIREFOX_L10N_COMMIT=$(cat ./firefox-cache/l10n-last-commit-hash)
+LAST_FIREFOX_L10N_COMMIT=$(cat ./build/firefox-cache/l10n-last-commit-hash)
cd ./l10n
rm -rf firefox-l10n
From 7dc45bb438afb2d3cff12c33d15f27707d7feb0c Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 29 Mar 2025 23:40:37 +0100
Subject: [PATCH 061/114] Update Rust toolchain version in CI workflows and add
.rust-toolchain file
---
.github/workflows/linux-release-build.yml | 2 +-
.github/workflows/macos-release-build.yml | 2 +-
.github/workflows/windows-release-build.yml | 4 ++--
.rust-toolchain | 1 +
l10n | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
create mode 100644 .rust-toolchain
diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index 6de6c58d6..a56a81d7d 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -91,7 +91,7 @@ jobs:
- name: Fix Rust version
run: |
# Install a rust version compatible with LLVM 18
- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
source $HOME/.cargo/env
if test "${{ matrix.arch }}" = "aarch64"; then
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index 13c9b0d13..838c9a3e0 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -82,7 +82,7 @@ jobs:
brew install watchman
- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.79
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
source $HOME/.cargo/env
if test "${{ matrix.arch }}" = "aarch64"; then
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 602e397a4..5cf531269 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -176,14 +176,14 @@ jobs:
- name: Setup Rust
if: ${{ !(inputs.generate-gpo && matrix.arch == 'aarch64') }}
run: |
- cd engine/
- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.81
+ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain $(cat .rust-toolchain)
source $HOME/.cargo/env
if test "${{ matrix.arch }}" = "aarch64"; then
rustup target add aarch64-pc-windows-msvc
else
rustup target add x86_64-pc-windows-msvc
fi
+ cd engine/
cargo install cargo-download --locked
cargo download -x windows=0.58.0
export CARGO_INCREMENTAL=0
diff --git a/.rust-toolchain b/.rust-toolchain
new file mode 100644
index 000000000..a92432a8a
--- /dev/null
+++ b/.rust-toolchain
@@ -0,0 +1 @@
+1.82
diff --git a/l10n b/l10n
index 778cb128c..4094426d2 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit 778cb128c659c7b8f57080e99fbc04f8d93c30a2
+Subproject commit 4094426d24cf3e131b5a07775478ed893112e9da
From 2408524660fef7b7f81d84a363689af10fa2e206 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 30 Mar 2025 00:02:24 +0100
Subject: [PATCH 062/114] Refactor CSS and JavaScript for Zen Glance feature to
improve style management and enhance tab handling
---
.../base/content/zen-styles/zen-decks.css | 9 ++++++++-
.../base/zen-components/ZenGlanceManager.mjs | 16 ++++++++++++----
.../base/zen-components/ZenViewSplitter.mjs | 7 ++++++-
3 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/browser/base/content/zen-styles/zen-decks.css b/src/browser/base/content/zen-styles/zen-decks.css
index fb8969930..c92fa6216 100644
--- a/src/browser/base/content/zen-styles/zen-decks.css
+++ b/src/browser/base/content/zen-styles/zen-decks.css
@@ -44,7 +44,14 @@
}
#tabbrowser-tabpanels[zen-split-view='true'] .browserSidebarContainer.deck-selected {
- outline: 1px solid var(--zen-primary-color) !important;
+ &:not(.zen-glance-overlay) {
+ outline: 1px solid var(--zen-primary-color) !important;
+ }
+
+ &.zen-glance-overlay {
+ flex: 1;
+ margin-top: calc(var(--zen-element-separation) / 2);
+ }
}
#tabbrowser-tabbox:has(#tabbrowser-tabpanels[zen-split-view='true']) {
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index f6865c5dd..80947e1a8 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -206,6 +206,14 @@
});
}
+ _clearContainerStyles(container) {
+ const inset = container.style.inset;
+ window.requestAnimationFrame(() => {
+ container.removeAttribute('style');
+ container.style.inset = inset;
+ });
+ }
+
closeGlance({ noAnimation = false, onTabClose = false, setNewID = null, isDifferent = false, hasFocused = false } = {}) {
if (this._animating || !this.#currentBrowser || this.animatingOpen || this._duringOpening) {
return;
@@ -228,7 +236,7 @@
this.browserWrapper.removeAttribute('has-finished-animation');
if (noAnimation) {
- this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').removeAttribute('style');
+ this._clearContainerStyles(this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'));
this.quickCloseGlance({ closeCurrentTab: false });
return;
}
@@ -270,7 +278,7 @@
}
)
.then(() => {
- this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').removeAttribute('style');
+ this._clearContainerStyles(this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer'));
});
this.browserWrapper.style.opacity = 1;
gZenUIManager.motion
@@ -510,7 +518,7 @@
ZenWorkspaces.updateTabsContainers();
this.browserWrapper.removeAttribute('animate-full');
this.overlay.classList.remove('zen-glance-overlay');
- this.browserWrapper.removeAttribute('style');
+ this._clearContainerStyles(this.browserWrapper);
this.animatingFullOpen = false;
this.closeGlance({ noAnimation: true });
this.#glances.delete(this.#currentGlanceID);
@@ -522,7 +530,7 @@
index: this.getTabPosition(this.#currentTab),
});
- this.browserWrapper.removeAttribute('style');
+ this._clearContainerStyles(this.browserWrapper);
this.browserWrapper.removeAttribute('has-finished-animation');
this.browserWrapper.setAttribute('animate-full', true);
this.#currentTab.removeAttribute('zen-glance-tab');
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index 5a1aa091f..dd6634747 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -914,7 +914,12 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
*/
async onLocationChange(browser) {
this.disableTabRearrangeView();
- const tab = window.gBrowser.getTabForBrowser(browser);
+ let tab = window.gBrowser.getTabForBrowser(browser);
+ if (tab.hasAttribute('zen-glance-tab')) {
+ // Extract from parent node so we are not selecting the wrong (current) tab
+ tab = tab.parentNode.closest('.tabbrowser-tab');
+ console.assert(tab, 'Tab not found for zen-glance-tab');
+ }
this.updateSplitViewButton(!tab?.splitView);
if (tab) {
this.updateSplitView(tab);
From 7bec1c20258cb51855726563c46d8f52e16578a8 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 30 Mar 2025 00:29:42 +0100
Subject: [PATCH 063/114] Enhance tab drag-and-drop functionality by adjusting
move threshold and refining group drop logic
---
src/browser/app/profile/zen-browser.js | 1 +
.../tabbrowser/content/tabs-js.patch | 20 +++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index 02ddbc0ae..dd2df31dd 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -61,6 +61,7 @@ pref("alerts.showFavicons", true);
// Toolbars
pref("browser.tabs.closeWindowWithLastTab", false);
pref("browser.tabs.loadBookmarksInTabs", false);
+pref("browser.tabs.dragdrop.moveOverThresholdPercent", 50);
pref('browser.toolbars.bookmarks.visibility', 'never');
pref("browser.bookmarks.openInTabClosesMenu", false);
pref("browser.menu.showViewImageInfo", true);
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 7c716a423..7418cf6fc 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..bf956639f7d17d6d652f3b2d6cb174904b5b5da9 100644
+index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..99a84a1cae6c18f3a80b7490dfc61712b38f6909 100644
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
@@ -93,7 +93,7 @@
@@ -439,15 +439,6 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..bf956639f7d17d6d652f3b2d6cb17490
}
dragData.translatePos = translate;
-@@ -2379,7 +2425,7 @@
- let getTabShift = (item, dropElementIndex) => {
- if (
- item.elementIndex < draggedTab.elementIndex &&
-- item.elementIndex >= dropElementIndex
-+ item.elementIndex + !!item.closest("tab-group")?.hasAttribute("split-view-group") >= dropElementIndex
- ) {
- return this.#rtlMode ? -shiftSize : shiftSize;
- }
@@ -2485,6 +2531,9 @@
break;
}
@@ -469,6 +460,15 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..bf956639f7d17d6d652f3b2d6cb17490
let newDropElementIndex = dropElement
? dropElement.elementIndex
: oldDropElementIndex;
+@@ -2515,7 +2568,7 @@
+ let shouldCreateGroupOnDrop;
+ let dropBefore;
+ if (dropElement) {
+- let dropElementForOverlap = isTabGroupLabel(dropElement)
++ let dropElementForOverlap = isTabGroupLabel(dropElement) && !dropElement.closest("tab-group")?.hasAttribute("split-view-group")
+ ? dropElement.parentElement
+ : dropElement;
+
@@ -2566,12 +2619,12 @@
}
}
From eb8f8ee1da17e6491f3954db8725b4c19fe30c15 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Sun, 30 Mar 2025 09:37:39 +0700
Subject: [PATCH 064/114] fix: prevent attaching ID to empty tab in extension
TabTracker
---
.../extensions/parent/ext-browser-js.patch | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/browser/components/extensions/parent/ext-browser-js.patch b/src/browser/components/extensions/parent/ext-browser-js.patch
index 6e7d15fb3..67d939b9e 100644
--- a/src/browser/components/extensions/parent/ext-browser-js.patch
+++ b/src/browser/components/extensions/parent/ext-browser-js.patch
@@ -1,8 +1,16 @@
diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
-index 179816fa96ccf26604d52f71232296398dd9bdbd..c35814bae4eab774892af1f6df7465601d4f87ac 100644
+index 179816fa96ccf26604d52f71232296398dd9bdbd..f15780aa2643cc59d898679b276824c20bf5ac00 100644
--- a/browser/components/extensions/parent/ext-browser.js
+++ b/browser/components/extensions/parent/ext-browser.js
-@@ -1218,6 +1218,10 @@ class TabManager extends TabManagerBase {
+@@ -342,6 +342,7 @@ class TabTracker extends TabTrackerBase {
+ if (nativeTab.ownerGlobal.closed) {
+ throw new Error("Cannot attach ID to a tab in a closed window.");
+ }
++ if (nativeTab.hasAttribute("zen-empty-tab")) return;
+
+ this._tabs.set(nativeTab, id);
+ if (nativeTab.linkedBrowser) {
+@@ -1218,6 +1219,10 @@ class TabManager extends TabManagerBase {
}
canAccessTab(nativeTab) {
From e6fad72a2a30b345e0c922bd1e3929ab9cdb6b25 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Sun, 30 Mar 2025 13:36:22 +0700
Subject: [PATCH 065/114] fix: return -1 on getId
---
.../extensions/parent/ext-browser-js.patch | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/browser/components/extensions/parent/ext-browser-js.patch b/src/browser/components/extensions/parent/ext-browser-js.patch
index 67d939b9e..407aa465e 100644
--- a/src/browser/components/extensions/parent/ext-browser-js.patch
+++ b/src/browser/components/extensions/parent/ext-browser-js.patch
@@ -1,8 +1,16 @@
diff --git a/browser/components/extensions/parent/ext-browser.js b/browser/components/extensions/parent/ext-browser.js
-index 179816fa96ccf26604d52f71232296398dd9bdbd..f15780aa2643cc59d898679b276824c20bf5ac00 100644
+index 179816fa96ccf26604d52f71232296398dd9bdbd..1d77da215d89acf0697b70cf6272e700c455c088 100644
--- a/browser/components/extensions/parent/ext-browser.js
+++ b/browser/components/extensions/parent/ext-browser.js
-@@ -342,6 +342,7 @@ class TabTracker extends TabTrackerBase {
+@@ -308,6 +308,7 @@ class TabTracker extends TabTrackerBase {
+ }
+
+ getId(nativeTab) {
++ if (nativeTab.hasAttribute("zen-empty-tab")) return -1;
+ let id = this._tabs.get(nativeTab);
+ if (id) {
+ return id;
+@@ -342,6 +343,7 @@ class TabTracker extends TabTrackerBase {
if (nativeTab.ownerGlobal.closed) {
throw new Error("Cannot attach ID to a tab in a closed window.");
}
@@ -10,7 +18,7 @@ index 179816fa96ccf26604d52f71232296398dd9bdbd..f15780aa2643cc59d898679b276824c2
this._tabs.set(nativeTab, id);
if (nativeTab.linkedBrowser) {
-@@ -1218,6 +1219,10 @@ class TabManager extends TabManagerBase {
+@@ -1218,6 +1220,10 @@ class TabManager extends TabManagerBase {
}
canAccessTab(nativeTab) {
From 9bd7b5a9001c0b72d76c1d87aab1b694d17af00e Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 30 Mar 2025 10:03:50 +0200
Subject: [PATCH 066/114] Update dependencies and refine configuration files
for improved compatibility and performance
---
configs/macos/mozconfig | 1 -
package-lock.json | 14 ++++----
package.json | 4 +--
scripts/recalculate-patches.sh | 27 ++++++++++++++
src/Cargo-lock.patch | 4 +--
src/Cargo-toml.patch | 4 +--
src/browser/app/profile/firefox-js.patch | 4 +--
src/browser/base/content/aboutDialog-js.patch | 6 ++--
.../base/content/nsContextMenu-sys-mjs.patch | 4 +--
.../BrowserContentHandler-sys-mjs.patch | 4 +--
.../content/aboutLogins-html.patch | 2 +-
.../CustomizeMode-sys-mjs.patch | 8 ++---
.../customizableui/content/panelUI-js.patch | 2 +-
.../content/bookmarkProperties-xhtml.patch | 6 ++--
.../content/browserPlacesViews-js.patch | 12 +++----
.../dialogs/syncChooseWhatToSync-js.patch | 2 +-
.../dialogs/syncChooseWhatToSync-xhtml.patch | 6 ++--
.../components/preferences/main-js.patch | 4 +--
.../preferences/preferences-js.patch | 2 +-
.../preferences/preferences-xhtml.patch | 10 +++---
.../search/SearchOneOffs-sys-mjs.patch | 4 +--
.../sessionstore/SessionStore-sys-mjs.patch | 14 ++++----
.../tabbrowser/content/tab-js.patch | 16 ++++-----
.../urlbar/UrlbarView-sys-mjs.patch | 4 +--
.../installer/windows/nsis/shared-nsh.patch | 8 +++--
.../windows/nsis/uninstaller-nsi.patch | 4 ++-
.../modules/URILoadingHelper-sys-mjs.patch | 4 +--
.../themes/BuiltInThemes-sys-mjs.patch | 2 +-
src/browser/themes/osx/browser-css.patch | 4 +--
.../shared/controlcenter/panel-css.patch | 2 +-
src/browser/themes/shared/jar-inc-mn.patch | 4 +--
.../themes/shared/tabbrowser/tabs-css.patch | 36 +++++++++----------
.../themes/shared/toolbarbuttons-css.patch | 6 ++--
.../themes/shared/urlbarView-css.patch | 2 +-
src/browser/themes/windows/browser-css.patch | 2 +-
src/build/moz-configure/init-configure.patch | 2 +-
src/build/pgo/profileserver-py.patch | 2 +-
.../startup/DevToolsStartup-sys-mjs.patch | 2 +-
src/docshell/base/nsAboutRedirector-cpp.patch | 4 +--
src/dom/html/HTMLMediaElement-cpp.patch | 4 +--
src/dom/script/ScriptLoader-cpp.patch | 4 +--
src/gfx/wr/webrender/src/picture-rs.patch | 4 +--
src/image/DecoderFactory-cpp.patch | 2 +-
src/mozglue/misc/PreXULSkeletonUI-h.patch | 15 --------
src/netwerk/protocol/http/moz-build.patch | 4 +--
src/toolkit/actors/SelectParent-sys-mjs.patch | 2 +-
.../content/aboutconfig-html.patch | 2 +-
.../content/aboutProcesses-html.patch | 2 +-
.../pictureinpicture/content/player-js.patch | 4 +--
.../content/player-xhtml.patch | 6 ++--
.../printing/content/print-html.patch | 2 +-
.../prompts/content/commonDialog-xhtml.patch | 4 +--
src/toolkit/content/aboutAbout-html.patch | 2 +-
src/toolkit/content/widgets/infobar-css.patch | 4 +--
src/toolkit/content/widgets/tabbox-js.patch | 10 +++---
src/toolkit/content/xul-css.patch | 4 +--
.../modules/AppConstants-sys-mjs.patch | 4 +--
.../LightweightThemeConsumer-sys-mjs.patch | 8 ++---
src/toolkit/modules/UpdateUtils-sys-mjs.patch | 2 +-
src/toolkit/modules/moz-build.patch | 4 +--
.../extensions/AddonManager-sys-mjs.patch | 4 +--
.../extensions/content/aboutaddons-html.patch | 4 +--
.../internal/XPIDatabase-sys-mjs.patch | 4 +--
.../internal/XPIProvider-sys-mjs.patch | 4 +--
.../profile/nsToolkitProfileService-cpp.patch | 2 +-
.../themes/shared/aboutReader-css.patch | 4 +--
src/toolkit/themes/shared/popup-css.patch | 14 ++++----
src/widget/cocoa/VibrancyManager-mm.patch | 2 +-
src/xpfe/appshell/AppWindow-cpp.patch | 4 +--
69 files changed, 199 insertions(+), 184 deletions(-)
create mode 100644 scripts/recalculate-patches.sh
delete mode 100644 src/mozglue/misc/PreXULSkeletonUI-h.patch
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index 9c1f488f3..6575de025 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -4,7 +4,6 @@ ac_add_options --disable-dmd
ac_add_options --enable-eme=widevine
export MOZ_MACBUNDLE_ID=${appId}
-export MOZ_MACBUNDLE_NAME="Zen Browser.app"
# override LTO settings
# TODO: Dont use LTO for now, it's causing a lot of issues
diff --git a/package-lock.json b/package-lock.json
index 8dbd35d31..f67283e34 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,15 @@
{
- "name": "zen-core",
+ "name": "zen-desktop",
"version": "1.0.0",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
- "name": "zen-core",
+ "name": "zen-desktop",
"version": "1.0.0",
- "license": "ISC",
+ "license": "MPL-2.0",
"dependencies": {
- "@zen-browser/surfer": "^1.10.5"
+ "@zen-browser/surfer": "^1.10.6"
},
"devDependencies": {
"husky": "^9.1.7",
@@ -288,9 +288,9 @@
"license": "MIT"
},
"node_modules/@zen-browser/surfer": {
- "version": "1.10.5",
- "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.10.5.tgz",
- "integrity": "sha512-jpGArye02C6M65qy0b5kZWzDBO5sh/BY6k2otC1keAjICm9lxELsh5ELRz0tVQ6kwrBUC3yE4uP8jzUgQdCuCg==",
+ "version": "1.10.6",
+ "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.10.6.tgz",
+ "integrity": "sha512-DWeyLOUN1pUhj7mO9l1RGovbmwAyBDrKFnyci0WfVyyWOtDIfHREfuKyulo41jF/37DL9mARbLDeJeAmcO174A==",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
"async-icns": "^1.0.2",
diff --git a/package.json b/package.json
index e34dcaffc..7a89d54e9 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "zen-core",
+ "name": "zen-desktop",
"version": "1.0.0",
"description": "",
"lint-staged": {
@@ -40,7 +40,7 @@
},
"homepage": "https://github.com/zen-browser/desktop#readme",
"dependencies": {
- "@zen-browser/surfer": "^1.10.5"
+ "@zen-browser/surfer": "^1.10.6"
},
"devDependencies": {
"husky": "^9.1.7",
diff --git a/scripts/recalculate-patches.sh b/scripts/recalculate-patches.sh
new file mode 100644
index 000000000..547d25093
--- /dev/null
+++ b/scripts/recalculate-patches.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+# Recursively find all .patch files in the current directory and its subdirectories
+find src -type f -name "*.patch" | while read -r patch_file; do
+ # Replace all - with . and remove the .patch extension
+ new_file="${patch_file%/*}/$(basename "$patch_file" | sed 's/-/./' | sed 's/\.patch$//').patch"
+ new_file="${new_file%.patch}"
+ new_file="${new_file#src/}"
+
+ if [[ $new_file == *-mjs ]]; then
+ new_file="${new_file/-mjs/.mjs}"
+ fi
+ if [[ $new_file == *-ftl ]]; then
+ new_file="${new_file/-ftl/.ftl}"
+ fi
+
+ # Create the new file with the same content as the original
+ npm run export ${new_file} &
+done
+
+for job in `jobs -p`
+do
+echo $job
+ wait $job || let "FAIL+=1"
+done
+
+echo "All patches have been exported successfully."
diff --git a/src/Cargo-lock.patch b/src/Cargo-lock.patch
index 72aa68fea..42f5a3895 100644
--- a/src/Cargo-lock.patch
+++ b/src/Cargo-lock.patch
@@ -1,8 +1,8 @@
diff --git a/Cargo.lock b/Cargo.lock
-index da2fbe8c40fa40a86c350f8adb33e26915fecc7b..e5a571fc41cd4fa8d2cdffdc15f9ad083e6d36fb 100644
+index c91f39b3afbe712355194593ae39514a83de6605..e6c2b77a69d9274ff1c7578ab4df4f07533f7441 100644
--- a/Cargo.lock
+++ b/Cargo.lock
-@@ -3912,8 +3912,6 @@ dependencies = [
+@@ -3850,8 +3850,6 @@ dependencies = [
[[package]]
name = "mime_guess"
version = "2.0.4"
diff --git a/src/Cargo-toml.patch b/src/Cargo-toml.patch
index b7c23b97e..c101b8190 100644
--- a/src/Cargo-toml.patch
+++ b/src/Cargo-toml.patch
@@ -1,8 +1,8 @@
diff --git a/Cargo.toml b/Cargo.toml
-index 19a470608b7de28a946353d4c09a56b4dd3fd69a..37e9687c86b5725ee5d5071b632b5927ffb6bd27 100644
+index a99b447250d36dd0146e031fa22503bc88eeae39..86829fc7075054f832a04825c98325a925cf5b0f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
-@@ -201,6 +201,9 @@ rure = { path = "third_party/rust/rure" }
+@@ -205,6 +205,9 @@ rure = { path = "third_party/rust/rure" }
# Patch `plist` to work with `indexmap` 2.*
plist = { path = "third_party/rust/plist" }
diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch
index 679b1e681..ccd07cd6a 100644
--- a/src/browser/app/profile/firefox-js.patch
+++ b/src/browser/app/profile/firefox-js.patch
@@ -1,8 +1,8 @@
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
-index a39a4f287ef843f7e0cdeac8320eeff81318116f..f84cdb85c249221522089667010d547cfab67819 100644
+index 97acbf826f9427b06e0a54679b30269ce7b695f5..aeadcd0c72816612cd5c1ca1199fe2a363c637f4 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
-@@ -3190,3 +3190,5 @@ pref("toolkit.contentRelevancy.enabled", false);
+@@ -3362,3 +3362,5 @@ pref("toolkit.contentRelevancy.enabled", false);
pref("toolkit.contentRelevancy.ingestEnabled", false);
// Pref to enable extra logging for the content relevancy feature
pref("toolkit.contentRelevancy.log", false);
diff --git a/src/browser/base/content/aboutDialog-js.patch b/src/browser/base/content/aboutDialog-js.patch
index 41a6fbe2e..ba8379ec9 100644
--- a/src/browser/base/content/aboutDialog-js.patch
+++ b/src/browser/base/content/aboutDialog-js.patch
@@ -1,8 +1,8 @@
diff --git a/browser/base/content/aboutDialog.js b/browser/base/content/aboutDialog.js
-index 8c5c7768e0e716c196063b4c986dea2631185972..d31f57a176fffc9725b1c31b165fb5cdc55e186e 100644
+index f6e1391baf12abb91c85a95107bb3923118746c0..76c7b75a4e29056110f1631a50047c4ddd8b1f4a 100644
--- a/browser/base/content/aboutDialog.js
+++ b/browser/base/content/aboutDialog.js
-@@ -51,7 +51,7 @@ function init() {
+@@ -52,7 +52,7 @@ function init() {
]);
let versionIdKey = "base";
let versionAttributes = {
@@ -11,7 +11,7 @@ index 8c5c7768e0e716c196063b4c986dea2631185972..d31f57a176fffc9725b1c31b165fb5cd
};
let arch = Services.sysinfo.get("arch");
-@@ -63,7 +63,7 @@ function init() {
+@@ -64,7 +64,7 @@ function init() {
}
let version = Services.appinfo.version;
diff --git a/src/browser/base/content/nsContextMenu-sys-mjs.patch b/src/browser/base/content/nsContextMenu-sys-mjs.patch
index 7bfea43ef..54f4a4af7 100644
--- a/src/browser/base/content/nsContextMenu-sys-mjs.patch
+++ b/src/browser/base/content/nsContextMenu-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/browser/base/content/nsContextMenu.sys.mjs b/browser/base/content/nsContextMenu.sys.mjs
-index 7f3dc585937c5ac96c0d09a786515305afb4fe1a..9216931e7d805743f0b00e74039be042456e63f3 100644
+index 94d3c2bb401c2e4246340a6c2d63c9d3561ff5e1..62c599f78748e708c8f36c05935822e8808996b5 100644
--- a/browser/base/content/nsContextMenu.sys.mjs
+++ b/browser/base/content/nsContextMenu.sys.mjs
-@@ -1047,6 +1047,13 @@ export class nsContextMenu {
+@@ -1109,6 +1109,13 @@ export class nsContextMenu {
!this.isSecureAboutPage()
);
diff --git a/src/browser/components/BrowserContentHandler-sys-mjs.patch b/src/browser/components/BrowserContentHandler-sys-mjs.patch
index b69095199..1f61d29a8 100644
--- a/src/browser/components/BrowserContentHandler-sys-mjs.patch
+++ b/src/browser/components/BrowserContentHandler-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/browser/components/BrowserContentHandler.sys.mjs b/browser/components/BrowserContentHandler.sys.mjs
-index 7aef091c0be1cb0ea0be52268949db17032f96d9..5e9105fa671d1b1979f204fc8d3be22771998ad7 100644
+index 7747d90981aea9437bf2d9cf46ec17be0b9ad64c..656d640da0efeb59a4037bb450e0cb1f69dda0ba 100644
--- a/browser/components/BrowserContentHandler.sys.mjs
+++ b/browser/components/BrowserContentHandler.sys.mjs
-@@ -1278,6 +1278,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
+@@ -1270,6 +1270,7 @@ function maybeRecordToHandleTelemetry(uri, isLaunch) {
".avif",
".htm",
".html",
diff --git a/src/browser/components/aboutlogins/content/aboutLogins-html.patch b/src/browser/components/aboutlogins/content/aboutLogins-html.patch
index e65fb9541..eaa43f4ea 100644
--- a/src/browser/components/aboutlogins/content/aboutLogins-html.patch
+++ b/src/browser/components/aboutlogins/content/aboutLogins-html.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html
-index 67712c8f296ba8a916ff4c6ecf9179ad733b2df8..0bad556640afd48a6738e2955a93c4e8faa68823 100644
+index a2b9a3c3bd60b7c679fc4babf2cc085f79ba84f5..3acd8da43d31cf8e9eb25d74421f522fdbd41094 100644
--- a/browser/components/aboutlogins/content/aboutLogins.html
+++ b/browser/components/aboutlogins/content/aboutLogins.html
@@ -6,7 +6,7 @@
diff --git a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
index 6affb2d5a..63acbae92 100644
--- a/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizeMode-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/browser/components/customizableui/CustomizeMode.sys.mjs b/browser/components/customizableui/CustomizeMode.sys.mjs
-index 41f347130e754ad0ee3416c1a3881211c4d2f777..9f906fd5f11731025abdf55eb5e60a824f8dd81f 100644
+index c9bdc165ff9afc8c3e43ed2cda0612b32a55450f..34f8af56753e2a898f49247036d47973c70543a9 100644
--- a/browser/components/customizableui/CustomizeMode.sys.mjs
+++ b/browser/components/customizableui/CustomizeMode.sys.mjs
-@@ -354,7 +354,7 @@ CustomizeMode.prototype = {
+@@ -357,7 +357,7 @@ CustomizeMode.prototype = {
this._transitioning = true;
let customizer = document.getElementById("customization-container");
@@ -11,7 +11,7 @@ index 41f347130e754ad0ee3416c1a3881211c4d2f777..9f906fd5f11731025abdf55eb5e60a82
browser.hidden = true;
customizer.hidden = false;
-@@ -485,7 +485,7 @@ CustomizeMode.prototype = {
+@@ -488,7 +488,7 @@ CustomizeMode.prototype = {
}
let customizer = document.getElementById("customization-container");
@@ -20,7 +20,7 @@ index 41f347130e754ad0ee3416c1a3881211c4d2f777..9f906fd5f11731025abdf55eb5e60a82
customizer.hidden = true;
browser.hidden = false;
-@@ -2276,6 +2276,20 @@ CustomizeMode.prototype = {
+@@ -2397,6 +2397,20 @@ CustomizeMode.prototype = {
if (makeSpaceImmediately) {
aItem.setAttribute("notransition", "true");
}
diff --git a/src/browser/components/customizableui/content/panelUI-js.patch b/src/browser/components/customizableui/content/panelUI-js.patch
index d73fba27b..651f80f9d 100644
--- a/src/browser/components/customizableui/content/panelUI-js.patch
+++ b/src/browser/components/customizableui/content/panelUI-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
-index 7583473ee73538b2fa54337bfd844f03f261be49..559b593a6874296bd5894c5985f8eeb680cd3886 100644
+index 010d0813557efd6d5a3a84ea589989f6e9ff195a..e26cc1be1f56919e6ec5f2432854b284837671ac 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -515,8 +515,7 @@ const PanelUI = {
diff --git a/src/browser/components/places/content/bookmarkProperties-xhtml.patch b/src/browser/components/places/content/bookmarkProperties-xhtml.patch
index 6a12369c1..3721631b6 100644
--- a/src/browser/components/places/content/bookmarkProperties-xhtml.patch
+++ b/src/browser/components/places/content/bookmarkProperties-xhtml.patch
@@ -1,8 +1,8 @@
diff --git a/browser/components/places/content/bookmarkProperties.xhtml b/browser/components/places/content/bookmarkProperties.xhtml
-index 047652a52e705d49f870399992873fce536c07b9..37ea726fe427a31db8fae97c99fd38c8669fa0f9 100644
+index 4aad4e4fb4139aa3d81e00eefa82e26b697df973..a2bfac11322f3679af9b51ebc7478323aa8e4adb 100644
--- a/browser/components/places/content/bookmarkProperties.xhtml
+++ b/browser/components/places/content/bookmarkProperties.xhtml
-@@ -37,6 +37,8 @@
+@@ -38,6 +38,8 @@
/>
<html:link rel="localization" href="browser/editBookmarkOverlay.ftl"/>
@@ -11,7 +11,7 @@ index 047652a52e705d49f870399992873fce536c07b9..37ea726fe427a31db8fae97c99fd38c8
</linkset>
<stringbundleset id="stringbundleset">
-@@ -44,6 +46,8 @@
+@@ -45,6 +47,8 @@
src="chrome://browser/locale/places/bookmarkProperties.properties"/>
</stringbundleset>
diff --git a/src/browser/components/places/content/browserPlacesViews-js.patch b/src/browser/components/places/content/browserPlacesViews-js.patch
index 8937d6b2c..8d055b9a4 100644
--- a/src/browser/components/places/content/browserPlacesViews-js.patch
+++ b/src/browser/components/places/content/browserPlacesViews-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/places/content/browserPlacesViews.js b/browser/components/places/content/browserPlacesViews.js
-index 1bfa0af16178c9b42172bc1b1e0249d28ff8e9e6..6744a37b7183ab9e3ac5bced7ded715879063eb5 100644
+index ad138a38340e8e8510d395f46c30ec4121d731bb..9294f05633acbe560df003333b7ef7d9a12a2a11 100644
--- a/browser/components/places/content/browserPlacesViews.js
+++ b/browser/components/places/content/browserPlacesViews.js
@@ -330,12 +330,23 @@ class PlacesViewBase {
@@ -37,7 +37,7 @@ index 1bfa0af16178c9b42172bc1b1e0249d28ff8e9e6..6744a37b7183ab9e3ac5bced7ded7158
} else if (PlacesUtils.containerTypes.includes(type)) {
element = document.createXULElement("menu");
element.setAttribute("container", "true");
-@@ -981,25 +993,33 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -980,25 +992,33 @@ class PlacesToolbar extends PlacesViewBase {
this._rootElt.firstChild.remove();
}
@@ -82,7 +82,7 @@ index 1bfa0af16178c9b42172bc1b1e0249d28ff8e9e6..6744a37b7183ab9e3ac5bced7ded7158
);
++startIndex;
if (elt.localName != "toolbarseparator") {
-@@ -1007,15 +1027,12 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1006,15 +1026,12 @@ class PlacesToolbar extends PlacesViewBase {
}
}
if (!elt) {
@@ -101,7 +101,7 @@ index 1bfa0af16178c9b42172bc1b1e0249d28ff8e9e6..6744a37b7183ab9e3ac5bced7ded7158
});
});
-@@ -1025,7 +1042,7 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1024,7 +1041,7 @@ class PlacesToolbar extends PlacesViewBase {
let fragment = document.createDocumentFragment();
for (let i = startIndex; i < limit; ++i) {
@@ -110,7 +110,7 @@ index 1bfa0af16178c9b42172bc1b1e0249d28ff8e9e6..6744a37b7183ab9e3ac5bced7ded7158
}
await new Promise(resolve => window.requestAnimationFrame(resolve));
if (!this._isAlive) {
-@@ -1087,6 +1104,8 @@ class PlacesToolbar extends PlacesViewBase {
+@@ -1086,6 +1103,8 @@ class PlacesToolbar extends PlacesViewBase {
"scheme",
PlacesUIUtils.guessUrlSchemeForUI(aChild.uri)
);
@@ -119,7 +119,7 @@ index 1bfa0af16178c9b42172bc1b1e0249d28ff8e9e6..6744a37b7183ab9e3ac5bced7ded7158
}
}
-@@ -2235,7 +2254,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase {
+@@ -2234,7 +2253,7 @@ this.PlacesPanelview = class PlacesPanelview extends PlacesViewBase {
PlacesUIUtils.guessUrlSchemeForUI(placesNode.uri)
);
element.setAttribute("label", PlacesUIUtils.getBestTitle(placesNode));
diff --git a/src/browser/components/preferences/dialogs/syncChooseWhatToSync-js.patch b/src/browser/components/preferences/dialogs/syncChooseWhatToSync-js.patch
index a50c94c65..7b65eb7eb 100644
--- a/src/browser/components/preferences/dialogs/syncChooseWhatToSync-js.patch
+++ b/src/browser/components/preferences/dialogs/syncChooseWhatToSync-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.js b/browser/components/preferences/dialogs/syncChooseWhatToSync.js
-index 2cc965b4e1b20e1ae422bfb5c90a237dcd31fcf6..cfed9dfa67c7c34cd812885a72d66dd37ba414fc 100644
+index a38c2a235971f2fe470f9bee92fc9c1a6d9b8b15..564be3dabe01621a621ca586421cdb77e0220f8b 100644
--- a/browser/components/preferences/dialogs/syncChooseWhatToSync.js
+++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.js
@@ -13,6 +13,7 @@ Preferences.addAll([
diff --git a/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch b/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch
index 53a2ce219..efdeece47 100644
--- a/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch
+++ b/src/browser/components/preferences/dialogs/syncChooseWhatToSync-xhtml.patch
@@ -1,8 +1,8 @@
diff --git a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
-index 83bd09c0c3f8fd5febf1721e6b462ca90e54327b..5d0ca4265e7b57178f1fe45068449e0355ba80e0 100644
+index 6e74bbce9096179d38db422879349013f3954fa9..859f8b9640ef49411164f8e5160d4d9b8db11e54 100644
--- a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
+++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
-@@ -26,6 +26,10 @@
+@@ -27,6 +27,10 @@
rel="localization"
href="browser/preferences/preferences.ftl"
/>
@@ -13,7 +13,7 @@ index 83bd09c0c3f8fd5febf1721e6b462ca90e54327b..5d0ca4265e7b57178f1fe45068449e03
</linkset>
<script src="chrome://global/content/preferencesBindings.js" />
<script src="chrome://browser/content/preferences/dialogs/syncChooseWhatToSync.js" />
-@@ -82,6 +86,12 @@
+@@ -79,6 +83,12 @@
preference="services.sync.engine.prefs"
/>
</html:div>
diff --git a/src/browser/components/preferences/main-js.patch b/src/browser/components/preferences/main-js.patch
index cbda82bef..9676a3104 100644
--- a/src/browser/components/preferences/main-js.patch
+++ b/src/browser/components/preferences/main-js.patch
@@ -1,8 +1,8 @@
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
-index b9487ece26cfe21a32199a7e36f29b3aa3b8d700..ce02f54cab85d4da8cb306f0d5f3378c9e30df37 100644
+index 8f6f78419a0876ebe6d0967a88ef03e464dbbd23..9339085014b797033c4ee1ed2e40f2506d1e9797 100644
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
-@@ -212,7 +212,7 @@ function getBundleForLocales(newLocales) {
+@@ -218,7 +218,7 @@ function getBundleForLocales(newLocales) {
])
);
return new Localization(
diff --git a/src/browser/components/preferences/preferences-js.patch b/src/browser/components/preferences/preferences-js.patch
index 42529b788..e4336e5c2 100644
--- a/src/browser/components/preferences/preferences-js.patch
+++ b/src/browser/components/preferences/preferences-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/preferences/preferences.js b/browser/components/preferences/preferences.js
-index 78b70a99b00198402c357ead363dec7e534be456..90e10509fdff67144f5cbcf42c743e617df604e0 100644
+index 6386773b287ca6d06a0abe928850c5bb465828ed..b3459a2abcac5f21a5b24189ec1dc88e24626687 100644
--- a/browser/components/preferences/preferences.js
+++ b/browser/components/preferences/preferences.js
@@ -118,6 +118,7 @@ ChromeUtils.defineLazyGetter(this, "gSubDialog", function () {
diff --git a/src/browser/components/preferences/preferences-xhtml.patch b/src/browser/components/preferences/preferences-xhtml.patch
index d95516c19..6db544ffd 100644
--- a/src/browser/components/preferences/preferences-xhtml.patch
+++ b/src/browser/components/preferences/preferences-xhtml.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/preferences/preferences.xhtml b/browser/components/preferences/preferences.xhtml
-index 53bdc9c912a6cd0c787dbcf41f2a82b7169d5aa7..e47c4b36b6e469b0cc8b95bde0508dc6cb0b49ae 100644
+index 951af951598c3edc9bc431dd106e68d006ec4316..eb420d6c5ea346639eee531805aabbe7726c7769 100644
--- a/browser/components/preferences/preferences.xhtml
+++ b/browser/components/preferences/preferences.xhtml
@@ -43,6 +43,8 @@
@@ -11,7 +11,7 @@ index 53bdc9c912a6cd0c787dbcf41f2a82b7169d5aa7..e47c4b36b6e469b0cc8b95bde0508dc6
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="browser/browser.ftl"/>
<!-- Used by fontbuilder.js -->
-@@ -97,6 +99,12 @@
+@@ -98,6 +100,12 @@
<hbox flex="1">
<vbox class="navigation">
@@ -24,7 +24,7 @@ index 53bdc9c912a6cd0c787dbcf41f2a82b7169d5aa7..e47c4b36b6e469b0cc8b95bde0508dc6
<!-- category list -->
<richlistbox id="categories" data-l10n-id="category-list" data-l10n-attrs="aria-label">
<richlistitem id="category-general"
-@@ -110,6 +118,50 @@
+@@ -111,6 +119,50 @@
<label class="category-name" flex="1" data-l10n-id="pane-general-title"></label>
</richlistitem>
@@ -75,7 +75,7 @@ index 53bdc9c912a6cd0c787dbcf41f2a82b7169d5aa7..e47c4b36b6e469b0cc8b95bde0508dc6
<richlistitem id="category-home"
class="category"
value="paneHome"
-@@ -228,11 +280,13 @@
+@@ -229,11 +281,13 @@
<html:a href="about:policies" target="_blank" data-l10n-id="managed-notice"/>
</hbox>
</hbox>
@@ -89,7 +89,7 @@ index 53bdc9c912a6cd0c787dbcf41f2a82b7169d5aa7..e47c4b36b6e469b0cc8b95bde0508dc6
</hbox>
</hbox>
<vbox id="mainPrefPane">
-@@ -246,6 +300,10 @@
+@@ -247,6 +301,10 @@
#include sync.inc.xhtml
#include experimental.inc.xhtml
#include moreFromMozilla.inc.xhtml
diff --git a/src/browser/components/search/SearchOneOffs-sys-mjs.patch b/src/browser/components/search/SearchOneOffs-sys-mjs.patch
index 2ec4565cb..b6c19086a 100644
--- a/src/browser/components/search/SearchOneOffs-sys-mjs.patch
+++ b/src/browser/components/search/SearchOneOffs-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/browser/components/search/SearchOneOffs.sys.mjs b/browser/components/search/SearchOneOffs.sys.mjs
-index 6dcd68f7ec4da72f9510ac3c8ff1cecffbd70e92..f712b95d03be46f7d81bad4113f533f0515a92b9 100644
+index 4810eca0825f9a6f07f242e804de2edb7bd697d8..fd4e7661c93be528c2766e27fe22403d3d495292 100644
--- a/browser/components/search/SearchOneOffs.sys.mjs
+++ b/browser/components/search/SearchOneOffs.sys.mjs
-@@ -446,7 +446,7 @@ export class SearchOneOffs {
+@@ -443,7 +443,7 @@ export class SearchOneOffs {
// For the search-bar, always show the one-off buttons where there is an
// option to add an engine.
let addEngineNeeded = isSearchBar && addEngines.length;
diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index b4ab32dfb..918bf27ea 100644
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index f814772114948f87cbb3c3a7231c95ea1f68d776..38913eb9dee97b42697440560f7a1bab1ffe9f15 100644
+index 6e2973abf428b110bfc553522723f327ee84c028..668cc147a1bf158bc42a7baf2a5549049d060899 100644
--- a/browser/components/sessionstore/SessionStore.sys.mjs
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
-@@ -3171,7 +3171,7 @@ var SessionStoreInternal = {
+@@ -3186,7 +3186,7 @@ var SessionStoreInternal = {
if (!isPrivateWindow && tabState.isPrivate) {
return;
}
@@ -11,7 +11,7 @@ index f814772114948f87cbb3c3a7231c95ea1f68d776..38913eb9dee97b42697440560f7a1bab
return;
}
-@@ -3876,6 +3876,7 @@ var SessionStoreInternal = {
+@@ -3895,6 +3895,7 @@ var SessionStoreInternal = {
Math.min(tabState.index, tabState.entries.length)
);
tabState.pinned = false;
@@ -19,7 +19,7 @@ index f814772114948f87cbb3c3a7231c95ea1f68d776..38913eb9dee97b42697440560f7a1bab
if (inBackground === false) {
aWindow.gBrowser.selectedTab = newTab;
-@@ -5355,14 +5356,15 @@ var SessionStoreInternal = {
+@@ -5399,14 +5400,15 @@ var SessionStoreInternal = {
}
let tabbrowser = aWindow.gBrowser;
@@ -37,7 +37,7 @@ index f814772114948f87cbb3c3a7231c95ea1f68d776..38913eb9dee97b42697440560f7a1bab
continue;
}
let tabData = lazy.TabState.collect(tab, TAB_CUSTOM_VALUES.get(tab));
-@@ -5381,7 +5383,7 @@ var SessionStoreInternal = {
+@@ -5425,7 +5427,7 @@ var SessionStoreInternal = {
// We don't store the Firefox View tab in Session Store, so if it was the last selected "tab" when
// a window is closed, point to the first item in the tab strip instead (it will never be the Firefox View tab,
// since it's only inserted into the tab strip after it's selected).
@@ -46,7 +46,7 @@ index f814772114948f87cbb3c3a7231c95ea1f68d776..38913eb9dee97b42697440560f7a1bab
selectedIndex = 1;
winData.title = tabbrowser.tabs[0].label;
}
-@@ -5538,6 +5540,7 @@ var SessionStoreInternal = {
+@@ -5582,6 +5584,7 @@ var SessionStoreInternal = {
winData.tabs,
winData.groups ?? []
);
@@ -54,7 +54,7 @@ index f814772114948f87cbb3c3a7231c95ea1f68d776..38913eb9dee97b42697440560f7a1bab
this._log.debug(
`restoreWindow, createTabsForSessionRestore returned ${tabs.length} tabs`
);
-@@ -6086,8 +6089,23 @@ var SessionStoreInternal = {
+@@ -6130,8 +6133,23 @@ var SessionStoreInternal = {
// Most of tabData has been restored, now continue with restoring
// attributes that may trigger external events.
diff --git a/src/browser/components/tabbrowser/content/tab-js.patch b/src/browser/components/tabbrowser/content/tab-js.patch
index 2fa672220..77004183f 100644
--- a/src/browser/components/tabbrowser/content/tab-js.patch
+++ b/src/browser/components/tabbrowser/content/tab-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index 777eabb7524f2b021a03b3f54d69faee49b7381d..192d2fa058f7d9f043532c0ae6e4c08129d16b8e 100644
+index fc3a9730b394341843cfa9f559a792acb34c7d29..18d5fdb6e3368e21c68269c48cf22ac96fd868da 100644
--- a/browser/components/tabbrowser/content/tab.js
+++ b/browser/components/tabbrowser/content/tab.js
@@ -16,6 +16,7 @@
@@ -21,7 +21,7 @@ index 777eabb7524f2b021a03b3f54d69faee49b7381d..192d2fa058f7d9f043532c0ae6e4c081
</hbox>
</stack>
`;
-@@ -168,7 +171,7 @@
+@@ -167,7 +170,7 @@
}
set _visuallySelected(val) {
@@ -30,7 +30,7 @@ index 777eabb7524f2b021a03b3f54d69faee49b7381d..192d2fa058f7d9f043532c0ae6e4c081
return;
}
-@@ -204,7 +207,7 @@
+@@ -203,7 +206,7 @@
}
get visible() {
@@ -39,7 +39,7 @@ index 777eabb7524f2b021a03b3f54d69faee49b7381d..192d2fa058f7d9f043532c0ae6e4c081
}
get hidden() {
-@@ -266,7 +269,7 @@
+@@ -274,7 +277,7 @@
return false;
}
@@ -48,7 +48,7 @@ index 777eabb7524f2b021a03b3f54d69faee49b7381d..192d2fa058f7d9f043532c0ae6e4c081
}
get lastAccessed() {
-@@ -438,6 +441,8 @@
+@@ -446,6 +449,8 @@
this.style.MozUserFocus = "ignore";
} else if (
event.target.classList.contains("tab-close-button") ||
@@ -57,7 +57,7 @@ index 777eabb7524f2b021a03b3f54d69faee49b7381d..192d2fa058f7d9f043532c0ae6e4c081
event.target.classList.contains("tab-icon-overlay") ||
event.target.classList.contains("tab-audio-button")
) {
-@@ -536,6 +541,7 @@
+@@ -544,6 +549,7 @@
if (this.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {
@@ -65,7 +65,7 @@ index 777eabb7524f2b021a03b3f54d69faee49b7381d..192d2fa058f7d9f043532c0ae6e4c081
gBrowser.removeTab(this, {
animate: true,
triggeringEvent: event,
-@@ -545,6 +551,14 @@
+@@ -553,6 +559,14 @@
// (see tabbrowser-tabs 'click' handler).
gBrowser.tabContainer._blockDblClick = true;
}
@@ -80,7 +80,7 @@ index 777eabb7524f2b021a03b3f54d69faee49b7381d..192d2fa058f7d9f043532c0ae6e4c081
}
on_dblclick(event) {
-@@ -568,6 +582,8 @@
+@@ -576,6 +590,8 @@
animate: true,
triggeringEvent: event,
});
diff --git a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
index 046c8d571..4dc2dbf40 100644
--- a/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarView-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/browser/components/urlbar/UrlbarView.sys.mjs b/browser/components/urlbar/UrlbarView.sys.mjs
-index 197e0a1c3030b6346c49a010338130797c1e5f4b..333d38aea2116c5407ffc242b805db633df12968 100644
+index 0e6724f590490354cc4d4bde5176556f7e4b4a7c..bffc52488443d62de46abe5cbdac4504831c4a09 100644
--- a/browser/components/urlbar/UrlbarView.sys.mjs
+++ b/browser/components/urlbar/UrlbarView.sys.mjs
-@@ -628,7 +628,7 @@ export class UrlbarView {
+@@ -610,7 +610,7 @@ export class UrlbarView {
!this.input.value ||
this.input.getAttribute("pageproxystate") == "valid"
) {
diff --git a/src/browser/installer/windows/nsis/shared-nsh.patch b/src/browser/installer/windows/nsis/shared-nsh.patch
index f8da06cfe..09a2396f0 100644
--- a/src/browser/installer/windows/nsis/shared-nsh.patch
+++ b/src/browser/installer/windows/nsis/shared-nsh.patch
@@ -1,5 +1,7 @@
diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh
-index b7f8e1453089ab5f1945e1a65f038e17b5273571..5297f5ed70fe3446e55be37df486fb4ad791a446 100644
+old mode 100755
+new mode 100644
+index bc8f5775785e08a0cc1c8a6ad1f0e19e980c607d..bf11d30d10fb38855f6a0e8d5346be271042769e
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -513,6 +513,7 @@ ${RemoveDefaultBrowserAgentShortcut}
@@ -26,7 +28,7 @@ index b7f8e1453089ab5f1945e1a65f038e17b5273571..5297f5ed70fe3446e55be37df486fb4a
${WriteApplicationsSupportedType} ${RegKey} ".xht"
${WriteApplicationsSupportedType} ${RegKey} ".xhtml"
${WriteApplicationsSupportedType} ${RegKey} ".xml"
-@@ -1728,6 +1731,8 @@ Function SetAsDefaultAppUserHKCU
+@@ -1727,6 +1730,8 @@ Function SetAsDefaultAppUserHKCU
Pop $0
AppAssocReg::SetAppAsDefault "$R9" ".avif" "file"
Pop $0
@@ -35,7 +37,7 @@ index b7f8e1453089ab5f1945e1a65f038e17b5273571..5297f5ed70fe3446e55be37df486fb4a
AppAssocReg::SetAppAsDefault "$R9" ".xht" "file"
Pop $0
AppAssocReg::SetAppAsDefault "$R9" ".xhtml" "file"
-@@ -1857,7 +1862,7 @@ FunctionEnd
+@@ -1856,7 +1861,7 @@ FunctionEnd
; uninstalled.
; Do all of that twice, once for the local machine and once for the current user
diff --git a/src/browser/installer/windows/nsis/uninstaller-nsi.patch b/src/browser/installer/windows/nsis/uninstaller-nsi.patch
index b2de9cb9a..efc934a82 100644
--- a/src/browser/installer/windows/nsis/uninstaller-nsi.patch
+++ b/src/browser/installer/windows/nsis/uninstaller-nsi.patch
@@ -1,5 +1,7 @@
diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
-index 559c8b46ee06bc42c91da49b5d9e397fe8ff6126..62094a5d98712a41a607ba01ca2adfa1e4f51ccd 100644
+old mode 100755
+new mode 100644
+index 559c8b46ee06bc42c91da49b5d9e397fe8ff6126..62094a5d98712a41a607ba01ca2adfa1e4f51ccd
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
@@ -507,6 +507,7 @@ Section "Uninstall"
diff --git a/src/browser/modules/URILoadingHelper-sys-mjs.patch b/src/browser/modules/URILoadingHelper-sys-mjs.patch
index ed966ee28..f3f4be2db 100644
--- a/src/browser/modules/URILoadingHelper-sys-mjs.patch
+++ b/src/browser/modules/URILoadingHelper-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/browser/modules/URILoadingHelper.sys.mjs b/browser/modules/URILoadingHelper.sys.mjs
-index 313e895980c502d79f64f5a6ab838f6a96c83835..8a1a853567aeae2c368005d3757815799457212a 100644
+index c4428df9e1c43ba7a1dfefa2d55316023325d2db..191bc513862d5247e338c683b11ae891ab914479 100644
--- a/browser/modules/URILoadingHelper.sys.mjs
+++ b/browser/modules/URILoadingHelper.sys.mjs
-@@ -512,7 +512,7 @@ export const URILoadingHelper = {
+@@ -510,7 +510,7 @@ export const URILoadingHelper = {
// page. If a load request bounces off for the currently selected tab,
// we'll open a new tab instead.
let tab = w.gBrowser.getTabForBrowser(targetBrowser);
diff --git a/src/browser/themes/BuiltInThemes-sys-mjs.patch b/src/browser/themes/BuiltInThemes-sys-mjs.patch
index a21089d29..21c9c514d 100644
--- a/src/browser/themes/BuiltInThemes-sys-mjs.patch
+++ b/src/browser/themes/BuiltInThemes-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/browser/themes/BuiltInThemes.sys.mjs b/browser/themes/BuiltInThemes.sys.mjs
-index c2d5dd7a18895ae8b4afbf386f122e7899c48cda..377d904bbf5adc92bf7cb0aa4c4c641794d828f3 100644
+index cc7f6cf93e04d339fb79a028b1e5ac6e79eae9c3..85e0d653f9a6d577bdea2a1c9d53018dd45684fa 100644
--- a/browser/themes/BuiltInThemes.sys.mjs
+++ b/browser/themes/BuiltInThemes.sys.mjs
@@ -74,7 +74,7 @@ class _BuiltInThemes {
diff --git a/src/browser/themes/osx/browser-css.patch b/src/browser/themes/osx/browser-css.patch
index defcca347..740607be6 100644
--- a/src/browser/themes/osx/browser-css.patch
+++ b/src/browser/themes/osx/browser-css.patch
@@ -1,8 +1,8 @@
diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css
-index 5f40300c553dd416f01502bc0cfa17dea7a779a0..6910f90a578a0f1b728722a7c928afad8a07fd1b 100644
+index 7fc76bc82bd5d6311442b85a76d885dcfb6d753d..61b1b3ac8241c4f12e4ca8966a7ac1fae0eb41ee 100644
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
-@@ -61,7 +61,7 @@
+@@ -38,7 +38,7 @@
.titlebar-buttonbox {
&:-moz-locale-dir(ltr) {
diff --git a/src/browser/themes/shared/controlcenter/panel-css.patch b/src/browser/themes/shared/controlcenter/panel-css.patch
index 3347b99a3..4c6017253 100644
--- a/src/browser/themes/shared/controlcenter/panel-css.patch
+++ b/src/browser/themes/shared/controlcenter/panel-css.patch
@@ -1,5 +1,5 @@
diff --git a/browser/themes/shared/controlcenter/panel.css b/browser/themes/shared/controlcenter/panel.css
-index d7685cdc694267f21258dcb958fda377c56866c8..3b26da23dba9809aaec5b5391a1938a0455515d7 100644
+index 6c3e1d47648165b4994f3face2df48c87ff48a53..dd1791790356d4dd3c3256e2603cf3287c1b89fc 100644
--- a/browser/themes/shared/controlcenter/panel.css
+++ b/browser/themes/shared/controlcenter/panel.css
@@ -10,11 +10,11 @@
diff --git a/src/browser/themes/shared/jar-inc-mn.patch b/src/browser/themes/shared/jar-inc-mn.patch
index 1d7cd13fd..9814e8e95 100644
--- a/src/browser/themes/shared/jar-inc-mn.patch
+++ b/src/browser/themes/shared/jar-inc-mn.patch
@@ -1,8 +1,8 @@
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index 37b5f04cddde9a3769d31c6e3a93b43da76f44e5..3bd987f7c164a6258d56029b305123b92f6b845d 100644
+index c2bebf7e96a1d7a36c5e3168cf65504361da821b..5f55741b2a467341f93f648c5f084f863a6de32c 100644
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
-@@ -285,3 +285,5 @@
+@@ -290,3 +290,5 @@
skin/classic/browser/weather/night-partly-cloudy-with-showers.svg (../shared/weather/night-partly-cloudy-with-showers.svg)
skin/classic/browser/weather/night-partly-cloudy-with-thunderstorms.svg (../shared/weather/night-partly-cloudy-with-thunderstorms.svg)
skin/classic/browser/weather/night-mostly-cloudy-with-flurries.svg (../shared/weather/night-mostly-cloudy-with-flurries.svg)
diff --git a/src/browser/themes/shared/tabbrowser/tabs-css.patch b/src/browser/themes/shared/tabbrowser/tabs-css.patch
index 3d8dd533e..e84a8ef9a 100644
--- a/src/browser/themes/shared/tabbrowser/tabs-css.patch
+++ b/src/browser/themes/shared/tabbrowser/tabs-css.patch
@@ -1,8 +1,8 @@
diff --git a/browser/themes/shared/tabbrowser/tabs.css b/browser/themes/shared/tabbrowser/tabs.css
-index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70ab4bac8f 100644
+index bafbb39aac37843e3b6dceb0e81304af51e186cc..92b4fd725118150634ab2ae0a24efb52c16c5227 100644
--- a/browser/themes/shared/tabbrowser/tabs.css
+++ b/browser/themes/shared/tabbrowser/tabs.css
-@@ -31,7 +31,7 @@
+@@ -32,7 +32,7 @@
--tab-block-margin: 4px;
--tab-icon-end-margin: 5.5px;
--tab-label-line-height: 1.7;
@@ -11,7 +11,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
--tab-hover-background-color: color-mix(in srgb, currentColor 11%, transparent);
--tab-selected-textcolor: var(--toolbar-color);
--tab-selected-bgcolor: var(--toolbar-bgcolor);
-@@ -209,8 +209,7 @@
+@@ -214,8 +214,7 @@
}
#tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > &[pinned] {
@@ -21,7 +21,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
}
#tabbrowser-tabs[movingtab] &:is([selected], [multiselected]) {
-@@ -249,7 +248,6 @@
+@@ -254,7 +253,6 @@
}
:root:not([uidensity=compact]) &[pinned] {
@@ -29,7 +29,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
}
&:is([selected], [multiselected]) {
-@@ -263,6 +261,7 @@
+@@ -268,6 +266,7 @@
border-radius: inherit;
position: relative;
overflow: hidden;
@@ -37,7 +37,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
&::before {
position: absolute;
-@@ -437,6 +436,7 @@
+@@ -442,6 +441,7 @@
.tab-icon-image {
-moz-context-properties: fill, stroke;
fill: currentColor;
@@ -45,7 +45,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
/* Apply crisp rendering for favicons at exactly 2dppx resolution */
@media (resolution: 2dppx) {
-@@ -502,7 +502,7 @@
+@@ -523,7 +523,7 @@
z-index: 1; /* Overlay tab title */
#tabbrowser-tabs[orient=vertical] & {
@@ -54,7 +54,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
}
&[crashed] {
-@@ -510,7 +510,7 @@
+@@ -531,7 +531,7 @@
}
#tabbrowser-tabs[orient="vertical"]:not([expanded]) &:not([crashed]),
@@ -63,7 +63,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
&[soundplaying] {
list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg");
}
-@@ -540,7 +540,7 @@
+@@ -561,7 +561,7 @@
background-image: linear-gradient(var(--audio-overlay-extra-background)),
linear-gradient(var(--toolbox-bgcolor));
-moz-context-properties: fill;
@@ -72,7 +72,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
color-scheme: var(--tab-selected-color-scheme);
border-radius: var(--border-radius-circle);
-@@ -572,7 +572,7 @@
+@@ -593,7 +593,7 @@
}
#tabbrowser-tabs[orient="vertical"]:not([expanded]) &:is([soundplaying], [muted], [activemedia-blocked]),
@@ -81,7 +81,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
&[crashed] {
display: revert;
}
-@@ -586,7 +586,7 @@
+@@ -607,7 +607,7 @@
--button-min-height-small: 24px;
--button-border-radius: var(--border-radius-small);
@@ -90,7 +90,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
&:is([soundplaying], [muted], [activemedia-blocked]) {
display: block;
}
-@@ -617,14 +617,14 @@
+@@ -638,14 +638,14 @@
}
&[textoverflow] {
@@ -109,7 +109,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
direction: rtl;
mask-image: linear-gradient(to right, transparent, black var(--tab-label-mask-size));
}
-@@ -1170,7 +1170,7 @@
+@@ -1201,7 +1201,7 @@
}
}
@@ -118,7 +118,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
#vertical-tabs-newtab-button {
appearance: none;
min-height: var(--tab-min-height);
-@@ -1181,7 +1181,7 @@
+@@ -1212,7 +1212,7 @@
margin-inline: var(--tab-inner-inline-margin);
#tabbrowser-tabs[orient="vertical"]:not([expanded]) & > .toolbarbutton-text {
@@ -127,7 +127,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
}
&:hover {
-@@ -1205,7 +1205,7 @@
+@@ -1236,7 +1236,7 @@
* flex container. #tabs-newtab-button is a child of the arrowscrollbox where
* we don't want a gap (between tabs), so we have to add some margin.
*/
@@ -136,7 +136,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
margin-block: var(--tab-block-margin);
}
-@@ -1229,7 +1229,6 @@
+@@ -1260,7 +1260,6 @@
}
#vertical-pinned-tabs-container {
@@ -144,7 +144,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
display: none;
grid-template-columns: repeat(auto-fit, minmax(var(--tab-pinned-min-width-expanded), auto));
overflow-y: auto;
-@@ -1439,7 +1438,7 @@
+@@ -1480,7 +1479,7 @@
toolbarbutton:not(#firefox-view-button),
toolbarpaletteitem:not(#wrapper-firefox-view-button)
) ~ #tabbrowser-tabs {
@@ -153,7 +153,7 @@ index 01815c2114a627e5cac183c702bd82f1bd4f58f8..f47bd9c8490cd8fc4bb686ad0012ce70
padding-inline-start: calc(var(--tab-overflow-pinned-tabs-width) + 2px);
margin-inline-start: 2px;
}
-@@ -1473,7 +1472,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
+@@ -1514,7 +1513,6 @@ toolbar:not(#TabsToolbar) #firefox-view-button {
list-style-image: url(chrome://global/skin/icons/plus.svg);
}
diff --git a/src/browser/themes/shared/toolbarbuttons-css.patch b/src/browser/themes/shared/toolbarbuttons-css.patch
index 53a4ae182..3205424c2 100644
--- a/src/browser/themes/shared/toolbarbuttons-css.patch
+++ b/src/browser/themes/shared/toolbarbuttons-css.patch
@@ -1,8 +1,8 @@
diff --git a/browser/themes/shared/toolbarbuttons.css b/browser/themes/shared/toolbarbuttons.css
-index ca1d70b515f17922c3625e38e2110368ad0de652..3ac05678b10f054d16093a225eb93bb8ed26a116 100644
+index 26b58ee104a432a359ba2667d2e49a9231e81fef..7cb950e7b3fcb6f599e9cb645ea24a515e2cc491 100644
--- a/browser/themes/shared/toolbarbuttons.css
+++ b/browser/themes/shared/toolbarbuttons.css
-@@ -210,7 +210,7 @@ toolbar[brighttext] .toolbaritem-combined-buttons > separator {
+@@ -218,7 +218,7 @@ toolbar[brighttext] .toolbaritem-combined-buttons > separator {
#nav-bar-overflow-button {
list-style-image: url("chrome://global/skin/icons/chevron.svg");
@@ -11,7 +11,7 @@ index ca1d70b515f17922c3625e38e2110368ad0de652..3ac05678b10f054d16093a225eb93bb8
display: none;
}
-@@ -420,7 +420,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
+@@ -428,7 +428,7 @@ toolbarbutton.bookmark-item:not(.subviewbutton) {
*/
align-items: stretch;
> .toolbarbutton-icon {
diff --git a/src/browser/themes/shared/urlbarView-css.patch b/src/browser/themes/shared/urlbarView-css.patch
index 2e7241a17..1389d88db 100644
--- a/src/browser/themes/shared/urlbarView-css.patch
+++ b/src/browser/themes/shared/urlbarView-css.patch
@@ -1,5 +1,5 @@
diff --git a/browser/themes/shared/urlbarView.css b/browser/themes/shared/urlbarView.css
-index 1c654e053ca8a014d7c2a9fc076cf15afba9c903..f2f63809d0a36db2774755db2b782f41a9bbe82b 100644
+index 203d2de2c89f32ffb911ab0b9aba5285173ba177..a5ba67a02d93a8258202894a2ea20f4d350ccbb5 100644
--- a/browser/themes/shared/urlbarView.css
+++ b/browser/themes/shared/urlbarView.css
@@ -20,7 +20,7 @@
diff --git a/src/browser/themes/windows/browser-css.patch b/src/browser/themes/windows/browser-css.patch
index 146262177..f7251386e 100644
--- a/src/browser/themes/windows/browser-css.patch
+++ b/src/browser/themes/windows/browser-css.patch
@@ -1,5 +1,5 @@
diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css
-index f49604e53780763b9aa19897458c45f0be6cbc9b..5ea9098a9b689470ef4ddfea91069cd23391d020 100644
+index 9af78803f0005a2b89e1c73f52153ed4d9e3154a..b63dc3d050144f048ac6a326acd57cc85fa8a3a7 100644
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -40,14 +40,13 @@
diff --git a/src/build/moz-configure/init-configure.patch b/src/build/moz-configure/init-configure.patch
index 27635506e..78e92b18d 100644
--- a/src/build/moz-configure/init-configure.patch
+++ b/src/build/moz-configure/init-configure.patch
@@ -1,5 +1,5 @@
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
-index de6ff563b1241c91af2d0f9a31291c4c3b557a17..869480aebf6c4f4e2c81096f9320fcce99d493da 100644
+index 9bf4bb29a40045da21909dc1a2a49dbca5d6ac3e..e45bb12cabd7fb8a77b29e7e1e03ed3e92cd3625 100644
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -1101,7 +1101,7 @@ def milestone(build_env, build_project, version_path, as_milestone, _):
diff --git a/src/build/pgo/profileserver-py.patch b/src/build/pgo/profileserver-py.patch
index cf162035a..410baf650 100644
--- a/src/build/pgo/profileserver-py.patch
+++ b/src/build/pgo/profileserver-py.patch
@@ -1,5 +1,5 @@
diff --git a/build/pgo/profileserver.py b/build/pgo/profileserver.py
-index 31556cc9ae1a44a04e300083f7be4dc908cc3794..23ef1d8f5b30068ffdddc3c9cb6cd45e64d93071 100755
+index c59efbdc5382da897dcac31da7039cdc92e1d7dc..9b14add5b0c5afec5b7efc7f9df7d04d3169fc80 100755
--- a/build/pgo/profileserver.py
+++ b/build/pgo/profileserver.py
@@ -18,7 +18,13 @@ from mozprofile import FirefoxProfile, Preferences
diff --git a/src/devtools/startup/DevToolsStartup-sys-mjs.patch b/src/devtools/startup/DevToolsStartup-sys-mjs.patch
index 2f8609caa..e48f57e2b 100644
--- a/src/devtools/startup/DevToolsStartup-sys-mjs.patch
+++ b/src/devtools/startup/DevToolsStartup-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/devtools/startup/DevToolsStartup.sys.mjs b/devtools/startup/DevToolsStartup.sys.mjs
-index 0c9db6cb85c491a9f0fc216071afc66e553dcd51..25648d72f45ce016e3a498cab5a6f24e37c35296 100644
+index de5cd910c85a195496eddf38d85b78fb97694ef1..d10d6dfeb25bf01e86d84d3843c5a42551cac3bd 100644
--- a/devtools/startup/DevToolsStartup.sys.mjs
+++ b/devtools/startup/DevToolsStartup.sys.mjs
@@ -806,6 +806,7 @@ DevToolsStartup.prototype = {
diff --git a/src/docshell/base/nsAboutRedirector-cpp.patch b/src/docshell/base/nsAboutRedirector-cpp.patch
index aa998306b..0445eae4a 100644
--- a/src/docshell/base/nsAboutRedirector-cpp.patch
+++ b/src/docshell/base/nsAboutRedirector-cpp.patch
@@ -1,8 +1,8 @@
diff --git a/docshell/base/nsAboutRedirector.cpp b/docshell/base/nsAboutRedirector.cpp
-index b21078b00b14cdf2b66985e0caabebcf4884f291..c7ede52aaedd8eb698761fd09e792ce2f4573dd2 100644
+index e95ff966b34576439c745aa206ff534a835c956f..5691cb2baa76b7cd543bb030b7c8d3028359bc4c 100644
--- a/docshell/base/nsAboutRedirector.cpp
+++ b/docshell/base/nsAboutRedirector.cpp
-@@ -105,7 +105,7 @@ static const RedirEntry kRedirMap[] = {
+@@ -108,7 +108,7 @@ static const RedirEntry kRedirMap[] = {
{"crashes", "chrome://global/content/crashes.html",
nsIAboutModule::IS_SECURE_CHROME_UI},
#endif
diff --git a/src/dom/html/HTMLMediaElement-cpp.patch b/src/dom/html/HTMLMediaElement-cpp.patch
index 9dc7f44e3..28fd4c3af 100644
--- a/src/dom/html/HTMLMediaElement-cpp.patch
+++ b/src/dom/html/HTMLMediaElement-cpp.patch
@@ -1,5 +1,5 @@
diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp
-index 0b8dee1ca22b1f0ddcf7e6a976f606990104b56e..db31132b67a041abf6bf3e5ed68ab20380fdc293 100644
+index 677a2f25b16f4cf724b57d86a2b83acf40ec6164..e06f85366866c1cc99d27bc10cbebf2cb986e5cb 100644
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -455,6 +455,7 @@ class HTMLMediaElement::MediaControlKeyListener final
@@ -10,7 +10,7 @@ index 0b8dee1ca22b1f0ddcf7e6a976f606990104b56e..db31132b67a041abf6bf3e5ed68ab203
NotifyAudibleStateChanged(mIsOwnerAudible
? MediaAudibleState::eAudible
: MediaAudibleState::eInaudible);
-@@ -6952,6 +6953,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
+@@ -6967,6 +6968,9 @@ void HTMLMediaElement::FireTimeUpdate(TimeupdateType aType) {
DispatchAsyncEvent(std::move(runner));
mQueueTimeUpdateRunnerTime = TimeStamp::Now();
mLastCurrentTime = CurrentTime();
diff --git a/src/dom/script/ScriptLoader-cpp.patch b/src/dom/script/ScriptLoader-cpp.patch
index db493e115..aa276a3b6 100644
--- a/src/dom/script/ScriptLoader-cpp.patch
+++ b/src/dom/script/ScriptLoader-cpp.patch
@@ -1,8 +1,8 @@
diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp
-index e65533af04ea5f42c10477314c594c2c7bbc67b3..df4d63dafb838b67e64a91f26487106a77494516 100644
+index 6276dcdb031a0325c481a1ea058d513f5c153944..4aee4acd681d3337cce7799d90db0fa0d777762d 100644
--- a/dom/script/ScriptLoader.cpp
+++ b/dom/script/ScriptLoader.cpp
-@@ -2401,6 +2401,36 @@ void ScriptLoader::CalculateBytecodeCacheFlag(ScriptLoadRequest* aRequest) {
+@@ -2626,6 +2626,36 @@ void ScriptLoader::CalculateBytecodeCacheFlag(ScriptLoadRequest* aRequest) {
hasFetchCountMin = false;
break;
}
diff --git a/src/gfx/wr/webrender/src/picture-rs.patch b/src/gfx/wr/webrender/src/picture-rs.patch
index fc5e22ff7..01081c9ac 100644
--- a/src/gfx/wr/webrender/src/picture-rs.patch
+++ b/src/gfx/wr/webrender/src/picture-rs.patch
@@ -1,8 +1,8 @@
diff --git a/gfx/wr/webrender/src/picture.rs b/gfx/wr/webrender/src/picture.rs
-index f22bcadd0624d9a22f5c3fa318d7795e102b890f..68d1eb55abde2a9b5779b1d07c5f111f46f177a8 100644
+index 7a811bc074959e0f0e7e25603acc4bf50edce4dc..4954cd9b2b3c9efdbe32343152c877186751ec26 100644
--- a/gfx/wr/webrender/src/picture.rs
+++ b/gfx/wr/webrender/src/picture.rs
-@@ -7449,7 +7449,12 @@ fn get_relative_scale_offset(
+@@ -7957,7 +7957,12 @@ fn get_relative_scale_offset(
CoordinateSpaceMapping::Local => ScaleOffset::identity(),
CoordinateSpaceMapping::ScaleOffset(scale_offset) => scale_offset,
CoordinateSpaceMapping::Transform(m) => {
diff --git a/src/image/DecoderFactory-cpp.patch b/src/image/DecoderFactory-cpp.patch
index 8d3df598e..c77c28b54 100644
--- a/src/image/DecoderFactory-cpp.patch
+++ b/src/image/DecoderFactory-cpp.patch
@@ -1,5 +1,5 @@
diff --git a/image/DecoderFactory.cpp b/image/DecoderFactory.cpp
-index f36f03c7f2..d2cdd79f70 100644
+index f36f03c7f2622f0fc54c04f5278ee83cbf03e9e8..d2cdd79f70056af8dc1304d3a2f5307986aeda49 100644
--- a/image/DecoderFactory.cpp
+++ b/image/DecoderFactory.cpp
@@ -244,7 +244,12 @@ nsresult DecoderFactory::CreateAnimationDecoder(
diff --git a/src/mozglue/misc/PreXULSkeletonUI-h.patch b/src/mozglue/misc/PreXULSkeletonUI-h.patch
deleted file mode 100644
index 58bb15187..000000000
--- a/src/mozglue/misc/PreXULSkeletonUI-h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/mozglue/misc/PreXULSkeletonUI.h b/mozglue/misc/PreXULSkeletonUI.h
-index 3e91eac21adce6d1a38d92ad36459c04cc1cbe1d..8f0c9b1a65bca1c35a4f6c042712715d872b0852 100644
---- a/mozglue/misc/PreXULSkeletonUI.h
-+++ b/mozglue/misc/PreXULSkeletonUI.h
-@@ -21,8 +21,8 @@ namespace mozilla {
- // to not vary based off of any user settings for the initial toplevel window,
- // so we're safe here for now.
- static const DWORD kPreXULSkeletonUIWindowStyle =
-- WS_CLIPCHILDREN | WS_DLGFRAME | WS_BORDER | WS_MAXIMIZEBOX |
-- WS_MINIMIZEBOX | WS_SIZEBOX | WS_SYSMENU;
-+ WS_OVERLAPPED | WS_CLIPCHILDREN | WS_DLGFRAME | WS_BORDER | WS_THICKFRAME |
-+ WS_MAXIMIZEBOX | WS_MINIMIZEBOX | WS_SYSMENU;
- static const DWORD kPreXULSkeletonUIWindowStyleEx = WS_EX_WINDOWEDGE;
-
- struct CSSPixelSpan {
diff --git a/src/netwerk/protocol/http/moz-build.patch b/src/netwerk/protocol/http/moz-build.patch
index 6e4ee8edf..933d7ca65 100644
--- a/src/netwerk/protocol/http/moz-build.patch
+++ b/src/netwerk/protocol/http/moz-build.patch
@@ -1,8 +1,8 @@
diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build
-index 49d78020bc3f193d6ba7cf7bd81756f8393039dd..94c48ce0f6d59d4906c33f44c4a6ae44e11261ba 100644
+index 9a737b89b791866a522100eac99d981a06524b82..2933072d0e8390ca584d0654920b749a180f41ef 100644
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
-@@ -206,7 +206,7 @@ LOCAL_INCLUDES += [
+@@ -218,7 +218,7 @@ LOCAL_INCLUDES += [
"/netwerk/url-classifier",
]
diff --git a/src/toolkit/actors/SelectParent-sys-mjs.patch b/src/toolkit/actors/SelectParent-sys-mjs.patch
index d4bb214a2..7b508e364 100644
--- a/src/toolkit/actors/SelectParent-sys-mjs.patch
+++ b/src/toolkit/actors/SelectParent-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/actors/SelectParent.sys.mjs b/toolkit/actors/SelectParent.sys.mjs
-index fa8ce002f0cd64395d04bcd1f93f6f8a89417a62..c7d2865e8e78015e253f0ef1a82f1ec57a4fe255 100644
+index 3e1d4b73b3d84a550222827230917c10ce9b8448..1d2ada14a8ca2ee45a2abdc118068a708816365c 100644
--- a/toolkit/actors/SelectParent.sys.mjs
+++ b/toolkit/actors/SelectParent.sys.mjs
@@ -103,7 +103,7 @@ export var SelectParentHelper = {
diff --git a/src/toolkit/components/aboutconfig/content/aboutconfig-html.patch b/src/toolkit/components/aboutconfig/content/aboutconfig-html.patch
index a54a94475..fbcd20305 100644
--- a/src/toolkit/components/aboutconfig/content/aboutconfig-html.patch
+++ b/src/toolkit/components/aboutconfig/content/aboutconfig-html.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/components/aboutconfig/content/aboutconfig.html b/toolkit/components/aboutconfig/content/aboutconfig.html
-index 8962cdd86d802f536dbef9cad8928d3e7a4eebf6..b99119d95cd575abead5d3d3f720244f5fe45b3b 100644
+index 853fd8f82bd10854c7fb17a73fd10eab0a9eef52..6f5e6606ebfa95a600037b995e5c743dd5aacba5 100644
--- a/toolkit/components/aboutconfig/content/aboutconfig.html
+++ b/toolkit/components/aboutconfig/content/aboutconfig.html
@@ -34,6 +34,7 @@
diff --git a/src/toolkit/components/aboutprocesses/content/aboutProcesses-html.patch b/src/toolkit/components/aboutprocesses/content/aboutProcesses-html.patch
index 3a041706e..9e3e5641e 100644
--- a/src/toolkit/components/aboutprocesses/content/aboutProcesses-html.patch
+++ b/src/toolkit/components/aboutprocesses/content/aboutProcesses-html.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/components/aboutprocesses/content/aboutProcesses.html b/toolkit/components/aboutprocesses/content/aboutProcesses.html
-index 76a672cdc24759121bd5d7ac9c9d6f273f36403d..915fbf5cbdea9b33b3cfb1a03fb43aff177f56fb 100644
+index 3d7085f487eb8eb3fb94dcc89e390dee525d8375..94298c2cb237edce7bb344797c054ba61b9f4d24 100644
--- a/toolkit/components/aboutprocesses/content/aboutProcesses.html
+++ b/toolkit/components/aboutprocesses/content/aboutProcesses.html
@@ -20,6 +20,7 @@
diff --git a/src/toolkit/components/pictureinpicture/content/player-js.patch b/src/toolkit/components/pictureinpicture/content/player-js.patch
index ac2f0f4eb..8797e8939 100644
--- a/src/toolkit/components/pictureinpicture/content/player-js.patch
+++ b/src/toolkit/components/pictureinpicture/content/player-js.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/components/pictureinpicture/content/player.js b/toolkit/components/pictureinpicture/content/player.js
-index 9a4971d5d24dba6e543be8ea321c6be8c43ad859..b0788967e51736b1ec95daf96a1504bfd7c1dea7 100644
+index a23e4a3ef87dfe7ca74cc20abd53e5fa1b2664dd..afc9ade19441bf9e23ee91d87ee2644e952543d9 100644
--- a/toolkit/components/pictureinpicture/content/player.js
+++ b/toolkit/components/pictureinpicture/content/player.js
-@@ -722,6 +722,11 @@ let Player = {
+@@ -734,6 +734,11 @@ let Player = {
document.getElementById("large").click();
break;
}
diff --git a/src/toolkit/components/pictureinpicture/content/player-xhtml.patch b/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
index ff25ccce3..ef89eff98 100644
--- a/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
+++ b/src/toolkit/components/pictureinpicture/content/player-xhtml.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/components/pictureinpicture/content/player.xhtml b/toolkit/components/pictureinpicture/content/player.xhtml
-index 440ce51e8e67e4d3a7bdcb78f38f2fb6684c9848..38912579310314a13d516328ec770db6b589d243 100644
+index b38789882149c97a3263c405b783999bc60a5c71..009b7b7aa2ded0d88247c62171bfff59222a8e28 100644
--- a/toolkit/components/pictureinpicture/content/player.xhtml
+++ b/toolkit/components/pictureinpicture/content/player.xhtml
-@@ -17,6 +17,7 @@
+@@ -18,6 +18,7 @@
<link rel="localization" href="browser/browserSets.ftl"/>
<script src="chrome://global/content/pictureinpicture/player.js"></script>
<title data-l10n-id="pictureinpicture-player-title"></title>
@@ -10,7 +10,7 @@ index 440ce51e8e67e4d3a7bdcb78f38f2fb6684c9848..38912579310314a13d516328ec770db6
</head>
<body>
-@@ -52,13 +53,22 @@
+@@ -53,13 +54,22 @@
tabindex="10"
#endif
/>
diff --git a/src/toolkit/components/printing/content/print-html.patch b/src/toolkit/components/printing/content/print-html.patch
index ab5d5abb1..30cc88543 100644
--- a/src/toolkit/components/printing/content/print-html.patch
+++ b/src/toolkit/components/printing/content/print-html.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/components/printing/content/print.html b/toolkit/components/printing/content/print.html
-index 62d214608c24191fea013db23e96b4ae2a4042e6..59b146a594f0f882435f2d29795a65020db01f48 100644
+index 72ccab596c2f090d188f1d27278f68373e5b06be..541271c71a3df749826b7f5adbd55e76450bba8f 100644
--- a/toolkit/components/printing/content/print.html
+++ b/toolkit/components/printing/content/print.html
@@ -21,6 +21,7 @@
diff --git a/src/toolkit/components/prompts/content/commonDialog-xhtml.patch b/src/toolkit/components/prompts/content/commonDialog-xhtml.patch
index 65621ae30..82eba8cc7 100644
--- a/src/toolkit/components/prompts/content/commonDialog-xhtml.patch
+++ b/src/toolkit/components/prompts/content/commonDialog-xhtml.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/components/prompts/content/commonDialog.xhtml b/toolkit/components/prompts/content/commonDialog.xhtml
-index def3b93956ea9b9bfab5791b06040769dbda4645..ab9c61a5d816d17fb3f09c88514aca5ec0d2f193 100644
+index c47761ec958a11870e55294fe9c6de8f3afbda2f..5e0313864c67a774874c215fd043b9b8af39d8cb 100644
--- a/toolkit/components/prompts/content/commonDialog.xhtml
+++ b/toolkit/components/prompts/content/commonDialog.xhtml
-@@ -28,6 +28,7 @@
+@@ -30,6 +30,7 @@
<html:link rel="localization" href="branding/brand.ftl" />
<html:link rel="localization" href="toolkit/global/commonDialog.ftl" />
diff --git a/src/toolkit/content/aboutAbout-html.patch b/src/toolkit/content/aboutAbout-html.patch
index c474081d4..1ef1c1c94 100644
--- a/src/toolkit/content/aboutAbout-html.patch
+++ b/src/toolkit/content/aboutAbout-html.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/content/aboutAbout.html b/toolkit/content/aboutAbout.html
-index ab955bc27bf8a0bf1f28d12d92be80991e743d17..5e23f51f458344d9704ad390c8e1aa98745c7012 100644
+index 74702381dd1bed2d4bb47c464ae0ca309c10e45b..f1e6b34bbf29d787bd62d625707dead024cf6011 100644
--- a/toolkit/content/aboutAbout.html
+++ b/toolkit/content/aboutAbout.html
@@ -24,6 +24,7 @@
diff --git a/src/toolkit/content/widgets/infobar-css.patch b/src/toolkit/content/widgets/infobar-css.patch
index dae6de4cd..e9ea31ab6 100644
--- a/src/toolkit/content/widgets/infobar-css.patch
+++ b/src/toolkit/content/widgets/infobar-css.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/content/widgets/infobar.css b/toolkit/content/widgets/infobar.css
-index ee811818b524d41af2c89ac034083592dac333fb..c943f2a5a168120666132a34e71b86d608b1045e 100644
+index 7818f1ef1dcc62e184bd5e3e8d6d936acf77d2ea..4803c07a183e2df70e8fdc9769bb4bb15a73f39b 100644
--- a/toolkit/content/widgets/infobar.css
+++ b/toolkit/content/widgets/infobar.css
-@@ -97,3 +97,18 @@ strong {
+@@ -94,3 +94,18 @@ strong {
:host([type=system]) .content {
margin-inline-start: 0;
}
diff --git a/src/toolkit/content/widgets/tabbox-js.patch b/src/toolkit/content/widgets/tabbox-js.patch
index 7fe9df1f1..b58fca86d 100644
--- a/src/toolkit/content/widgets/tabbox-js.patch
+++ b/src/toolkit/content/widgets/tabbox-js.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
-index 033582a3badb65d50f58a11f8a259e28eaa04ef3..ef634d76549f0fa4d5789e2bbfb9409f44767683 100644
+index 717f0583f224be2d09a7966ee5627ebab83cc07f..af809ad8f189a11c1ab9383033483db5dcd7cf96 100644
--- a/toolkit/content/widgets/tabbox.js
+++ b/toolkit/content/widgets/tabbox.js
-@@ -210,7 +210,7 @@
+@@ -213,7 +213,7 @@
) {
this._inAsyncOperation = false;
if (oldPanel != this._selectedPanel) {
@@ -11,7 +11,7 @@ index 033582a3badb65d50f58a11f8a259e28eaa04ef3..ef634d76549f0fa4d5789e2bbfb9409f
this._selectedPanel?.classList.add("deck-selected");
}
this.setAttribute("selectedIndex", val);
-@@ -537,7 +537,7 @@
+@@ -609,7 +609,7 @@
if (!tab) {
return;
}
@@ -20,7 +20,7 @@ index 033582a3badb65d50f58a11f8a259e28eaa04ef3..ef634d76549f0fa4d5789e2bbfb9409f
if (otherTab != tab && otherTab.selected) {
otherTab._selected = false;
}
-@@ -820,7 +820,7 @@
+@@ -822,7 +822,7 @@
if (tab == startTab) {
return null;
}
@@ -29,7 +29,7 @@ index 033582a3badb65d50f58a11f8a259e28eaa04ef3..ef634d76549f0fa4d5789e2bbfb9409f
return tab;
}
}
-@@ -883,7 +883,7 @@
+@@ -887,7 +887,7 @@
let { ariaFocusedItem } = this;
let startTab = ariaFocusedItem;
if (!ariaFocusedItem || !this.allTabs.includes(ariaFocusedItem)) {
diff --git a/src/toolkit/content/xul-css.patch b/src/toolkit/content/xul-css.patch
index fb5fd2e4a..2a6d7beb1 100644
--- a/src/toolkit/content/xul-css.patch
+++ b/src/toolkit/content/xul-css.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css
-index 26c11188d3edcc9806fab7144aa0e22540a32a57..df3dbca06ede3eda1854febe314c38779f754c03 100644
+index 134acec351c818eb824e2c98fa380d99ebaf8fac..3774893d98617634150f1f85568e212d98f9404c 100644
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
-@@ -485,7 +485,8 @@ deck > *|*:not(:-moz-native-anonymous) {
+@@ -468,7 +468,8 @@ deck > *|*:not(:-moz-native-anonymous) {
}
tabpanels > .deck-selected,
diff --git a/src/toolkit/modules/AppConstants-sys-mjs.patch b/src/toolkit/modules/AppConstants-sys-mjs.patch
index 5ab1dfcfa..509134e10 100644
--- a/src/toolkit/modules/AppConstants-sys-mjs.patch
+++ b/src/toolkit/modules/AppConstants-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/modules/AppConstants.sys.mjs b/toolkit/modules/AppConstants.sys.mjs
-index a20e45c6135d24e42594700fe57184a560facd0f..7650dd88dc67d774c3af05704f2539ff92e21be2 100644
+index bf7a0ec9570a8657d192fd28c9b4852aa8869225..59f5466582757320ab1f70ec26d76fc589e0a335 100644
--- a/toolkit/modules/AppConstants.sys.mjs
+++ b/toolkit/modules/AppConstants.sys.mjs
-@@ -338,6 +338,8 @@ export var AppConstants = Object.freeze({
+@@ -174,6 +174,8 @@ export var AppConstants = Object.freeze({
MOZ_UPDATE_CHANNEL: "@MOZ_UPDATE_CHANNEL@",
MOZ_WIDGET_TOOLKIT: "@MOZ_WIDGET_TOOLKIT@",
diff --git a/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch b/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch
index 637df8c41..548e1d00e 100644
--- a/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch
+++ b/src/toolkit/modules/LightweightThemeConsumer-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/modules/LightweightThemeConsumer.sys.mjs b/toolkit/modules/LightweightThemeConsumer.sys.mjs
-index 0d3993370b4ecbdfaf87cfd3145617343c29dc39..8587f7286476ca0dcce1bb02ef02ce0dae9c4df7 100644
+index d8c79cbae4de3ebfc5dc62f3597c7be4965a5429..ba1a44a0be5b5837467cfc84074d4869aee6aa62 100644
--- a/toolkit/modules/LightweightThemeConsumer.sys.mjs
+++ b/toolkit/modules/LightweightThemeConsumer.sys.mjs
-@@ -32,7 +32,7 @@ const toolkitVariableMap = [
+@@ -31,7 +31,7 @@ const toolkitVariableMap = [
lwtProperty: "accentcolor",
processColor(rgbaChannels) {
if (!rgbaChannels || rgbaChannels.a == 0) {
@@ -11,7 +11,7 @@ index 0d3993370b4ecbdfaf87cfd3145617343c29dc39..8587f7286476ca0dcce1bb02ef02ce0d
}
// Remove the alpha channel
const { r, g, b } = rgbaChannels;
-@@ -334,6 +334,7 @@ LightweightThemeConsumer.prototype = {
+@@ -339,6 +339,7 @@ LightweightThemeConsumer.prototype = {
theme.additionalBackgrounds
);
let _processedColors = _setProperties(root, hasTheme, theme);
@@ -19,7 +19,7 @@ index 0d3993370b4ecbdfaf87cfd3145617343c29dc39..8587f7286476ca0dcce1bb02ef02ce0d
if (hasTheme) {
if (updateGlobalThemeData) {
-@@ -425,6 +426,14 @@ LightweightThemeConsumer.prototype = {
+@@ -431,6 +432,14 @@ LightweightThemeConsumer.prototype = {
this._lastExperimentData.stylesheet = stylesheet;
}
},
diff --git a/src/toolkit/modules/UpdateUtils-sys-mjs.patch b/src/toolkit/modules/UpdateUtils-sys-mjs.patch
index 501a3d7e5..0dc62554e 100644
--- a/src/toolkit/modules/UpdateUtils-sys-mjs.patch
+++ b/src/toolkit/modules/UpdateUtils-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/modules/UpdateUtils.sys.mjs b/toolkit/modules/UpdateUtils.sys.mjs
-index be9ce9d5402c30bf4a9712f1ce9026503c191a53..230882363b3e1bbe7f0977567db61f72494a19ea 100644
+index 2c8a093013d40623aa16864eca18945887add7c8..592f8a77665f8e8b4c2f64fe6ae44f3f1f3935e1 100644
--- a/toolkit/modules/UpdateUtils.sys.mjs
+++ b/toolkit/modules/UpdateUtils.sys.mjs
@@ -81,7 +81,7 @@ export var UpdateUtils = {
diff --git a/src/toolkit/modules/moz-build.patch b/src/toolkit/modules/moz-build.patch
index 822947a0a..3daf800f9 100644
--- a/src/toolkit/modules/moz-build.patch
+++ b/src/toolkit/modules/moz-build.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
-index 6ba1e92026f6f1618ce3a477f74bb6d0fa20f7c1..ccf3fa076771da7c9a5cb2bb732558cb73d810af 100644
+index dd8d6498f5b7244726274c0588dae68f8261cbc0..ac1e25707a1d2ebf191f04f9e38e092cb3f4aa27 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
-@@ -281,6 +281,7 @@ for var in (
+@@ -286,6 +286,7 @@ for var in (
"DLL_SUFFIX",
"DEBUG_JS_MODULES",
"OMNIJAR_NAME",
diff --git a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
index c0112ca2e..6884109a0 100644
--- a/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
+++ b/src/toolkit/mozapps/extensions/AddonManager-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/mozapps/extensions/AddonManager.sys.mjs b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-index 2f855e6e48f420e3782d3be31cfdfa6c40db479b..de55b4c7ff7517169ac56693b4cb3c46b3c20736 100644
+index 044e2960be887b9272509ceff2fc1a2952fd997c..326ddbc0f10fb4134f8b6116c788bef24bb2d3e8 100644
--- a/toolkit/mozapps/extensions/AddonManager.sys.mjs
+++ b/toolkit/mozapps/extensions/AddonManager.sys.mjs
-@@ -1214,12 +1214,12 @@ var AddonManagerInternal = {
+@@ -1221,12 +1221,12 @@ var AddonManagerInternal = {
ITEM_VERSION: aAddon.version,
ITEM_STATUS: addonStatus,
APP_ID: Services.appinfo.ID,
diff --git a/src/toolkit/mozapps/extensions/content/aboutaddons-html.patch b/src/toolkit/mozapps/extensions/content/aboutaddons-html.patch
index 2c6b4f5c5..26673d0f7 100644
--- a/src/toolkit/mozapps/extensions/content/aboutaddons-html.patch
+++ b/src/toolkit/mozapps/extensions/content/aboutaddons-html.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/mozapps/extensions/content/aboutaddons.html b/toolkit/mozapps/extensions/content/aboutaddons.html
-index 55d6625c0847b9ae9d4f847ad978e8dc62f98c70..4d3179c3eb04fc5d2e5e34e646aba029a7118ebc 100644
+index a075350abd62ffa34874dbd8d5a9a3f9aec3560d..5cad47c50518eeb41b4d9657fa805d8fa1dba470 100644
--- a/toolkit/mozapps/extensions/content/aboutaddons.html
+++ b/toolkit/mozapps/extensions/content/aboutaddons.html
-@@ -76,6 +76,7 @@
+@@ -73,6 +73,7 @@
type="module"
src="chrome://global/content/elements/moz-five-star.mjs"
></script>
diff --git a/src/toolkit/mozapps/extensions/internal/XPIDatabase-sys-mjs.patch b/src/toolkit/mozapps/extensions/internal/XPIDatabase-sys-mjs.patch
index 24f2f2c61..0739270f6 100644
--- a/src/toolkit/mozapps/extensions/internal/XPIDatabase-sys-mjs.patch
+++ b/src/toolkit/mozapps/extensions/internal/XPIDatabase-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
-index 17219a88b42b0954f7bd7f7ea7ae8dcad55cc77c..a059e2af3851cdfc697f7f2584bcfc2124b996a9 100644
+index f6333f54da4cd0e81ef0cdf5720d54480a9c865e..2d098b0675e3efdfd6fa1ac0fed0e293b5367b1e 100644
--- a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
+++ b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs
@@ -138,7 +138,7 @@ const KEY_APP_GLOBAL = "app-global";
@@ -11,7 +11,7 @@ index 17219a88b42b0954f7bd7f7ea7ae8dcad55cc77c..a059e2af3851cdfc697f7f2584bcfc21
// Properties to cache and reload when an addon installation is pending
const PENDING_INSTALL_METADATA = [
-@@ -1720,8 +1720,11 @@ const updatedAddonFluentIds = new Map([
+@@ -1771,8 +1771,11 @@ const updatedAddonFluentIds = new Map([
updatedAddonFluentIds.get(defaultFluentId) || defaultFluentId;
[formattedMessage] = l10n.formatMessagesSync([{ id: fluentId }]);
}
diff --git a/src/toolkit/mozapps/extensions/internal/XPIProvider-sys-mjs.patch b/src/toolkit/mozapps/extensions/internal/XPIProvider-sys-mjs.patch
index 870533b32..8bb6cf4ce 100644
--- a/src/toolkit/mozapps/extensions/internal/XPIProvider-sys-mjs.patch
+++ b/src/toolkit/mozapps/extensions/internal/XPIProvider-sys-mjs.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs b/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs
-index 6aeb6a6dc7fd46eefac6a0cd56fadaee11efc6c0..abbd17afaadfadb3f97a0553764ac35aab67116c 100644
+index 3af9a7779dd43a6ded906ceaf6768c56d53c8605..c0b597fa3f8073b9bfb4118d5352246a5b54c2d7 100644
--- a/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs
-@@ -2535,8 +2535,8 @@ export var XPIProvider = {
+@@ -2556,8 +2556,8 @@ export var XPIProvider = {
}
// Keep version in sync with toolkit/mozapps/extensions/default-theme/manifest.json
this.maybeInstallBuiltinAddon(
diff --git a/src/toolkit/profile/nsToolkitProfileService-cpp.patch b/src/toolkit/profile/nsToolkitProfileService-cpp.patch
index d1818fca3..cb275eb4c 100644
--- a/src/toolkit/profile/nsToolkitProfileService-cpp.patch
+++ b/src/toolkit/profile/nsToolkitProfileService-cpp.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/profile/nsToolkitProfileService.cpp b/toolkit/profile/nsToolkitProfileService.cpp
-index b5510497e20b6d989c9dd8fff0c04b585bdc75bd..25fd837240fd849fd26b4cb8b8172423f6f7d8fc 100644
+index c1b7a4a3c9d01e660ec85cf114a6b1513d8fb7ce..df199875663b2b7aba6a5da33987b759e4e0d41b 100644
--- a/toolkit/profile/nsToolkitProfileService.cpp
+++ b/toolkit/profile/nsToolkitProfileService.cpp
@@ -82,6 +82,8 @@ using namespace mozilla;
diff --git a/src/toolkit/themes/shared/aboutReader-css.patch b/src/toolkit/themes/shared/aboutReader-css.patch
index 650277f29..9813bea19 100644
--- a/src/toolkit/themes/shared/aboutReader-css.patch
+++ b/src/toolkit/themes/shared/aboutReader-css.patch
@@ -1,8 +1,8 @@
diff --git a/toolkit/themes/shared/aboutReader.css b/toolkit/themes/shared/aboutReader.css
-index 6e4206e2939f04639ca20f8985d2ab97b571e857..27b6dbcf9cc77d7454461e056ca91ba5055aff19 100644
+index e91ae235726ec4edfbbdfebca159622a757640e9..21f761c5706c4747f5a990fc61b5f95e2eb63b5d 100644
--- a/toolkit/themes/shared/aboutReader.css
+++ b/toolkit/themes/shared/aboutReader.css
-@@ -912,3 +912,43 @@ pre code {
+@@ -1190,3 +1190,43 @@ pre code {
display: block;
overflow: auto;
}
diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch
index ed8e74140..4879a9cb4 100644
--- a/src/toolkit/themes/shared/popup-css.patch
+++ b/src/toolkit/themes/shared/popup-css.patch
@@ -1,30 +1,30 @@
diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index 648c65a9c21dc0e670b50c82cbfb237a68a951d9..ba20bfdd8e6b9cc985977d06e166147e458f2640 100644
+index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..730fd3a9dd90343c97ecb8a3d7891242256de0da 100644
--- a/toolkit/themes/shared/popup.css
+++ b/toolkit/themes/shared/popup.css
@@ -21,8 +21,8 @@ panel {
--panel-border-color: ThreeDShadow;
--panel-width: initial;
-
+
- --panel-shadow-margin: 0px;
- --panel-shadow: 0 0 var(--panel-shadow-margin) hsla(0,0%,0%,.2);
+ --panel-shadow-margin: 10px !important;
+ --panel-shadow: var(--zen-big-shadow);
-moz-window-input-region-margin: var(--panel-shadow-margin);
margin: calc(-1 * var(--panel-shadow-margin));
-
+
@@ -30,8 +30,6 @@ panel {
--background-color-canvas: var(--panel-background);
-
+
@media (-moz-platform: linux) {
- --panel-border-radius: 8px;
- --panel-padding-block: 3px;
-
+
@media (prefers-contrast) {
--panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
-@@ -198,7 +184,6 @@ panel:where([type="arrow"]) {
+@@ -208,7 +206,6 @@ panel:where([type="arrow"]) {
}
-
+
&[animating] {
- pointer-events: none;
}
diff --git a/src/widget/cocoa/VibrancyManager-mm.patch b/src/widget/cocoa/VibrancyManager-mm.patch
index 28fe7f476..1270745ca 100644
--- a/src/widget/cocoa/VibrancyManager-mm.patch
+++ b/src/widget/cocoa/VibrancyManager-mm.patch
@@ -35,7 +35,7 @@ index 849b62c9976a7bc5fee35e074e54c8f556ed9c38..a9742c7ff30d417a18f41f9c12025919
}
}
-@@ -78,6 +95,7 @@ - (NSView*)hitTest:(NSPoint)aPoint {
+@@ -78,6 +95,7 @@ static NSVisualEffectBlendingMode VisualEffectBlendingModeForVibrancyType(
- (void)prefChanged {
self.blendingMode = VisualEffectBlendingModeForVibrancyType(mType);
diff --git a/src/xpfe/appshell/AppWindow-cpp.patch b/src/xpfe/appshell/AppWindow-cpp.patch
index a8328336e..0f5525701 100644
--- a/src/xpfe/appshell/AppWindow-cpp.patch
+++ b/src/xpfe/appshell/AppWindow-cpp.patch
@@ -1,8 +1,8 @@
diff --git a/xpfe/appshell/AppWindow.cpp b/xpfe/appshell/AppWindow.cpp
-index 69157dd642fe2f20bd77fb9e39fe3ae0c2806176..d4d0aa69ae6e3fd995255f22e1088eca0e58e959 100644
+index a5e57d3086c57c4307b2c93b2814064d752d08ed..d0a83dd574ed03028ad3e79f8f0fba868bb5bec1 100644
--- a/xpfe/appshell/AppWindow.cpp
+++ b/xpfe/appshell/AppWindow.cpp
-@@ -1845,7 +1845,7 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(
+@@ -1866,7 +1866,7 @@ nsresult AppWindow::MaybeSaveEarlyWindowPersistentValues(
}
}
From f8b6b05a25afaf746429db7fb560ab4298cf38d3 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 30 Mar 2025 10:05:54 +0200
Subject: [PATCH 067/114] refactor: improve script readability and
maintainability in recalculate-patches.sh and remove-failed-jobs.sh
---
scripts/recalculate-patches.sh | 31 +++++++++++++++----------------
scripts/remove-failed-jobs.sh | 12 ++++++------
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/scripts/recalculate-patches.sh b/scripts/recalculate-patches.sh
index 547d25093..eb51d2661 100644
--- a/scripts/recalculate-patches.sh
+++ b/scripts/recalculate-patches.sh
@@ -2,26 +2,25 @@
# Recursively find all .patch files in the current directory and its subdirectories
find src -type f -name "*.patch" | while read -r patch_file; do
- # Replace all - with . and remove the .patch extension
- new_file="${patch_file%/*}/$(basename "$patch_file" | sed 's/-/./' | sed 's/\.patch$//').patch"
- new_file="${new_file%.patch}"
- new_file="${new_file#src/}"
+ # Replace all - with . and remove the .patch extension
+ new_file="${patch_file%/*}/$(basename "$patch_file" | sed 's/-/./' | sed 's/\.patch$//').patch"
+ new_file="${new_file%.patch}"
+ new_file="${new_file#src/}"
- if [[ $new_file == *-mjs ]]; then
- new_file="${new_file/-mjs/.mjs}"
- fi
- if [[ $new_file == *-ftl ]]; then
- new_file="${new_file/-ftl/.ftl}"
- fi
+ if [[ $new_file == *-mjs ]]; then
+ new_file="${new_file/-mjs/.mjs}"
+ fi
+ if [[ $new_file == *-ftl ]]; then
+ new_file="${new_file/-ftl/.ftl}"
+ fi
- # Create the new file with the same content as the original
- npm run export ${new_file} &
+ # Create the new file with the same content as the original
+ npm run export ${new_file} &
done
-for job in `jobs -p`
-do
-echo $job
- wait $job || let "FAIL+=1"
+for job in $(jobs -p); do
+ echo $job
+ wait $job || let "FAIL+=1"
done
echo "All patches have been exported successfully."
diff --git a/scripts/remove-failed-jobs.sh b/scripts/remove-failed-jobs.sh
index b168405e2..73cd5f621 100644
--- a/scripts/remove-failed-jobs.sh
+++ b/scripts/remove-failed-jobs.sh
@@ -1,21 +1,21 @@
#!/bin/bash
gh_bulk_delete_workflow_runs() {
- local repo=$1
+ local repo=zen-browser/$1
# Ensure the repo argument is provided
if [[ -z "$repo" ]]; then
- echo "Usage: gh_bulk_delete_workflow_runs <owner/repo>"
+ echo "Usage: gh_bulk_delete_workflow_runs <repo>"
return 1
fi
# Fetch workflow runs that are cancelled, failed, or timed out
local runs
runs=$(gh api repos/$repo/actions/runs --paginate \
- | jq -r '.workflow_runs[] |
- select(.conclusion == "cancelled" or
- .conclusion == "failure" or
- .conclusion == "timed_out") |
+ | jq -r '.workflow_runs[] |
+ select(.conclusion == "cancelled" or
+ .conclusion == "failure" or
+ .conclusion == "timed_out") |
.id')
if [[ -z "$runs" ]]; then
From 2d8687a8533135c0d94b6b0406c92e97a234467a Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 30 Mar 2025 12:12:52 +0200
Subject: [PATCH 068/114] chore: update @zen-browser/surfer dependency to
version 1.11.0
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index f67283e34..2fede9abd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "MPL-2.0",
"dependencies": {
- "@zen-browser/surfer": "^1.10.6"
+ "@zen-browser/surfer": "^1.11.0"
},
"devDependencies": {
"husky": "^9.1.7",
@@ -288,9 +288,9 @@
"license": "MIT"
},
"node_modules/@zen-browser/surfer": {
- "version": "1.10.6",
- "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.10.6.tgz",
- "integrity": "sha512-DWeyLOUN1pUhj7mO9l1RGovbmwAyBDrKFnyci0WfVyyWOtDIfHREfuKyulo41jF/37DL9mARbLDeJeAmcO174A==",
+ "version": "1.11.0",
+ "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.0.tgz",
+ "integrity": "sha512-vbkO2+ZA+Pdq0iXFxBwo43T6XWM6sRbiQ4DLmXfCBO4fkoprDWgn0q4o5Whu+kvpHLn2sFsrtwjg50aafKJa6Q==",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
"async-icns": "^1.0.2",
diff --git a/package.json b/package.json
index 7a89d54e9..9a8ce94d6 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"homepage": "https://github.com/zen-browser/desktop#readme",
"dependencies": {
- "@zen-browser/surfer": "^1.10.6"
+ "@zen-browser/surfer": "^1.11.0"
},
"devDependencies": {
"husky": "^9.1.7",
From fbaea7e4199a037d1ecca5275af94d2ea674d818 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 30 Mar 2025 13:16:28 +0200
Subject: [PATCH 069/114] chore: update @zen-browser/surfer dependency to
version 1.11.1
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 2fede9abd..1122f5994 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "MPL-2.0",
"dependencies": {
- "@zen-browser/surfer": "^1.11.0"
+ "@zen-browser/surfer": "^1.11.1"
},
"devDependencies": {
"husky": "^9.1.7",
@@ -288,9 +288,9 @@
"license": "MIT"
},
"node_modules/@zen-browser/surfer": {
- "version": "1.11.0",
- "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.0.tgz",
- "integrity": "sha512-vbkO2+ZA+Pdq0iXFxBwo43T6XWM6sRbiQ4DLmXfCBO4fkoprDWgn0q4o5Whu+kvpHLn2sFsrtwjg50aafKJa6Q==",
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.1.tgz",
+ "integrity": "sha512-+eGoSP2mPP/rpxT70g6MhIew5/JBYkoVJSqNMO0FVMMrFCIsKs4j/s4JVL0H9qO3j7S5A/xHOMZnjVQ8LvLfOw==",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
"async-icns": "^1.0.2",
diff --git a/package.json b/package.json
index 9a8ce94d6..6efb09227 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"homepage": "https://github.com/zen-browser/desktop#readme",
"dependencies": {
- "@zen-browser/surfer": "^1.11.0"
+ "@zen-browser/surfer": "^1.11.1"
},
"devDependencies": {
"husky": "^9.1.7",
From 8391e6fc2ffb6833a0346d8d275fbf8f897ea050 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 30 Mar 2025 15:34:47 +0200
Subject: [PATCH 070/114] refactor: remove debug session from Windows build
workflows and update optimization flags in mozconfig files
---
.github/workflows/windows-profile-build.yml | 5 -----
.github/workflows/windows-release-build.yml | 5 -----
configs/linux/mozconfig | 2 +-
configs/macos/mozconfig | 2 ++
configs/windows/mozconfig | 2 +-
5 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index 4076fcec3..21805ac8c 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -94,11 +94,6 @@ jobs:
echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh
C:\mozilla-build\start-shell.bat $workspace_dir_current\mozilla-build-run.sh
- - name: Debug session
- if: ${{ failure() }}
- uses: WarpBuilds/action-debugger@v1.3
- timeout-minutes: 15
-
- name: Move profile data
if: ${{ matrix.arch == 'x86_64' }}
run: |
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 5cf531269..e9d95eeec 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -249,11 +249,6 @@ jobs:
ls ./dist
ls .
- - name: Debug session
- if: ${{ failure() }}
- uses: WarpBuilds/action-debugger@v1.3
- timeout-minutes: 15
-
- name: Move package for PGO upload
if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
run: |
diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig
index 82f66fb67..8d5a5082a 100644
--- a/configs/linux/mozconfig
+++ b/configs/linux/mozconfig
@@ -20,7 +20,7 @@ if test "$SURFER_COMPAT" = "x86_64"; then
fi
# Optimization flags for SURFER_COMPAT
- ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -Qvec -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
+ ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
export LDFLAGS="$LDFLAGS -Wl,-O3"
export RUSTFLAGS="$RUSTFLAGS -Clink-args=--icf=safe"
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index 6575de025..c72cd533d 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -30,6 +30,8 @@ if test "$SURFER_COMPAT" = "x86_64"; then
export CXXFLAGS="-O3 -march=nehalem"
export LDFLAGS="-Wl,-O3 -march=nehalem"
export RUSTFLAGS="-Ctarget-cpu=nehalem"
+
+ ac_add_options --disable-clang-plugin
else
ac_add_options --target=aarch64-apple-darwin
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 9240b043f..93791cda6 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -32,7 +32,7 @@ if test "$SURFER_COMPAT" = "x86_64"; then
ac_add_options --target=x86_64-pc-windows-msvc
ac_add_options --enable-eme=widevine,wmfcdm
- ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -Qvec -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
+ ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
export LDFLAGS="-Wl,-O3"
export RUSTFLAGS="-Clink-args=--icf=safe"
From e200b6080bdfc92ff5298fd73c1fdb946bd4c53b Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 30 Mar 2025 16:43:42 +0200
Subject: [PATCH 071/114] refactor: update mozconfig files to enable clang
plugin for macOS and remove it for Windows
---
configs/common/mozconfig | 3 ++-
configs/macos/mozconfig | 3 +--
configs/windows/mozconfig | 2 --
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 8267b2253..77878848e 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -32,7 +32,8 @@ fi
if test "$ZEN_RELEASE"; then
- ac_add_options --enable-clang-plugin
+ # TODO: Make this successful in builds
+ # ac_add_options --enable-clang-plugin
ac_add_options --enable-bootstrap=-sccache
ac_add_options --enable-release
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index c72cd533d..f8093dbdd 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -30,9 +30,8 @@ if test "$SURFER_COMPAT" = "x86_64"; then
export CXXFLAGS="-O3 -march=nehalem"
export LDFLAGS="-Wl,-O3 -march=nehalem"
export RUSTFLAGS="-Ctarget-cpu=nehalem"
-
- ac_add_options --disable-clang-plugin
else
+ ac_add_options --enable-clang-plugin
ac_add_options --target=aarch64-apple-darwin
ac_add_options --enable-optimize="-O3 -mcpu=apple-m1 -march=armv8.3-a+simd"
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 93791cda6..166540f66 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -25,8 +25,6 @@ fi
ac_add_options --disable-maintenance-service
ac_add_options --disable-bits-download
-ac_add_options --disable-clang-plugin
-
if test "$SURFER_COMPAT" = "x86_64"; then
ac_add_options --target=x86_64-pc-windows-msvc
From 9147e46856de603d4ab568d669f93dd844a17530 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 30 Mar 2025 16:57:12 +0200
Subject: [PATCH 072/114] refactor: enhance CustomizableUI to support vertical
tabs in the navbar
---
.../CustomizableUI-sys-mjs.patch | 29 +++++++++++++------
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
index 14ccb820c..271267661 100644
--- a/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
+++ b/src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..20248e5c0e38d4de3349687157b6aeb40339488d 100644
+index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..24dc9acd733ae401f8cdfb2351a7275d16ee46c8 100644
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -110,7 +110,18 @@ index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..20248e5c0e38d4de3349687157b6aeb4
// Handle initial state of vertical tabs.
if (isVerticalTabs) {
// Show the vertical tabs toolbar
-@@ -2744,7 +2743,6 @@ var CustomizableUIInternal = {
+@@ -1873,6 +1872,10 @@ var CustomizableUIInternal = {
+ },
+
+ insertWidgetBefore(aNode, aNextNode, aContainer, aArea) {
++ if (aArea === CustomizableUI.AREA_NAVBAR && aNode.ownerGlobal.gZenVerticalTabsManager._hasSetSingleToolbar) {
++ aContainer = aNode.ownerDocument.getElementById("zen-sidebar-top-buttons-customization-target");
++ aArea = "zen-sidebar-top-buttons";
++ }
+ this.notifyDOMChange(aNode, aNextNode, aContainer, false, () => {
+ this.setLocationAttributes(aNode, aArea);
+ aContainer.insertBefore(aNode, aNextNode);
+@@ -2744,7 +2747,6 @@ var CustomizableUIInternal = {
if (!this.isWidgetRemovable(aWidgetId)) {
return;
}
@@ -118,7 +129,7 @@ index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..20248e5c0e38d4de3349687157b6aeb4
let placements = gPlacements.get(oldPlacement.area);
let position = placements.indexOf(aWidgetId);
if (position != -1) {
-@@ -3735,7 +3733,7 @@ var CustomizableUIInternal = {
+@@ -3735,7 +3737,7 @@ var CustomizableUIInternal = {
}
},
@@ -127,7 +138,7 @@ index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..20248e5c0e38d4de3349687157b6aeb4
for (let [areaId, areaNodes] of gBuildAreas) {
let placements = gPlacements.get(areaId);
let isFirstChangedToolbar = true;
-@@ -3746,7 +3744,7 @@ var CustomizableUIInternal = {
+@@ -3746,7 +3748,7 @@ var CustomizableUIInternal = {
if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
let defaultCollapsed = area.get("defaultCollapsed");
let win = areaNode.ownerGlobal;
@@ -136,7 +147,7 @@ index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..20248e5c0e38d4de3349687157b6aeb4
win.setToolbarVisibility(
areaNode,
typeof defaultCollapsed == "string"
-@@ -4923,6 +4921,7 @@ export var CustomizableUI = {
+@@ -4923,6 +4925,7 @@ export var CustomizableUI = {
unregisterArea(aName, aDestroyPlacements) {
CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
},
@@ -144,7 +155,7 @@ index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..20248e5c0e38d4de3349687157b6aeb4
/**
* Add a widget to an area.
* If the area to which you try to add is not known to CustomizableUI,
-@@ -6916,11 +6915,11 @@ class OverflowableToolbar {
+@@ -6916,11 +6919,11 @@ class OverflowableToolbar {
parseFloat(style.paddingLeft) -
parseFloat(style.paddingRight) -
toolbarChildrenWidth;
@@ -158,7 +169,7 @@ index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..20248e5c0e38d4de3349687157b6aeb4
});
lazy.log.debug(
-@@ -6930,7 +6929,8 @@ class OverflowableToolbar {
+@@ -6930,7 +6933,8 @@ class OverflowableToolbar {
// If the target has min-width: 0, their children might actually overflow
// it, so check for both cases explicitly.
let targetContentWidth = Math.max(targetWidth, targetChildrenWidth);
@@ -168,7 +179,7 @@ index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..20248e5c0e38d4de3349687157b6aeb4
return { isOverflowing, targetContentWidth, totalAvailWidth };
}
-@@ -7024,7 +7024,7 @@ class OverflowableToolbar {
+@@ -7024,7 +7028,7 @@ class OverflowableToolbar {
}
}
if (!inserted) {
@@ -177,7 +188,7 @@ index 9392b42a1de7310719a6cc8aaf11bd857e8fa69a..20248e5c0e38d4de3349687157b6aeb4
}
child.removeAttribute("cui-anchorid");
child.removeAttribute("overflowedItem");
-@@ -7186,6 +7186,9 @@ class OverflowableToolbar {
+@@ -7186,6 +7190,9 @@ class OverflowableToolbar {
* @param {MouseEvent} aEvent the click event.
*/
#onClickDefaultListButton(aEvent) {
From a3850551c593a2a65aad706a06049d0c6d2e548f Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Sun, 30 Mar 2025 11:47:24 -0700
Subject: [PATCH 073/114] Disable jemalloc for now for windows builds
Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com>
---
configs/windows/mozconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 166540f66..255232ce0 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -30,6 +30,8 @@ if test "$SURFER_COMPAT" = "x86_64"; then
ac_add_options --target=x86_64-pc-windows-msvc
ac_add_options --enable-eme=widevine,wmfcdm
+ ac_add_options --disable-jemalloc
+
ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
export LDFLAGS="-Wl,-O3"
From 3e8402b686ba92fc45d7a93d6665d7564d1f6c6e Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 31 Mar 2025 00:20:32 +0200
Subject: [PATCH 074/114] chore: update @zen-browser/surfer dependency to
version 1.11.2
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 1122f5994..083043e33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "MPL-2.0",
"dependencies": {
- "@zen-browser/surfer": "^1.11.1"
+ "@zen-browser/surfer": "^1.11.2"
},
"devDependencies": {
"husky": "^9.1.7",
@@ -288,9 +288,9 @@
"license": "MIT"
},
"node_modules/@zen-browser/surfer": {
- "version": "1.11.1",
- "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.1.tgz",
- "integrity": "sha512-+eGoSP2mPP/rpxT70g6MhIew5/JBYkoVJSqNMO0FVMMrFCIsKs4j/s4JVL0H9qO3j7S5A/xHOMZnjVQ8LvLfOw==",
+ "version": "1.11.2",
+ "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.2.tgz",
+ "integrity": "sha512-YJA2qD4t528eeLnAXNt1jcMnTANgMTOrlo3O/6BYkWjqBxut7NI33uMV3hEIX6zCI0vUxISrbNqkGgiijt5+Rw==",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
"async-icns": "^1.0.2",
diff --git a/package.json b/package.json
index 6efb09227..0e38400a8 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"homepage": "https://github.com/zen-browser/desktop#readme",
"dependencies": {
- "@zen-browser/surfer": "^1.11.1"
+ "@zen-browser/surfer": "^1.11.2"
},
"devDependencies": {
"husky": "^9.1.7",
From baf2bc9527696df76cd03dfe1c4b682cbb3e1817 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Mon, 31 Mar 2025 00:41:07 +0200
Subject: [PATCH 075/114] chore: update @zen-browser/surfer dependency to
version 1.11.3 and adjust build scripts for Windows
---
.github/workflows/windows-profile-build.yml | 3 +--
configs/windows/mozconfig | 2 +-
package-lock.json | 8 ++++----
package.json | 2 +-
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index 21805ac8c..39ee7f0d0 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -65,7 +65,7 @@ jobs:
- name: Setup
run: |
(New-Object System.Net.WebClient).DownloadFile("https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe", "C:\MozillaBuildSetup-Latest.exe")
- C:\MozillaBuildSetup-Latest.exe /S | out-null
+ C:\MozillaBuildSetup-Latest.exe /S
- name: Download Firefox and dependencies
if: ${{ matrix.arch == 'x86_64' }}
@@ -90,7 +90,6 @@ jobs:
echo "cd $workspace_dir" '' >> mozilla-build-run.sh
echo 'export PATH=/c/mozilla-build/msys2/usr/bin:$PATH' '' >> mozilla-build-run.sh
echo './mach --no-interactive bootstrap --application-choice browser' '' >> mozilla-build-run.sh
- echo 'ls /c/Users/runneradmin/.mozbuild/clang/bin' '' >> mozilla-build-run.sh
echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh
C:\mozilla-build\start-shell.bat $workspace_dir_current\mozilla-build-run.sh
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 255232ce0..159f2fea9 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -30,7 +30,7 @@ if test "$SURFER_COMPAT" = "x86_64"; then
ac_add_options --target=x86_64-pc-windows-msvc
ac_add_options --enable-eme=widevine,wmfcdm
- ac_add_options --disable-jemalloc
+# ac_add_options --disable-jemalloc
ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
diff --git a/package-lock.json b/package-lock.json
index 083043e33..3441e7ae0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "MPL-2.0",
"dependencies": {
- "@zen-browser/surfer": "^1.11.2"
+ "@zen-browser/surfer": "^1.11.3"
},
"devDependencies": {
"husky": "^9.1.7",
@@ -288,9 +288,9 @@
"license": "MIT"
},
"node_modules/@zen-browser/surfer": {
- "version": "1.11.2",
- "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.2.tgz",
- "integrity": "sha512-YJA2qD4t528eeLnAXNt1jcMnTANgMTOrlo3O/6BYkWjqBxut7NI33uMV3hEIX6zCI0vUxISrbNqkGgiijt5+Rw==",
+ "version": "1.11.3",
+ "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.3.tgz",
+ "integrity": "sha512-VOxHeCNenL6F5IreNraEpkXYrrqun3vWp+5AEJ6TqPt64+KYs24AAtGhIiiwqCTfp5Tq2dWicGOwcV9JztLF2w==",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
"async-icns": "^1.0.2",
diff --git a/package.json b/package.json
index 0e38400a8..54b56523c 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"homepage": "https://github.com/zen-browser/desktop#readme",
"dependencies": {
- "@zen-browser/surfer": "^1.11.2"
+ "@zen-browser/surfer": "^1.11.3"
},
"devDependencies": {
"husky": "^9.1.7",
From b5abda5054effee7e446c02148899cbfa620be7e Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Mon, 31 Mar 2025 14:06:27 +0700
Subject: [PATCH 076/114] fix: handle undefined ZenWorkspaces in tab selection
---
src/toolkit/content/widgets/tabbox-js.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/toolkit/content/widgets/tabbox-js.patch b/src/toolkit/content/widgets/tabbox-js.patch
index b58fca86d..5b689ab4a 100644
--- a/src/toolkit/content/widgets/tabbox-js.patch
+++ b/src/toolkit/content/widgets/tabbox-js.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
-index 717f0583f224be2d09a7966ee5627ebab83cc07f..af809ad8f189a11c1ab9383033483db5dcd7cf96 100644
+index 717f0583f224be2d09a7966ee5627ebab83cc07f..ec251b99562f2a9b6dcfecc4588e44bbff315612 100644
--- a/toolkit/content/widgets/tabbox.js
+++ b/toolkit/content/widgets/tabbox.js
@@ -213,7 +213,7 @@
@@ -16,7 +16,7 @@ index 717f0583f224be2d09a7966ee5627ebab83cc07f..af809ad8f189a11c1ab9383033483db5
return;
}
- for (let otherTab of this.allTabs) {
-+ for (let otherTab of ZenWorkspaces.allStoredTabs) {
++ for (let otherTab of window.ZenWorkspaces?.allStoredTabs ?? this.allTabs) {
if (otherTab != tab && otherTab.selected) {
otherTab._selected = false;
}
From 006eb1b1e7045025fbe77146e84083d2df83fc66 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 31 Mar 2025 16:43:58 +0200
Subject: [PATCH 077/114] chore: update @zen-browser/surfer dependency to
version 1.11.4
---
package-lock.json | 9 +++++----
package.json | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 3441e7ae0..54a7fc6d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "MPL-2.0",
"dependencies": {
- "@zen-browser/surfer": "^1.11.3"
+ "@zen-browser/surfer": "^1.11.4"
},
"devDependencies": {
"husky": "^9.1.7",
@@ -288,9 +288,10 @@
"license": "MIT"
},
"node_modules/@zen-browser/surfer": {
- "version": "1.11.3",
- "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.3.tgz",
- "integrity": "sha512-VOxHeCNenL6F5IreNraEpkXYrrqun3vWp+5AEJ6TqPt64+KYs24AAtGhIiiwqCTfp5Tq2dWicGOwcV9JztLF2w==",
+ "version": "1.11.4",
+ "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.4.tgz",
+ "integrity": "sha512-RTb+uM5GYMSmXqv7VW1F4ElJYuQVqiEoRQyJgK2GqLHnh1zj1KQ05dVGMzlz0XXATq7VFB92aRLL1f7opyZa+w==",
+ "license": "MPL-2.0",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
"async-icns": "^1.0.2",
diff --git a/package.json b/package.json
index 54b56523c..b4550aff0 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"homepage": "https://github.com/zen-browser/desktop#readme",
"dependencies": {
- "@zen-browser/surfer": "^1.11.3"
+ "@zen-browser/surfer": "^1.11.4"
},
"devDependencies": {
"husky": "^9.1.7",
From 16d125aa20f67736e3b9336da0aa4795c422ec88 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 31 Mar 2025 16:48:19 +0200
Subject: [PATCH 078/114] Made tab unloader properly work with workspaces
---
src/browser/base/zen-components/ZenTabUnloader.mjs | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/browser/base/zen-components/ZenTabUnloader.mjs b/src/browser/base/zen-components/ZenTabUnloader.mjs
index 07ea6a373..cf3015532 100644
--- a/src/browser/base/zen-components/ZenTabUnloader.mjs
+++ b/src/browser/base/zen-components/ZenTabUnloader.mjs
@@ -113,7 +113,7 @@
}
const currentTimestamp = Date.now();
const excludedUrls = this.excludedUrls;
- const tabs = gBrowser.tabs;
+ const tabs = ZenWorkspaces.allStoredTabs;
for (let i = 0; i < tabs.length; i++) {
const tab = tabs[i];
if (this.unloader.canUnloadTab(tab, currentTimestamp, excludedUrls)) {
@@ -197,10 +197,6 @@
tab.lastActivity = currentTimestamp;
}
- get tabs() {
- return gBrowser.tabs;
- }
-
insertIntoContextMenu() {
const element = window.MozXULElement.parseXULToFragment(`
<menuseparator/>
From 7abae9d69ec23eccf82e68c137b467f58f7405c9 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Mon, 31 Mar 2025 21:59:16 +0700
Subject: [PATCH 079/114] feat: add backwards compatibility for moz-bool-pref
after removal
---
.../style/gecko/media_features-rs.patch | 54 +++++++++++++++++++
.../components/style/queries/feature-rs.patch | 20 +++++++
.../style/queries/feature_expression-rs.patch | 50 +++++++++++++++++
3 files changed, 124 insertions(+)
create mode 100644 src/servo/components/style/gecko/media_features-rs.patch
create mode 100644 src/servo/components/style/queries/feature-rs.patch
create mode 100644 src/servo/components/style/queries/feature_expression-rs.patch
diff --git a/src/servo/components/style/gecko/media_features-rs.patch b/src/servo/components/style/gecko/media_features-rs.patch
new file mode 100644
index 000000000..ded31c694
--- /dev/null
+++ b/src/servo/components/style/gecko/media_features-rs.patch
@@ -0,0 +1,54 @@
+diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs
+index 2baf0df323c83107a9a38e76bda3a273892b121e..f14fc90e048534f7345be102783e0669fa03ae75 100644
+--- a/servo/components/style/gecko/media_features.rs
++++ b/servo/components/style/gecko/media_features.rs
+@@ -9,10 +9,13 @@ use crate::gecko_bindings::structs;
+ use crate::media_queries::{Device, MediaType};
+ use crate::queries::feature::{AllowsRanges, Evaluator, FeatureFlags, QueryFeatureDescription};
+ use crate::queries::values::Orientation;
++use crate::queries::condition::MozPrefFeatureValue;
+ use crate::values::computed::{CSSPixelLength, Context, Ratio, Resolution};
+ use crate::values::specified::color::ForcedColors;
++use crate::values::AtomString;
+ use app_units::Au;
+ use euclid::default::Size2D;
++use selectors::kleene_value::KleeneValue;
+
+ fn device_size(device: &Device) -> Size2D<Au> {
+ let mut width = 0;
+@@ -615,6 +618,13 @@ fn eval_moz_overlay_scrollbars(context: &Context) -> bool {
+ unsafe { bindings::Gecko_MediaFeatures_UseOverlayScrollbars(context.device().document()) }
+ }
+
++fn eval_moz_bool_pref(_: &Context, pref: Option<&AtomString>) -> KleeneValue {
++ let Some(pref) = pref else {
++ return KleeneValue::False;
++ };
++ KleeneValue::from(unsafe { bindings::Gecko_EvalMozPrefFeature(pref.as_ptr(), &MozPrefFeatureValue::<i32>::None) })
++}
++
+ fn get_lnf_int(int_id: i32) -> i32 {
+ unsafe { bindings::Gecko_GetLookAndFeelInt(int_id) }
+ }
+@@ -662,7 +672,7 @@ macro_rules! lnf_int_feature {
+ /// to support new types in these entries and (2) ensuring that either
+ /// nsPresContext::MediaFeatureValuesChanged is called when the value that
+ /// would be returned by the evaluator function could change.
+-pub static MEDIA_FEATURES: [QueryFeatureDescription; 61] = [
++pub static MEDIA_FEATURES: [QueryFeatureDescription; 62] = [
+ feature!(
+ atom!("width"),
+ AllowsRanges::Yes,
+@@ -927,6 +937,12 @@ pub static MEDIA_FEATURES: [QueryFeatureDescription; 61] = [
+ Evaluator::BoolInteger(eval_moz_overlay_scrollbars),
+ FeatureFlags::CHROME_AND_UA_ONLY,
+ ),
++ feature!(
++ atom!("-moz-bool-pref"),
++ AllowsRanges::No,
++ Evaluator::String(eval_moz_bool_pref),
++ FeatureFlags::CHROME_AND_UA_ONLY,
++ ),
+ lnf_int_feature!(
+ atom!("-moz-scrollbar-start-backward"),
+ ScrollArrowStyle,
diff --git a/src/servo/components/style/queries/feature-rs.patch b/src/servo/components/style/queries/feature-rs.patch
new file mode 100644
index 000000000..f9f6ae27e
--- /dev/null
+++ b/src/servo/components/style/queries/feature-rs.patch
@@ -0,0 +1,20 @@
+diff --git a/servo/components/style/queries/feature.rs b/servo/components/style/queries/feature.rs
+index a9a4decb178234037a6d285ddd3206bd52f214e5..18ea220a14cbb59ef3c9809cb679f8fdb5352f98 100644
+--- a/servo/components/style/queries/feature.rs
++++ b/servo/components/style/queries/feature.rs
+@@ -6,6 +6,7 @@
+
+ use crate::parser::ParserContext;
+ use crate::values::computed::{self, CSSPixelLength, Ratio, Resolution};
++use crate::values::AtomString;
+ use crate::Atom;
+ use cssparser::Parser;
+ use selectors::kleene_value::KleeneValue;
+@@ -44,6 +45,7 @@ pub enum Evaluator {
+ OptionalNumberRatio(QueryFeatureGetter<Option<Ratio>>),
+ /// A resolution.
+ Resolution(QueryFeatureGetter<Resolution>),
++ String(fn(&computed::Context, Option<&AtomString>) -> KleeneValue),
+ /// A keyword value.
+ Enumerated {
+ /// The parser to get a discriminant given a string.
diff --git a/src/servo/components/style/queries/feature_expression-rs.patch b/src/servo/components/style/queries/feature_expression-rs.patch
new file mode 100644
index 000000000..1ec0d6303
--- /dev/null
+++ b/src/servo/components/style/queries/feature_expression-rs.patch
@@ -0,0 +1,50 @@
+diff --git a/servo/components/style/queries/feature_expression.rs b/servo/components/style/queries/feature_expression.rs
+index 31ba4839aacf740eae4a753c17ee34d9e13562eb..e59bea9cd82d85ff6b195051fef595a45dff520c 100644
+--- a/servo/components/style/queries/feature_expression.rs
++++ b/servo/components/style/queries/feature_expression.rs
+@@ -11,7 +11,7 @@ use crate::parser::{Parse, ParserContext};
+ use crate::str::{starts_with_ignore_ascii_case, string_as_ascii_lowercase};
+ use crate::values::computed::{self, Ratio, ToComputedValue};
+ use crate::values::specified::{Integer, Length, Number, Resolution};
+-use crate::values::CSSFloat;
++use crate::values::{AtomString, CSSFloat};
+ use crate::{Atom, Zero};
+ use cssparser::{Parser, Token};
+ use selectors::kleene_value::KleeneValue;
+@@ -639,6 +639,10 @@ impl QueryFeatureExpression {
+ .map(|v| *expect!(Enumerated, v));
+ return evaluator(context, computed);
+ },
++ Evaluator::String(evaluator) => {
++ let string = self.kind.non_ranged_value().map(|v| expect!(String, v));
++ return evaluator(context, string);
++ },
+ Evaluator::BoolInteger(eval) => {
+ let computed = self
+ .kind
+@@ -677,6 +681,7 @@ pub enum QueryExpressionValue {
+ /// An enumerated value, defined by the variant keyword table in the
+ /// feature's `mData` member.
+ Enumerated(KeywordDiscriminant),
++ String(AtomString),
+ }
+
+ impl QueryExpressionValue {
+@@ -695,6 +700,7 @@ impl QueryExpressionValue {
+ Evaluator::Enumerated { serializer, .. } => dest.write_str(&*serializer(value)),
+ _ => unreachable!(),
+ },
++ QueryExpressionValue::String(ref s) => s.to_css(dest),
+ }
+ }
+
+@@ -732,6 +738,9 @@ impl QueryExpressionValue {
+ Evaluator::Resolution(..) => {
+ QueryExpressionValue::Resolution(Resolution::parse(context, input)?)
+ },
++ Evaluator::String(..) => {
++ QueryExpressionValue::String(input.expect_string()?.as_ref().into())
++ },
+ Evaluator::Enumerated { parser, .. } => {
+ QueryExpressionValue::Enumerated(parser(context, input)?)
+ },
From 5ef7690578466bda8516077d13d88c8a7bac718f Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 31 Mar 2025 17:51:47 +0200
Subject: [PATCH 080/114] chore: update @zen-browser/surfer dependency to
version 1.11.5
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 54a7fc6d0..d830c17f7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "MPL-2.0",
"dependencies": {
- "@zen-browser/surfer": "^1.11.4"
+ "@zen-browser/surfer": "^1.11.5"
},
"devDependencies": {
"husky": "^9.1.7",
@@ -288,9 +288,9 @@
"license": "MIT"
},
"node_modules/@zen-browser/surfer": {
- "version": "1.11.4",
- "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.4.tgz",
- "integrity": "sha512-RTb+uM5GYMSmXqv7VW1F4ElJYuQVqiEoRQyJgK2GqLHnh1zj1KQ05dVGMzlz0XXATq7VFB92aRLL1f7opyZa+w==",
+ "version": "1.11.5",
+ "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.5.tgz",
+ "integrity": "sha512-De/ckGkUhUzAp8tnexHHUkP8Jg+KXhygn/7kto/rhZHt1GCujYODd9KAWMNf+gZJDpG/EHEqewkvKO8GQhEHNA==",
"license": "MPL-2.0",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
diff --git a/package.json b/package.json
index b4550aff0..055f4cb70 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"homepage": "https://github.com/zen-browser/desktop#readme",
"dependencies": {
- "@zen-browser/surfer": "^1.11.4"
+ "@zen-browser/surfer": "^1.11.5"
},
"devDependencies": {
"husky": "^9.1.7",
From 40b80a21ddcaaca192246f757f7a8269eb3115a9 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 31 Mar 2025 17:56:49 +0200
Subject: [PATCH 081/114] chore: update @zen-browser/surfer dependency to
version 1.11.6
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index d830c17f7..89ee41630 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "1.0.0",
"license": "MPL-2.0",
"dependencies": {
- "@zen-browser/surfer": "^1.11.5"
+ "@zen-browser/surfer": "^1.11.6"
},
"devDependencies": {
"husky": "^9.1.7",
@@ -288,9 +288,9 @@
"license": "MIT"
},
"node_modules/@zen-browser/surfer": {
- "version": "1.11.5",
- "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.5.tgz",
- "integrity": "sha512-De/ckGkUhUzAp8tnexHHUkP8Jg+KXhygn/7kto/rhZHt1GCujYODd9KAWMNf+gZJDpG/EHEqewkvKO8GQhEHNA==",
+ "version": "1.11.6",
+ "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.6.tgz",
+ "integrity": "sha512-oKYjpNTPZV3vRxDf7r7pkvYlyNwL8cpsVbVzlb57xCwn7lamXsUioh1mLCSounJ+8cl8bWXhezrnXKXbVjyGww==",
"license": "MPL-2.0",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
diff --git a/package.json b/package.json
index 055f4cb70..87ece0a86 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
},
"homepage": "https://github.com/zen-browser/desktop#readme",
"dependencies": {
- "@zen-browser/surfer": "^1.11.5"
+ "@zen-browser/surfer": "^1.11.6"
},
"devDependencies": {
"husky": "^9.1.7",
From c10c8ac7a72385d8ab18e22f9d1c7e3e3abfe3ef Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Mon, 31 Mar 2025 23:27:52 +0700
Subject: [PATCH 082/114] chore: move imports
---
.../components/style/gecko/media_features-rs.patch | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/servo/components/style/gecko/media_features-rs.patch b/src/servo/components/style/gecko/media_features-rs.patch
index ded31c694..94ba5a6f0 100644
--- a/src/servo/components/style/gecko/media_features-rs.patch
+++ b/src/servo/components/style/gecko/media_features-rs.patch
@@ -1,18 +1,14 @@
diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs
-index 2baf0df323c83107a9a38e76bda3a273892b121e..f14fc90e048534f7345be102783e0669fa03ae75 100644
+index 2baf0df323c83107a9a38e76bda3a273892b121e..8d03eeb78638c7c1bfc2cfff59571c76af11a607 100644
--- a/servo/components/style/gecko/media_features.rs
+++ b/servo/components/style/gecko/media_features.rs
-@@ -9,10 +9,13 @@ use crate::gecko_bindings::structs;
- use crate::media_queries::{Device, MediaType};
- use crate::queries::feature::{AllowsRanges, Evaluator, FeatureFlags, QueryFeatureDescription};
- use crate::queries::values::Orientation;
-+use crate::queries::condition::MozPrefFeatureValue;
- use crate::values::computed::{CSSPixelLength, Context, Ratio, Resolution};
+@@ -13,6 +13,9 @@ use crate::values::computed::{CSSPixelLength, Context, Ratio, Resolution};
use crate::values::specified::color::ForcedColors;
-+use crate::values::AtomString;
use app_units::Au;
use euclid::default::Size2D;
++use crate::queries::condition::MozPrefFeatureValue;
+use selectors::kleene_value::KleeneValue;
++use crate::values::AtomString;
fn device_size(device: &Device) -> Size2D<Au> {
let mut width = 0;
From 2010c3a5c75ef1b087b5dfb0d6760131bea69fcb Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 31 Mar 2025 19:01:59 +0200
Subject: [PATCH 083/114] fix: update branding options in mozconfig and adjust
JS preference handling
---
configs/common/mozconfig | 1 -
src/browser/branding/branding-common-mozbuild.patch | 13 +++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 src/browser/branding/branding-common-mozbuild.patch
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 77878848e..7c8ed9076 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -1,7 +1,6 @@
# Browser branding
ac_add_options --with-app-name=${binName}
ac_add_options --with-app-basename=Zen
-ac_add_options --enable-official-branding
# Localization (Must be an absolute path)
ac_add_options --with-l10n-base="${topsrcdir}/browser/locales"
diff --git a/src/browser/branding/branding-common-mozbuild.patch b/src/browser/branding/branding-common-mozbuild.patch
new file mode 100644
index 000000000..174ffe87e
--- /dev/null
+++ b/src/browser/branding/branding-common-mozbuild.patch
@@ -0,0 +1,13 @@
+diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
+index a38663a3dc1ebe0c0817945efc2f72018bc1b3c7..8d9d314a718018ae074f1fb89d93dbfdcc51f36f 100644
+--- a/browser/branding/branding-common.mozbuild
++++ b/browser/branding/branding-common.mozbuild
+@@ -12,7 +12,7 @@ def FirefoxBranding():
+ "pref/firefox-branding.js",
+ ]
+ else:
+- JS_PREFERENCE_FILES += [
++ JS_PREFERENCE_PP_FILES += [
+ "pref/firefox-branding.js",
+ ]
+
From e6997560931189dcd22ee0511d809f1bb57e4ab0 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 31 Mar 2025 19:42:31 +0200
Subject: [PATCH 084/114] fix: improve tab dragging behavior and enhance split
view session restoration
---
.../base/zen-components/ZenPinnedTabManager.mjs | 6 +++++-
.../base/zen-components/ZenViewSplitter.mjs | 5 ++++-
src/toolkit/themes/shared/popup-css.patch | 15 ++++++++++++++-
3 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index d091e0f2e..69df77ee4 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -781,7 +781,11 @@
newIndex++;
}
}
- gBrowser.moveTabTo(draggedTab, newIndex);
+ // If it's the last tab, move it to the end
+ if (tabsTarget === gBrowser.tabs.at(-1)) {
+ newIndex++;
+ }
+ gBrowser.moveTabTo(draggedTab, newIndex, { forceStandaloneTab: true });
}
}
}
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index dd6634747..ff75601ea 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -982,6 +982,9 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
}
}
+ if (this._sessionRestoring) {
+ return;
+ }
this.activateSplitView(group, true);
return;
}
@@ -1776,7 +1779,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
onAfterWorkspaceSessionRestore() {
- if (this.currentView >= 0 && !gBrowser.selectedTab.pinned) {
+ if (gBrowser.selectedTab.group?.hasAttribute("split-view-group") && !gBrowser.selectedTab.pinned) {
// Activate all browsers in the split view
this.currentView = -1;
this.onLocationChange(gBrowser.selectedTab.linkedBrowser);
diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch
index 4879a9cb4..f30f4c52f 100644
--- a/src/toolkit/themes/shared/popup-css.patch
+++ b/src/toolkit/themes/shared/popup-css.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..730fd3a9dd90343c97ecb8a3d7891242256de0da 100644
+index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..4827373b138dd59dd4adc5289adef95ef2410090 100644
--- a/toolkit/themes/shared/popup.css
+++ b/toolkit/themes/shared/popup.css
@@ -21,8 +21,8 @@ panel {
@@ -22,6 +22,19 @@ index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..730fd3a9dd90343c97ecb8a3d7891242
@media (prefers-contrast) {
--panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
+@@ -54,9 +52,9 @@ panel {
+ -moz-default-appearance: menupopup;
+ /* The blur behind doesn't blur all that much, add a semi-transparent
+ * background to improve contrast */
+- --panel-background: light-dark(rgba(255, 255, 255, .5), rgba(0, 0, 0, .5));
+- --panel-border-color: transparent;
+- --panel-shadow-margin: 0px;
++ --panel-background: light-dark(rgba(255, 255, 255, .5), rgba(0, 0, 0, .5)) !important;
++ --panel-border-color: transparent !important;
++ --panel-shadow-margin: 0px !important;
+ }
+
+ @media (-moz-platform: macos) {
@@ -208,7 +206,6 @@ panel:where([type="arrow"]) {
}
From ddf4afdd787025f58d635d2bd4187885f2e4c54f Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 31 Mar 2025 19:42:51 +0200
Subject: [PATCH 085/114] fix: standardize quote style in ZenViewSplitter for
consistency
---
src/browser/base/zen-components/ZenViewSplitter.mjs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index ff75601ea..c8951caec 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -1779,7 +1779,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
onAfterWorkspaceSessionRestore() {
- if (gBrowser.selectedTab.group?.hasAttribute("split-view-group") && !gBrowser.selectedTab.pinned) {
+ if (gBrowser.selectedTab.group?.hasAttribute('split-view-group') && !gBrowser.selectedTab.pinned) {
// Activate all browsers in the split view
this.currentView = -1;
this.onLocationChange(gBrowser.selectedTab.linkedBrowser);
From 1f709f93507d02c199ec3a75e32711923394231d Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Mon, 31 Mar 2025 21:23:54 +0200
Subject: [PATCH 086/114] fix: remove obsolete branding-common-mozbuild.patch
file
---
src/browser/branding/branding-common-mozbuild.patch | 13 -------------
1 file changed, 13 deletions(-)
delete mode 100644 src/browser/branding/branding-common-mozbuild.patch
diff --git a/src/browser/branding/branding-common-mozbuild.patch b/src/browser/branding/branding-common-mozbuild.patch
deleted file mode 100644
index 174ffe87e..000000000
--- a/src/browser/branding/branding-common-mozbuild.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
-index a38663a3dc1ebe0c0817945efc2f72018bc1b3c7..8d9d314a718018ae074f1fb89d93dbfdcc51f36f 100644
---- a/browser/branding/branding-common.mozbuild
-+++ b/browser/branding/branding-common.mozbuild
-@@ -12,7 +12,7 @@ def FirefoxBranding():
- "pref/firefox-branding.js",
- ]
- else:
-- JS_PREFERENCE_FILES += [
-+ JS_PREFERENCE_PP_FILES += [
- "pref/firefox-branding.js",
- ]
-
From 32c56d718cd5e8e078fe8a5043230fa253cbe50c Mon Sep 17 00:00:00 2001
From: mr-cheff <91018726+mr-cheff@users.noreply.github.com>
Date: Tue, 1 Apr 2025 02:42:18 +0000
Subject: [PATCH 087/114] Update monthly issue metrics
---
.../2025_2025-03-01..2025-03-31.md | 176 ++++++++++++++++--
1 file changed, 164 insertions(+), 12 deletions(-)
diff --git a/docs/issue-metrics/2025_2025-03-01..2025-03-31.md b/docs/issue-metrics/2025_2025-03-01..2025-03-31.md
index 2f7ede2af..2593b4024 100644
--- a/docs/issue-metrics/2025_2025-03-01..2025-03-31.md
+++ b/docs/issue-metrics/2025_2025-03-01..2025-03-31.md
@@ -2,20 +2,172 @@
| Metric | Average | Median | 90th percentile |
| --- | --- | --- | ---: |
-| Time to first response | 6 days, 20:41:49 | 2 days, 2:42:34 | 22 days, 1:54:23 |
-| Time to close | 10 days, 15:55:03 | 8 days, 17:32:26 | 24 days, 2:11:50 |
+| Time to first response | 6 days, 10:31:09 | 1 day, 13:35:42 | 21 days, 22:01:40 |
+| Time to close | 10 days, 7:50:06 | 8 days, 4:52:44 | 24 days, 0:59:33 |
| Metric | Count |
| --- | ---: |
-| Number of items that remain open | 17 |
-| Number of items closed | 725 |
-| Total number of items created | 742 |
+| Number of items that remain open | 145 |
+| Number of items closed | 749 |
+| Total number of items created | 894 |
| Title | URL | Time to first response | Time to close |
| --- | --- | --- | --- |
-| Mac OS Browser thinks there's one more tab open than there actually is | https://github.com/zen-browser/desktop/issues/6980 | None | None |
-| Scroll bar can't be scrolled from the right edge of the window (Windows) | https://github.com/zen-browser/desktop/issues/6979 | None | None |
-| Close tab buttons slightly cut off when in compact mode (Windows) | https://github.com/zen-browser/desktop/issues/6978 | None | None |
+| After the recent updates, web fonts are blurry | https://github.com/zen-browser/desktop/issues/7160 | None | None |
+| [Twilight 1.10.3] Many context menus have too much transparency | https://github.com/zen-browser/desktop/issues/7159 | 0:22:16 | None |
+| Zen crashes when trying to access chrome://browser/content/browser.xhtml | https://github.com/zen-browser/desktop/issues/7158 | None | None |
+| Open network login page | https://github.com/zen-browser/desktop/issues/7157 | None | None |
+| Enabling HDR Causes Visual Artifact on UI Elements | https://github.com/zen-browser/desktop/issues/7155 | None | None |
+| Pinterest opening and working weirdly | https://github.com/zen-browser/desktop/issues/7153 | None | None |
+| Blocking "Override keyboard shortcuts" permission disables delete and backspace keys | https://github.com/zen-browser/desktop/issues/7150 | None | None |
+| Hovering over tabs now displays an x to close them | https://github.com/zen-browser/desktop/issues/7149 | None | None |
+| Sorry for what? | https://github.com/zen-browser/desktop/issues/7146 | 0:45:11 | 3:22:37 |
+| Simple tab group is locked loading in a new window | https://github.com/zen-browser/desktop/issues/7145 | None | None |
+| Authentication on sites via a certificate (such as a Smart Card) broken on macOS since 1.10b | https://github.com/zen-browser/desktop/issues/7144 | None | None |
+| Browser flickers when using mission control | https://github.com/zen-browser/desktop/issues/7143 | 1:08:33 | None |
+| Workspace icons automatically pinned on Toolbar when removed from Sidebar | https://github.com/zen-browser/desktop/issues/7140 | None | None |
+| Mac OS Browser thinks there's one more tab open than there actually is | https://github.com/zen-browser/desktop/issues/7139 | None | None |
+| When using split view in incognito window, zen crashes, freezes after opening new tab & close tab. | https://github.com/zen-browser/desktop/issues/7136 | None | None |
+| Problem with Context Menu and Pop-ups: Can Only Close with Escape | https://github.com/zen-browser/desktop/issues/7135 | None | None |
+| websites not loading ! | https://github.com/zen-browser/desktop/issues/7134 | 6:12:15 | None |
+| Twilight build auto-switching url from one workspace to another causes Zen to break | https://github.com/zen-browser/desktop/issues/7133 | 3:02:54 | None |
+| Web fonts are blurry with zen.view.experimental-rounded-view or GTK CSD on linux | https://github.com/zen-browser/desktop/issues/7132 | 3:25:04 | None |
+| Renamed pinned tab changes title upon loading, when unloading title changes back to previously set name | https://github.com/zen-browser/desktop/issues/7131 | None | None |
+| Open in split window in split window undefined behaviour | https://github.com/zen-browser/desktop/issues/7130 | None | None |
+| Close buttons on Mac positioned wrong when sidebar is collapsed | https://github.com/zen-browser/desktop/issues/7129 | None | None |
+| Inconsistent behaviour of middle click and right click -> new tab | https://github.com/zen-browser/desktop/issues/7128 | None | None |
+| Zen displayed as "Unknown App" in windows system media player | https://github.com/zen-browser/desktop/issues/7123 | 0:14:54 | None |
+| Search shortcuts are hardly usable with new URL bar popover | https://github.com/zen-browser/desktop/issues/7122 | None | 0:04:44 |
+| Dragging link from tab to same workspace in different window causes container indicator to show up | https://github.com/zen-browser/desktop/issues/7120 | None | None |
+| Pinned tab separator inconsistent width | https://github.com/zen-browser/desktop/issues/7119 | None | None |
+| Inconsistent spacing in compact modes | https://github.com/zen-browser/desktop/issues/7118 | None | None |
+| Sidebar/Tab Bar navigation buttons overflow | https://github.com/zen-browser/desktop/issues/7117 | None | None |
+| No default favicon for sites without Favicon | https://github.com/zen-browser/desktop/issues/7116 | None | None |
+| Text in modals are blank | https://github.com/zen-browser/desktop/issues/7115 | None | None |
+| Automatically leaving meetings when expanding a glance tab containing the meeting | https://github.com/zen-browser/desktop/issues/7114 | None | None |
+| Right clicking on VSCode running via Github Codespaces does not trigger the typical menu and only shows "Paste" | https://github.com/zen-browser/desktop/issues/7113 | 0:16:40 | 0:16:40 |
+| Dragging a tab to the edge of the sidebar detaches the tab from cursor | https://github.com/zen-browser/desktop/issues/7112 | None | None |
+| RAM usage spike | https://github.com/zen-browser/desktop/issues/7111 | 0:49:18 | 0:49:18 |
+| Default Browser issue | https://github.com/zen-browser/desktop/issues/7110 | None | None |
+| Several problem with patch notes tab after update | https://github.com/zen-browser/desktop/issues/7109 | None | None |
+| Glance opens new window instead of glance | https://github.com/zen-browser/desktop/issues/7108 | None | None |
+| Floating sidebar is not kept open when cursor at the left-most position | https://github.com/zen-browser/desktop/issues/7107 | None | None |
+| Bookmark Bar persists when opening a bookmark from a folder | https://github.com/zen-browser/desktop/issues/7106 | None | None |
+| Pdf Printing doesn't have drawings in the right place | https://github.com/zen-browser/desktop/issues/7105 | 1:36:28 | 1:36:28 |
+| Zen crashes on right click on tab | https://github.com/zen-browser/desktop/issues/7104 | None | None |
+| Web Side Panel Issue | https://github.com/zen-browser/desktop/issues/7103 | None | None |
+| Bookmarks Menu Toolbar Keyboard Shortcut Opens Library, not List | https://github.com/zen-browser/desktop/issues/7102 | None | None |
+| Tab bar doesnt hide when all tabs closed | https://github.com/zen-browser/desktop/issues/7100 | 2:36:39 | None |
+| The media animation causes high CPU usage | https://github.com/zen-browser/desktop/issues/7099 | None | None |
+| Duplicate entry in Settings > Keyboard Shortcuts | https://github.com/zen-browser/desktop/issues/7098 | None | None |
+| Switch to Zen with low frame rate animation | https://github.com/zen-browser/desktop/issues/7097 | None | None |
+| Tab list still scrolls to top sometimes | https://github.com/zen-browser/desktop/issues/7096 | None | None |
+| Weird workspace scroll change behaviour with sidebar to the right | https://github.com/zen-browser/desktop/issues/7095 | None | None |
+| Top toolbar is shown when hovering the top side of the screen in "single toolbar" layout with "compact mode" | https://github.com/zen-browser/desktop/issues/7094 | 3:23:41 | None |
+| Workspace bottom indicator is not updated when scrolling the sidebar while another Zen window is focused | https://github.com/zen-browser/desktop/issues/7093 | None | None |
+| Keyboard shortcuts stop working in the keyboard shortcuts configuration page | https://github.com/zen-browser/desktop/issues/7092 | None | None |
+| Confusing case-insensitivity in the keyboard shortcuts configuration page | https://github.com/zen-browser/desktop/issues/7091 | None | None |
+| Broken keyboard shortcuts for compact mode | https://github.com/zen-browser/desktop/issues/7090 | 0:11:49 | None |
+| UI glitch when glancing in split view | https://github.com/zen-browser/desktop/issues/7089 | 3:52:12 | 3:52:12 |
+| Scroll Freeze after drag-and-drop on laptop (TouchPad) | https://github.com/zen-browser/desktop/issues/7088 | None | None |
+| The sidebar shrinks too much when switching to compact mode while floating is enabled | https://github.com/zen-browser/desktop/issues/7087 | None | None |
+| Unable to define a Ctrl+Alt+Tab keyboard shortcut | https://github.com/zen-browser/desktop/issues/7086 | None | None |
+| WebPanel doesn't respect Multi-Account Containers proxy settings. | https://github.com/zen-browser/desktop/issues/7085 | None | None |
+| Certificate Manager does not work | https://github.com/zen-browser/desktop/issues/7083 | 18:44:46 | 23:16:08 |
+| Weird zooming and window placement issues on Windows | https://github.com/zen-browser/desktop/issues/7082 | None | None |
+| Default Translucency Not Working - Toolbar and Sidebar Colors Forced to Windows Theme | https://github.com/zen-browser/desktop/issues/7081 | None | None |
+| Browser Freezes When Expanding Toolbar Options Menu in Compact Window State | https://github.com/zen-browser/desktop/issues/7080 | None | None |
+| Workspaces working as tab groups and not as workspaces | https://github.com/zen-browser/desktop/issues/7079 | 0:09:06 | None |
+| Container Tabs dissappear when 'switch to workspace where container is set as default when opening container tabs' is enabled | https://github.com/zen-browser/desktop/issues/7078 | None | None |
+| tab switcher is jumping 2-3 tabs ahead instead of the next tab | https://github.com/zen-browser/desktop/issues/7077 | None | None |
+| Some browser dialogs appear off-screen | https://github.com/zen-browser/desktop/issues/7076 | 1 day, 1:32:55 | None |
+| Mouse over floating sidebar prevents hide | https://github.com/zen-browser/desktop/issues/7075 | None | None |
+| CRX Installer Not working in Zen Browser. | https://github.com/zen-browser/desktop/issues/7074 | None | None |
+| Cannot resize native firefox sidebar when positioned on the right after restarting the browser | https://github.com/zen-browser/desktop/issues/7073 | None | None |
+| compact mode color bug | https://github.com/zen-browser/desktop/issues/7068 | 0:19:56 | 2:12:33 |
+| Unable to assign Cmd+Z for undo | https://github.com/zen-browser/desktop/issues/7067 | None | None |
+| "change theme colors" cannot be undone and breaks other theming features | https://github.com/zen-browser/desktop/issues/7066 | None | None |
+| Theme Color alpha hex functionality broken | https://github.com/zen-browser/desktop/issues/7065 | None | None |
+| Toolbar set to Hide, but intermittently get stuck unhidden | https://github.com/zen-browser/desktop/issues/7063 | None | None |
+| [Regression 1.8b+] Multiple tab issues regarding extensions | https://github.com/zen-browser/desktop/issues/7062 | None | None |
+| Alt-Tab Behavior: Mouse Focus Interference | https://github.com/zen-browser/desktop/issues/7061 | None | None |
+| Sidebar icons misaligned in split view | https://github.com/zen-browser/desktop/issues/7060 | None | None |
+| Is this window border line transparency effect(glitch?) an expected behavior? | https://github.com/zen-browser/desktop/issues/7059 | None | None |
+| Essentials tab with "messages.google.com", after browser restart, is now just an empty essentials tab. | https://github.com/zen-browser/desktop/issues/7058 | 0:35:22 | None |
+| 2FAS Extension problem - abnormal CPU usage in 1.9b - no problems on Firefox (REOPENED) | https://github.com/zen-browser/desktop/issues/7057 | 2:13:51 | 7:57:05 |
+| Cannot drag tabs in private mode | https://github.com/zen-browser/desktop/issues/7056 | 1:16:48 | 1 day, 11:09:47 |
+| Inconsistent/Incorrect behavior when using ctrl+enter from new tab addressbar | https://github.com/zen-browser/desktop/issues/7055 | None | None |
+| 1Password not connecting to desktop app | https://github.com/zen-browser/desktop/issues/7054 | 1:54:09 | 13:49:32 |
+| Welcome page after initial setup has absolute positioning for buttons | https://github.com/zen-browser/desktop/issues/7053 | None | None |
+| MacOS compact mode ignores mouse on traffic buttons and collapses the bar | https://github.com/zen-browser/desktop/issues/7052 | 0:18:46 | 0:18:46 |
+| URL/Search Bar misalignment | https://github.com/zen-browser/desktop/issues/7051 | None | None |
+| Trying to export/share Rice softlocks the browser | https://github.com/zen-browser/desktop/issues/7049 | None | None |
+| Tabs and Essentials are being created in the same place | https://github.com/zen-browser/desktop/issues/7048 | 15:16:39 | None |
+| Gestures not working in Zen Browser | https://github.com/zen-browser/desktop/issues/7047 | None | None |
+| Text contrast in context menus is inadequate in default Light theme | https://github.com/zen-browser/desktop/issues/7046 | None | 0:10:12 |
+| Popup is cut in compact mode | https://github.com/zen-browser/desktop/issues/7045 | None | None |
+| App icon on the task bar disappears when personalizing toolbar seting the title bar visible | https://github.com/zen-browser/desktop/issues/7044 | None | None |
+| macOS passkeys not working on certain websites, such as Duo Authentication | https://github.com/zen-browser/desktop/issues/7043 | 17:48:19 | None |
+| Bookmarks in Toolbar disappearing when entering fullscreen | https://github.com/zen-browser/desktop/issues/7042 | 1 day, 0:15:33 | None |
+| blurry fonts on 32:9 aspect ratio | https://github.com/zen-browser/desktop/issues/7041 | 1:21:09 | None |
+| iCloud Passwords extension broken | https://github.com/zen-browser/desktop/issues/7040 | 1 day, 20:47:39 | None |
+| Cmd + M to minimise doesn't work on 1.10.3b | https://github.com/zen-browser/desktop/issues/7039 | None | None |
+| Ram usage | https://github.com/zen-browser/desktop/issues/7038 | 1 day, 17:57:47 | 1 day, 19:52:42 |
+| Screen sharing is not working for calls on teams and google meet after the update | https://github.com/zen-browser/desktop/issues/7037 | None | None |
+| Zen Browser can not automatically update its self. | https://github.com/zen-browser/desktop/issues/7035 | None | None |
+| Bookmarks Toolbar "Always show" does not work | https://github.com/zen-browser/desktop/issues/7034 | None | None |
+| Bookmark title editing: Left/Right arrows trigger bookmark selection instead of text navigation | https://github.com/zen-browser/desktop/issues/7033 | None | None |
+| Ram usage | https://github.com/zen-browser/desktop/issues/7032 | 0:10:50 | 0:10:50 |
+| Tabs stuck and not clickable - suspect tab unload with popup dialog on tab close | https://github.com/zen-browser/desktop/issues/7031 | 1:06:39 | None |
+| Zen abruptly switches to unloaded tab If It has unsaved changes | https://github.com/zen-browser/desktop/issues/7030 | None | None |
+| Enhance Tracking Protection icon shield does not work when present | https://github.com/zen-browser/desktop/issues/7029 | None | None |
+| URL Bar selection discarded upon floating | https://github.com/zen-browser/desktop/issues/7028 | None | None |
+| Glance's buttons are rendered above the sidebar | https://github.com/zen-browser/desktop/issues/7027 | None | None |
+| Browser gives no visual indication that a browser window is private | https://github.com/zen-browser/desktop/issues/7026 | None | None |
+| Not possible to use CTRL + F on a web panel | https://github.com/zen-browser/desktop/issues/7025 | None | None |
+| Browser extensions no longer work in the web panel. | https://github.com/zen-browser/desktop/issues/7024 | None | None |
+| Installing mods overwrites all currently installed ones | https://github.com/zen-browser/desktop/issues/7022 | None | None |
+| Incorrect `MESA_SHADER_CACHE_DIR` | https://github.com/zen-browser/desktop/issues/7020 | None | None |
+| Firefox's screenshot tool exits unexpectedly when using change split tabs on hover | https://github.com/zen-browser/desktop/issues/7019 | 0:05:50 | None |
+| The name of the application displayed in the notification | https://github.com/zen-browser/desktop/issues/7018 | None | None |
+| Very high meory usage (Memory leak?) | https://github.com/zen-browser/desktop/issues/7017 | 21:15:37 | 21:15:37 |
+| Pinned extension icons move inside the web page when an extension reloads | https://github.com/zen-browser/desktop/issues/7016 | 0:24:01 | None |
+| Page screenshot buttons, `about:logins` and `Secure Site Not Available` page [seem to] use default accent color | https://github.com/zen-browser/desktop/issues/7015 | None | None |
+| Screenshots overlay out of place in split tabs view | https://github.com/zen-browser/desktop/issues/7014 | None | None |
+| Extension installation dialog is cut off screen | https://github.com/zen-browser/desktop/issues/7013 | None | None |
+| Black text on dark theme | https://github.com/zen-browser/desktop/issues/7012 | None | 0:00:07 |
+| Youtube and Youtube Music seeking in Media player is not synced | https://github.com/zen-browser/desktop/issues/7011 | None | None |
+| New Tab Opens in Current Tab Instead | https://github.com/zen-browser/desktop/issues/7010 | None | None |
+| Tab close button clickable area smaller than hover-highlighted area | https://github.com/zen-browser/desktop/issues/7008 | None | None |
+| browser.tabs.searchclipboardfor.middleclick enabled by default only on Linux | https://github.com/zen-browser/desktop/issues/7007 | None | 0:02:06 |
+| Unloaded Pinned Tabs Turn Into Blank 'New Tab' After Reopening | https://github.com/zen-browser/desktop/issues/7006 | None | None |
+| Zooming with Cmd + Scroll Wheel Not Working on Mac | https://github.com/zen-browser/desktop/issues/7005 | None | None |
+| "zen.theme.border-radius" dosen't work on linux. | https://github.com/zen-browser/desktop/issues/7004 | None | None |
+| Shortcut key (ALT + C) not working as it shoud | https://github.com/zen-browser/desktop/issues/7003 | 0:31:34 | None |
+| The UI is overlapping and there is no adaptive feature | https://github.com/zen-browser/desktop/issues/7002 | 15:53:29 | None |
+| Ring.com can't play videos (missing codec) | https://github.com/zen-browser/desktop/issues/7001 | 0:35:50 | None |
+| Unwanted Connections, Transparency and Default Search Engine | https://github.com/zen-browser/desktop/issues/7000 | None | None |
+| workforcenow.adp.com doesn't prompt for passkey | https://github.com/zen-browser/desktop/issues/6999 | 0:05:36 | None |
+| [Unload] Unloading/Closing (pinned) a playing YT Music tab breaks it and keeps the tab alive in the background | https://github.com/zen-browser/desktop/issues/6998 | None | 0:02:20 |
+| Slow New Window Opening | https://github.com/zen-browser/desktop/issues/6997 | None | None |
+| Transparent Url bar's background when clicking Ctrl+T while playing a video in fullscreen mode | https://github.com/zen-browser/desktop/issues/6996 | None | None |
+| Media Playback Continues After Unloading a Pinned Tab | https://github.com/zen-browser/desktop/issues/6995 | 0:09:56 | None |
+| Publisher on the install registry shows `Mozilla` | https://github.com/zen-browser/desktop/issues/6994 | None | 16:35:26 |
+| Moving `Bookmark toolbar items` to sidebar && Closing and reopening `Customize toolbar…` expands bookmarks in `Customize toolbar…` | https://github.com/zen-browser/desktop/issues/6993 | None | None |
+| Unloading a Pinned Tab Does Not Correctly Focus the New Tab | https://github.com/zen-browser/desktop/issues/6992 | None | None |
+| Unexplained Black Background in full screen mode | https://github.com/zen-browser/desktop/issues/6991 | None | None |
+| Missing Menu Bar, but Menu Bar Button Present | https://github.com/zen-browser/desktop/issues/6990 | None | None |
+| When opening a external link from VS Code editor, the maximize, minimize, and close buttons are shown on the left corner instead of the right corner | https://github.com/zen-browser/desktop/issues/6989 | None | None |
+| Please reopen my issues | https://github.com/zen-browser/desktop/issues/6988 | None | 0:06:17 |
+| Right-Click (on a tab) Context Menu: Keyboard Shortcuts Require Enter to Activate The Shortcut | https://github.com/zen-browser/desktop/issues/6987 | None | None |
+| Search bar not autofocused on startup when zen.urlbar.replace-newtab is false | https://github.com/zen-browser/desktop/issues/6986 | None | None |
+| Zen crashes on right click on tab | https://github.com/zen-browser/desktop/issues/6985 | None | 0:00:13 |
+| Can't skip revamped welcome page | https://github.com/zen-browser/desktop/issues/6983 | 2 days, 6:25:43 | None |
+| Pinned tabs aren't restored properly when multiple windows are open | https://github.com/zen-browser/desktop/issues/6982 | 1:45:51 | None |
+| Tab synchronisation across different devices | https://github.com/zen-browser/desktop/issues/6981 | 1:06:34 | None |
+| Mac OS Browser thinks there's one more tab open than there actually is | https://github.com/zen-browser/desktop/issues/6980 | 1 day, 20:08:41 | 1 day, 20:08:41 |
+| Scroll bar can't be scrolled from the right edge of the window (Windows) | https://github.com/zen-browser/desktop/issues/6979 | 0:29:46 | None |
+| Close tab buttons slightly cut off when in compact mode (Windows) | https://github.com/zen-browser/desktop/issues/6978 | 0:32:01 | None |
| "Change theme color" clears previous hex values | https://github.com/zen-browser/desktop/issues/6977 | None | None |
| Mouse does not become pointer on hover | https://github.com/zen-browser/desktop/issues/6976 | None | None |
| Change theme color wipes out previous hex codes | https://github.com/zen-browser/desktop/issues/6975 | None | 0:00:57 |
@@ -23,15 +175,15 @@
| Unable to log in to Pocket | https://github.com/zen-browser/desktop/issues/6973 | None | None |
| Failing to drag tab for split window when native sidebar is on the right | https://github.com/zen-browser/desktop/issues/6972 | None | None |
| Windows system theme switching does not work | https://github.com/zen-browser/desktop/issues/6971 | None | None |
-| Compact mode sidebar sticking | https://github.com/zen-browser/desktop/issues/6970 | None | None |
+| Compact mode sidebar sticking | https://github.com/zen-browser/desktop/issues/6970 | None | 1 day, 12:33:48 |
| Failing to drag tab for split window when native sidebar is on the right | https://github.com/zen-browser/desktop/issues/6969 | None | 0:05:51 |
| closing tab opened from essentials will leads to blank window | https://github.com/zen-browser/desktop/issues/6968 | None | None |
| Blank dropdown in bookmark manager | https://github.com/zen-browser/desktop/issues/6967 | None | None |
| Split tab groups can break your browser in private windows | https://github.com/zen-browser/desktop/issues/6966 | None | None |
-| Theme Color alpha hex functionality broken | https://github.com/zen-browser/desktop/issues/6965 | None | None |
+| Theme Color alpha hex functionality broken | https://github.com/zen-browser/desktop/issues/6965 | 2:52:38 | None |
| High GPU/CPU usage on some youtube videos | https://github.com/zen-browser/desktop/issues/6964 | None | None |
| workforcenow.adp.com doesn't prompt for passkey | https://github.com/zen-browser/desktop/issues/6963 | 0:14:47 | 0:14:47 |
-| Split tab group favicon missaligned | https://github.com/zen-browser/desktop/issues/6962 | 0:01:05 | None |
+| Split tab group favicon missaligned | https://github.com/zen-browser/desktop/issues/6962 | 0:01:05 | 4:14:59 |
| cmd + m doesn’t work anymore on 1.10.3b | https://github.com/zen-browser/desktop/issues/6961 | 0:00:59 | 0:01:00 |
| Windows system theme switching does not work | https://github.com/zen-browser/desktop/issues/6960 | 0:01:11 | 0:01:12 |
| Zen applies themes incorectly | https://github.com/zen-browser/desktop/issues/6959 | 0:01:45 | 0:02:15 |
@@ -203,7 +355,7 @@
| Zen icon not showing in Plasma title bar | https://github.com/zen-browser/desktop/issues/6723 | 7 days, 1:38:55 | 7 days, 1:38:55 |
| Windows system theme switching does not work | https://github.com/zen-browser/desktop/issues/6722 | 7 days, 2:41:59 | 7 days, 2:41:59 |
| All of Essentials suddenly disappearing | https://github.com/zen-browser/desktop/issues/6721 | 4 days, 5:40:42 | 7 days, 2:43:33 |
-| New tab shortcut broken | https://github.com/zen-browser/desktop/issues/6719 | 4 days, 4:59:23 | 7 days, 3:40:03 |
+| New tab shortcut broken | https://github.com/zen-browser/desktop/issues/6719 | 4 days, 4:59:23 | None |
| having a lot of workspaces still require from me to have wide sidebar | https://github.com/zen-browser/desktop/issues/6718 | 22:37:20 | 23:25:25 |
| YouTube essential disappear when reopening the browser | https://github.com/zen-browser/desktop/issues/6717 | 7 days, 5:24:03 | 7 days, 5:24:03 |
| Window Control Buttons Misaligned in Compact Mode | https://github.com/zen-browser/desktop/issues/6716 | 0:24:05 | 7 days, 6:18:13 |
From 45284a3845fb3140169ad2b30c57169482c6df65 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Tue, 1 Apr 2025 11:09:56 +0700
Subject: [PATCH 088/114] fix: tab not moving to forced workspace
---
.../base/zen-components/ZenWorkspaces.mjs | 26 ++++--
.../tabbrowser/content/tabbrowser-js.patch | 83 ++++++++++---------
2 files changed, 62 insertions(+), 47 deletions(-)
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index a1afd5155..c00ddc09a 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1411,15 +1411,18 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
}
moveTabToWorkspace(tab, workspaceID) {
- if (tab.getAttribute('zen-workspace-id') === workspaceID) {
- return;
+ const parent = tab.pinned ? '#vertical-pinned-tabs-container ' : '#tabbrowser-arrowscrollbox ';
+ const container = document.querySelector(parent + `.zen-workspace-tabs-section[zen-workspace-id="${workspaceID}"]`);
+
+ if (container.contains(tab)) {
+ return false;
}
+
tab.setAttribute('zen-workspace-id', workspaceID);
if (tab.hasAttribute('zen-essential')) {
- return;
+ return false;
}
- const parent = tab.pinned ? '#vertical-pinned-tabs-container ' : '#tabbrowser-arrowscrollbox ';
- const container = document.querySelector(parent + `.zen-workspace-tabs-section[zen-workspace-id="${workspaceID}"]`);
+
if (container) {
container.insertBefore(tab, container.lastChild);
}
@@ -1428,6 +1431,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
if (glanceTab) {
glanceTab.setAttribute('zen-workspace-id', workspaceID);
}
+
+ return true;
}
_prepareNewWorkspace(window) {
@@ -1974,7 +1979,16 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
async onTabBrowserInserted(event) {
let tab = event.originalTarget;
const isEssential = tab.getAttribute('zen-essential') === 'true';
- if (tab.getAttribute('zen-workspace-id') || !this.workspaceEnabled || isEssential) {
+ const workspaceID = tab.getAttribute('zen-workspace-id');
+
+ if (!this.workspaceEnabled || isEssential) {
+ return;
+ }
+
+ if (workspaceID) {
+ if (tab.hasAttribute('change-workspace') && this.moveTabToWorkspace(tab, workspaceID))
+ this._lastSelectedWorkspaceTabs[workspaceID] = tab;
+
return;
}
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index c00eedd9a..25e151f57 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 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc885cb760 100644
+index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c459be4eb 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -424,11 +424,67 @@
@@ -228,7 +228,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
-@@ -2728,6 +2806,15 @@
+@@ -2728,6 +2806,16 @@
noInitialLabel,
skipBackgroundNotify,
});
@@ -237,6 +237,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
+ }
+ if (zenForcedWorkspaceId !== undefined) {
+ t.setAttribute("zen-workspace-id", zenForcedWorkspaceId);
++ t.setAttribute("change-workspace", "")
+ }
+ if (_forZenEmptyTab) {
+ t.setAttribute("zen-empty-tab", "true");
@@ -244,7 +245,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (insertTab) {
// insert the tab into the tab container in the correct position
this._insertTabAtIndex(t, {
-@@ -2752,6 +2839,7 @@
+@@ -2752,6 +2840,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -252,7 +253,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
}));
if (focusUrlBar) {
-@@ -2871,6 +2959,9 @@
+@@ -2871,6 +2960,9 @@
}
}
@@ -262,7 +263,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
-@@ -2891,12 +2982,15 @@
+@@ -2891,12 +2983,15 @@
* @param {string} [label=]
* @returns {MozTabbrowserTabGroup}
*/
@@ -279,7 +280,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
return group;
}
-@@ -2937,6 +3031,7 @@
+@@ -2937,6 +3032,7 @@
insertBefore = null,
isUserCreated = false,
telemetryUserCreateSource = "unknown",
@@ -287,7 +288,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
} = {}
) {
if (!tabs?.length) {
-@@ -2951,7 +3046,12 @@
+@@ -2951,7 +3047,12 @@
id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
}
let group = this._createTabGroup(id, color, false, label);
@@ -301,7 +302,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
group,
insertBefore?.group ?? insertBefore
);
-@@ -3268,6 +3368,7 @@
+@@ -3268,6 +3369,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@@ -309,7 +310,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
}
) {
// If we don't have a preferred remote type, and we have a remote
-@@ -3331,6 +3432,7 @@
+@@ -3331,6 +3433,7 @@
openWindowInfo,
name,
skipLoad,
@@ -317,7 +318,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
});
}
-@@ -3509,6 +3611,27 @@
+@@ -3509,6 +3612,27 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@@ -345,7 +346,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
-@@ -3522,6 +3645,7 @@
+@@ -3522,6 +3646,7 @@
restoreTabsLazily && !select && !tabData.pinned;
let url = "about:blank";
@@ -353,7 +354,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (tabData.entries?.length) {
let activeIndex = (tabData.index || tabData.entries.length) - 1;
// Ensure the index is in bounds.
-@@ -3557,7 +3681,27 @@
+@@ -3557,7 +3682,27 @@
skipLoad: true,
preferredRemoteType,
});
@@ -382,7 +383,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (select) {
tabToSelect = tab;
}
-@@ -3570,8 +3714,8 @@
+@@ -3570,8 +3715,8 @@
// inserted in the DOM. If the tab is not yet in the DOM,
// just insert it in the right place from the start.
if (!tab.parentNode) {
@@ -393,7 +394,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
tab.toggleAttribute("pinned", true);
this.tabContainer._invalidateCachedTabs();
// Then ensure all the tab open/pinning information is sent.
-@@ -3581,7 +3725,8 @@
+@@ -3581,7 +3726,8 @@
// needs calling:
shouldUpdateForPinnedTabs = true;
}
@@ -403,7 +404,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group
-@@ -3595,7 +3740,10 @@
+@@ -3595,7 +3741,10 @@
tabGroup.stateData.id,
tabGroup.stateData.color,
tabGroup.stateData.collapsed,
@@ -415,7 +416,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
);
tabsFragment.appendChild(tabGroup.node);
}
-@@ -3646,6 +3794,9 @@
+@@ -3646,6 +3795,9 @@
this.selectedTab = tabToSelect;
this.removeTab(leftoverTab);
}
@@ -425,7 +426,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert();
-@@ -3830,7 +3981,7 @@
+@@ -3830,7 +3982,7 @@
// Ensure we have an index if one was not provided.
if (typeof index != "number") {
// Move the new tab after another tab if needed, to the end otherwise.
@@ -434,7 +435,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (
!bulkOrderedOpen &&
((openerTab &&
-@@ -3876,18 +4027,18 @@
+@@ -3876,18 +4028,18 @@
// Ensure index is within bounds.
if (tab.pinned) {
@@ -457,7 +458,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (tabAfter && tabAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, tabAfter);
-@@ -4199,6 +4350,9 @@
+@@ -4199,6 +4351,9 @@
return;
}
@@ -467,7 +468,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
this.removeTabs(selectedTabs);
}
-@@ -4556,6 +4710,7 @@
+@@ -4556,6 +4711,7 @@
skipSessionStore,
} = {}
) {
@@ -475,7 +476,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.finish("browser.tabs.opening", window);
}
-@@ -4572,6 +4727,12 @@
+@@ -4572,6 +4728,12 @@
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
}
@@ -488,7 +489,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
-@@ -4586,7 +4747,9 @@
+@@ -4586,7 +4748,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -499,7 +500,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
-@@ -4600,7 +4763,6 @@
+@@ -4600,7 +4764,6 @@
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
return;
}
@@ -507,7 +508,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
let lockTabSizing =
!this.tabContainer.verticalMode &&
!aTab.pinned &&
-@@ -4739,14 +4901,14 @@
+@@ -4739,14 +4902,14 @@
!!this.tabsInCollapsedTabGroups.length;
if (
aTab.visible &&
@@ -524,7 +525,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4770,6 +4932,7 @@
+@@ -4770,6 +4933,7 @@
newTab = true;
}
@@ -532,7 +533,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
-@@ -4810,9 +4973,7 @@
+@@ -4810,9 +4974,7 @@
aTab._mouseleave();
if (newTab) {
@@ -543,7 +544,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
} else {
TabBarVisibility.update();
}
-@@ -4941,6 +5102,8 @@
+@@ -4941,6 +5103,8 @@
this.tabs[i]._tPos = i;
}
@@ -552,7 +553,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
-@@ -5159,7 +5322,7 @@
+@@ -5159,7 +5323,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -561,7 +562,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
}
// Try to find a remaining tab that comes after the given tab
-@@ -5181,7 +5344,7 @@
+@@ -5181,7 +5345,7 @@
}
if (tab) {
@@ -570,7 +571,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
}
// If no qualifying visible tab was found, see if there is a tab in
-@@ -5599,10 +5762,10 @@
+@@ -5599,10 +5763,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -583,7 +584,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5838,7 +6001,7 @@
+@@ -5838,7 +6002,7 @@
moveTabTo(aTab, aIndex, { forceStandaloneTab = false } = {}) {
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
@@ -592,7 +593,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
} else {
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
-@@ -5848,10 +6011,17 @@
+@@ -5848,10 +6012,17 @@
this.#handleTabMove(aTab, () => {
let neighbor = this.tabs[aIndex];
@@ -612,7 +613,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5901,13 +6071,22 @@
+@@ -5901,13 +6072,22 @@
* Bug 1955388 - prevent pinned tabs from commingling with non-pinned tabs
* when there are hidden tabs present
*/
@@ -636,7 +637,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (tab.pinned && this.tabContainer.verticalMode) {
return this.tabContainer.verticalPinnedTabsContainer;
}
-@@ -5937,7 +6116,7 @@
+@@ -5937,7 +6117,7 @@
}
moveTabToGroup(aTab, aGroup) {
@@ -645,7 +646,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -5961,6 +6140,10 @@
+@@ -5961,6 +6141,10 @@
moveActionCallback();
@@ -656,7 +657,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
-@@ -6015,7 +6198,7 @@
+@@ -6015,7 +6199,7 @@
createLazyBrowser,
};
@@ -665,7 +666,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
-@@ -6765,7 +6948,7 @@
+@@ -6765,7 +6949,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -674,7 +675,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
window.focus();
aEvent.preventDefault();
break;
-@@ -7671,6 +7854,7 @@
+@@ -7671,6 +7855,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -682,7 +683,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
-@@ -8640,7 +8824,7 @@ var TabContextMenu = {
+@@ -8640,7 +8825,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@@ -691,7 +692,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
-@@ -8674,7 +8858,7 @@ var TabContextMenu = {
+@@ -8674,7 +8859,7 @@ var TabContextMenu = {
let isFirstTab =
!this.contextTabs[0].group &&
(this.contextTabs[0] == visibleTabs[0] ||
@@ -700,7 +701,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..82926278b2f71b8251b06bde6f62bcdc
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
-@@ -8904,6 +9088,7 @@ var TabContextMenu = {
+@@ -8904,6 +9089,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {
From a9f9e0263e698775c46450610b9b75a2a15e20d9 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 1 Apr 2025 15:22:49 +0200
Subject: [PATCH 089/114] fix: update animations and styles for macOS
compatibility and improve contrast in popup elements
---
.../content/zen-styles/zen-animations.css | 14 ++++++++++----
.../zen-styles/zen-gradient-generator.css | 2 +-
.../base/content/zen-styles/zen-panel-ui.css | 13 ++++++++-----
src/toolkit/themes/shared/popup-css.patch | 19 ++++++++++++++++---
4 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/browser/base/content/zen-styles/zen-animations.css b/src/browser/base/content/zen-styles/zen-animations.css
index f30456e67..d1b09714c 100644
--- a/src/browser/base/content/zen-styles/zen-animations.css
+++ b/src/browser/base/content/zen-styles/zen-animations.css
@@ -18,14 +18,20 @@
}
}
-@keyframes zen-jello-animation-alt {
+@keyframes zen-jello-animation-macos {
0% {
- transform: scale3d(0.8, 0.8, 0.8);
+ opacity: 0;
+ -moz-window-transform: scale(0.3);
}
- to {
+ 50% {
opacity: 1;
- transform: scale3d(1, 1, 1);
+ -moz-window-transform: scale(1.04);
+ }
+
+ 100% {
+ opacity: 1;
+ -moz-window-transform: scale(1);
}
}
diff --git a/src/browser/base/content/zen-styles/zen-gradient-generator.css b/src/browser/base/content/zen-styles/zen-gradient-generator.css
index 634a84e95..5befbbc9d 100644
--- a/src/browser/base/content/zen-styles/zen-gradient-generator.css
+++ b/src/browser/base/content/zen-styles/zen-gradient-generator.css
@@ -261,7 +261,7 @@
transform: translateX(-50%);
& .separator,
& #PanelUI-zen-gradient-generator-color-toggle-algo {
- background: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.1));
+ background: light-dark(rgba(0, 0, 0, 0.1), rgba(255, 255, 255, 0.5));
}
& button {
diff --git a/src/browser/base/content/zen-styles/zen-panel-ui.css b/src/browser/base/content/zen-styles/zen-panel-ui.css
index 7938194e7..2e6c1c20b 100644
--- a/src/browser/base/content/zen-styles/zen-panel-ui.css
+++ b/src/browser/base/content/zen-styles/zen-panel-ui.css
@@ -3,14 +3,17 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-panel[type='arrow'][animate][animate='open']::part(content) {
- animation: zen-jello-animation 0.35s ease;
-
+panel[type='arrow'][animate='open'] {
@media (-moz-platform: macos) {
- animation: zen-jello-animation-alt 0.2s ease-out;
+ animation: zen-jello-animation-macos 0.4s ease-out;
+ }
+ @media not(-moz-platform: macos) {
+ &::part(content) {
+ animation: zen-jello-animation 0.35s ease;
+ }
}
}
-panel[type='arrow'][animate]:not([animate='open'])::part(content) {
+panel[type='arrow'][animate]:not([animate='open']) {
animation: zen-jello-out-animation 0.3s ease-in-out;
}
diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch
index f30f4c52f..f6c07d077 100644
--- a/src/toolkit/themes/shared/popup-css.patch
+++ b/src/toolkit/themes/shared/popup-css.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..4827373b138dd59dd4adc5289adef95ef2410090 100644
+index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..58b640a81aae4f662a5e01abadc03af614cc107d 100644
--- a/toolkit/themes/shared/popup.css
+++ b/toolkit/themes/shared/popup.css
@@ -21,8 +21,8 @@ panel {
@@ -22,7 +22,7 @@ index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..4827373b138dd59dd4adc5289adef95e
@media (prefers-contrast) {
--panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
-@@ -54,9 +52,9 @@ panel {
+@@ -54,19 +52,20 @@ panel {
-moz-default-appearance: menupopup;
/* The blur behind doesn't blur all that much, add a semi-transparent
* background to improve contrast */
@@ -35,7 +35,20 @@ index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..4827373b138dd59dd4adc5289adef95e
}
@media (-moz-platform: macos) {
-@@ -208,7 +206,6 @@ panel:where([type="arrow"]) {
+- appearance: auto;
++ appearance: auto !important;
+ -moz-default-appearance: menupopup;
+ /* We set the default background here, rather than on ::part(content),
+ * because otherwise it'd interfere with the native look. Non-native-looking
+ * popups should get their background via --panel-background */
+ background-color: Menu;
+- --panel-background: none;
++ --panel-shadow-margin: 0px !important;
++ --panel-background: transparent !important;
+ --panel-border-color: transparent;
+ /* This should be kept in sync with GetMenuMaskImage() */
+ --panel-border-radius: 6px;
+@@ -208,7 +207,6 @@ panel:where([type="arrow"]) {
}
&[animating] {
From 7507f72ac078e9e1e99a72a4d5c8628e88f054b8 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Tue, 1 Apr 2025 15:54:42 +0200
Subject: [PATCH 090/114] fix: increase height of media progress box for better
visibility
---
src/browser/base/content/zen-styles/zen-media-controls.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/browser/base/content/zen-styles/zen-media-controls.css b/src/browser/base/content/zen-styles/zen-media-controls.css
index fabf87999..644514b7c 100644
--- a/src/browser/base/content/zen-styles/zen-media-controls.css
+++ b/src/browser/base/content/zen-styles/zen-media-controls.css
@@ -247,7 +247,7 @@
#zen-media-progress-hbox {
flex-grow: 1;
- height: 1.1rem;
+ height: 2rem;
align-items: center;
padding-top: 0px !important;
From fea803d4ce04074657031fca935118816285ecef Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 1 Apr 2025 16:55:39 +0200
Subject: [PATCH 091/114] Updated to firefox `137.0`
---
build/firefox-cache/l10n-last-commit-hash | 2 +-
package-lock.json | 1 -
src/toolkit/themes/shared/popup-css.patch | 12 +++++++++---
surfer.json | 4 ++--
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash
index c00ad2b99..7d34fdbea 100644
--- a/build/firefox-cache/l10n-last-commit-hash
+++ b/build/firefox-cache/l10n-last-commit-hash
@@ -1 +1 @@
-6c9732d1c3b969818a320c60f02e8339822ac08e
\ No newline at end of file
+e834aca3620253ea774e85826e43dd55e0c4f8b2
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 89ee41630..890a431c5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -291,7 +291,6 @@
"version": "1.11.6",
"resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.11.6.tgz",
"integrity": "sha512-oKYjpNTPZV3vRxDf7r7pkvYlyNwL8cpsVbVzlb57xCwn7lamXsUioh1mLCSounJ+8cl8bWXhezrnXKXbVjyGww==",
- "license": "MPL-2.0",
"dependencies": {
"@resvg/resvg-js": "^1.4.0",
"async-icns": "^1.0.2",
diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch
index f6c07d077..82cb8cc98 100644
--- a/src/toolkit/themes/shared/popup-css.patch
+++ b/src/toolkit/themes/shared/popup-css.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..58b640a81aae4f662a5e01abadc03af614cc107d 100644
+index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..e7847601bb9bedd01228ef5e6464b18eca587263 100644
--- a/toolkit/themes/shared/popup.css
+++ b/toolkit/themes/shared/popup.css
@@ -21,8 +21,8 @@ panel {
@@ -22,7 +22,12 @@ index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..58b640a81aae4f662a5e01abadc03af6
@media (prefers-contrast) {
--panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
-@@ -54,19 +52,20 @@ panel {
+@@ -50,23 +48,26 @@ panel {
+ }
+
+ @media (-moz-windows-mica-popups) {
++ &:is(menupopup) {
+ appearance: auto;
-moz-default-appearance: menupopup;
/* The blur behind doesn't blur all that much, add a semi-transparent
* background to improve contrast */
@@ -32,6 +37,7 @@ index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..58b640a81aae4f662a5e01abadc03af6
+ --panel-background: light-dark(rgba(255, 255, 255, .5), rgba(0, 0, 0, .5)) !important;
+ --panel-border-color: transparent !important;
+ --panel-shadow-margin: 0px !important;
++ }
}
@media (-moz-platform: macos) {
@@ -48,7 +54,7 @@ index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..58b640a81aae4f662a5e01abadc03af6
--panel-border-color: transparent;
/* This should be kept in sync with GetMenuMaskImage() */
--panel-border-radius: 6px;
-@@ -208,7 +207,6 @@ panel:where([type="arrow"]) {
+@@ -208,7 +209,6 @@ panel:where([type="arrow"]) {
}
&[animating] {
diff --git a/surfer.json b/surfer.json
index 7de600ee4..52ab90ef8 100644
--- a/surfer.json
+++ b/surfer.json
@@ -5,7 +5,7 @@
"binaryName": "zen",
"version": {
"product": "firefox",
- "version": "136.0.4",
+ "version": "137.0",
"candidate": "137.0"
},
"buildOptions": {
@@ -53,4 +53,4 @@
"licenseType": "MPL-2.0"
},
"updateHostname": "updates.zen-browser.app"
-}
+}
\ No newline at end of file
From dfc9119bbcb1d590bf5787177ee246f536d0dbcb Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 1 Apr 2025 19:34:31 +0200
Subject: [PATCH 092/114] feat: add 'use-sccache' input to build workflows for
improved caching options
---
.github/workflows/build.yml | 9 +++++++++
.github/workflows/linux-release-build.yml | 10 ++++++++--
.github/workflows/macos-release-build.yml | 10 ++++++++--
.github/workflows/twilight-release-schedule.yml | 6 ++++++
.github/workflows/windows-release-build.yml | 10 ++++++++--
5 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a3c8132ea..4bf1aed95 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,6 +38,11 @@ on:
required: true
default: 'release'
type: 'string'
+ use-sccache:
+ description: 'Use sccache'
+ required: true
+ type: 'boolean'
+ default: false
jobs:
debug-inputs:
@@ -282,6 +287,7 @@ jobs:
contents: write
secrets: inherit
with:
+ use-sccache: ${{ inputs.use-sccache }}
build-version: ${{ needs.build-data.outputs.version }}
generate-gpo: true
profile-data-path-archive: zen-windows-profile-data-and-jarlog.zip
@@ -312,6 +318,7 @@ jobs:
generate-gpo: false
release-branch: ${{ inputs.update_branch }}
MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+ use-sccache: ${{ inputs.use-sccache }}
linux:
name: Linux build
@@ -324,6 +331,7 @@ jobs:
build-version: ${{ needs.build-data.outputs.version }}
release-branch: ${{ inputs.update_branch }}
MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+ use-sccache: ${{ inputs.use-sccache }}
mac:
name: macOS build
@@ -336,6 +344,7 @@ jobs:
build-version: ${{ needs.build-data.outputs.version }}
release-branch: ${{ inputs.update_branch }}
MOZ_BUILD_DATE: ${{needs.buildid.outputs.buildids}}
+ use-sccache: ${{ inputs.use-sccache }}
mac-uni:
name: macOS build (Universal)
diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index a56a81d7d..008b59ae3 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -15,6 +15,11 @@ on:
type: string
required: true
default: ''
+ use-sccache:
+ description: 'Use sccache'
+ required: true
+ type: boolean
+ default: false
jobs:
build-linux:
@@ -27,9 +32,9 @@ jobs:
matrix:
arch: [x86_64, aarch64]
env:
- SCCACHE_GHA_ENABLED: 'true'
+ SCCACHE_GHA_ENABLED: ${ inputs.use-sccache }
CARGO_TERM_COLOR: always
- RUSTC_WRAPPER: 'sccache'
+ RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' }
CARGO_INCREMENTAL: 0
name: Build Linux - ${{ matrix.arch }}
@@ -56,6 +61,7 @@ jobs:
- name: Run sccache-cache
uses: mozilla-actions/sccache-action@main
+ if: ${{ inputs.use-sccache }}
with:
disable_annotations: true
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index 838c9a3e0..1aef80095 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -15,6 +15,11 @@ on:
type: string
required: true
default: ''
+ use-sccache:
+ description: 'Use sccache'
+ required: true
+ type: boolean
+ default: false
jobs:
mac-build:
@@ -26,9 +31,9 @@ jobs:
matrix:
arch: [x86_64, aarch64]
env:
- SCCACHE_GHA_ENABLED: 'true'
+ SCCACHE_GHA_ENABLED: ${ inputs.use-sccache }
CARGO_TERM_COLOR: always
- RUSTC_WRAPPER: 'sccache'
+ RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' }
CARGO_INCREMENTAL: 0
steps:
- name: Checkout repository
@@ -44,6 +49,7 @@ jobs:
- name: Run sccache-cache
uses: mozilla-actions/sccache-action@main
+ if: ${{ inputs.use-sccache }}
with:
disable_annotations: true
diff --git a/.github/workflows/twilight-release-schedule.yml b/.github/workflows/twilight-release-schedule.yml
index bf2c3c7d2..c3fb8d8ca 100644
--- a/.github/workflows/twilight-release-schedule.yml
+++ b/.github/workflows/twilight-release-schedule.yml
@@ -10,6 +10,11 @@ on:
required: false
type: boolean
default: true
+ use-sccache:
+ description: 'Use sccache'
+ required: false
+ type: boolean
+ default: true
jobs:
twilight-release-schedule:
@@ -20,6 +25,7 @@ jobs:
with:
create_release: ${{ github.event_name != 'workflow_dispatch' && true || inputs.create_release }}
update_branch: twilight
+ use-sccache: ${{ github.event_name != 'workflow_dispatch' && false || inputs.use-sccache }}
update_version: false
post-build:
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index e9d95eeec..0a6f39bb9 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -22,6 +22,11 @@ on:
type: string
required: true
default: ''
+ use-sccache:
+ description: 'Use sccache'
+ required: true
+ type: boolean
+ default: false
jobs:
windows-build:
@@ -29,9 +34,9 @@ jobs:
# aarch64 does not need full 16x, and we also dont use full LTO when generating GPO
runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'self-hosted' || 'ubuntu-latest' }}
env:
- SCCACHE_GHA_ENABLED: 'true'
+ SCCACHE_GHA_ENABLED: ${ inputs.use-sccache }
CARGO_TERM_COLOR: always
- RUSTC_WRAPPER: 'sccache'
+ RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' }
CARGO_INCREMENTAL: 0
strategy:
fail-fast: false
@@ -62,6 +67,7 @@ jobs:
- name: Run sccache-cache
uses: mozilla-actions/sccache-action@main
+ if: ${{ inputs.use-sccache }}
with:
disable_annotations: true
From b4269b900105de9b559bbc6b04ac018946b62131 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 1 Apr 2025 19:36:05 +0200
Subject: [PATCH 093/114] fix: conditionally download aws-cli in build workflow
for release branches
---
.github/workflows/build.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4bf1aed95..d390375cf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,6 +75,7 @@ jobs:
needs: debug-inputs
steps:
- name: Download aws-cli
+ if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
run: |
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
unzip awscliv2.zip
@@ -444,6 +445,7 @@ jobs:
if: always()
steps:
- name: Download aws-cli
+ if: ${{ inputs.create_release && inputs.update_branch == 'release' }}
run: |
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
unzip awscliv2.zip
From aa673cc361d17fc140224e89dd3431b6849804ab Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 1 Apr 2025 19:51:17 +0200
Subject: [PATCH 094/114] fix: ensure SCCACHE_GHA_ENABLED is set to 'true' or
'false' based on input
---
.github/workflows/linux-release-build.yml | 2 +-
.github/workflows/macos-release-build.yml | 2 +-
.github/workflows/windows-release-build.yml | 4 ++--
configs/common/mozconfig | 11 +++++++----
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index 008b59ae3..565c1dd70 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -32,7 +32,7 @@ jobs:
matrix:
arch: [x86_64, aarch64]
env:
- SCCACHE_GHA_ENABLED: ${ inputs.use-sccache }
+ SCCACHE_GHA_ENABLED: ${ inputs.use-sccache && 'true' || 'false' }
CARGO_TERM_COLOR: always
RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' }
CARGO_INCREMENTAL: 0
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index 1aef80095..22190d786 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -31,7 +31,7 @@ jobs:
matrix:
arch: [x86_64, aarch64]
env:
- SCCACHE_GHA_ENABLED: ${ inputs.use-sccache }
+ SCCACHE_GHA_ENABLED: ${ inputs.use-sccache && 'true' || 'false' }
CARGO_TERM_COLOR: always
RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' }
CARGO_INCREMENTAL: 0
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 0a6f39bb9..9e3b7e478 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -34,7 +34,7 @@ jobs:
# aarch64 does not need full 16x, and we also dont use full LTO when generating GPO
runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'self-hosted' || 'ubuntu-latest' }}
env:
- SCCACHE_GHA_ENABLED: ${ inputs.use-sccache }
+ SCCACHE_GHA_ENABLED: ${ inputs.use-sccache && 'true' || 'false' }
CARGO_TERM_COLOR: always
RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' }
CARGO_INCREMENTAL: 0
@@ -156,7 +156,7 @@ jobs:
aria2
echo Setup wine
aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst
- tar --zstd -xvf wine.tar.zst -C ~/win-cross
+ tar --zstd -xf wine.tar.zst -C ~/win-cross
rm wine.tar.zst
echo Setup Visual Studio
./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 7c8ed9076..364464cd7 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -23,10 +23,13 @@ export MOZ_INCLUDE_SOURCE_INFO=1
ac_add_options --enable-application=browser
-if test -x "$(command -v sccache)"; then
- ac_add_options --with-ccache=sccache
-elif test -f "$HOME/.mozbuild/sccache/sccache"; then
- ac_add_options --with-ccache="$HOME"/.mozbuild/sccache/sccache
+# Anything except 'SCCACHE_GHA_ENABLED == false'
+if ! test "$SCCACHE_GHA_ENABLED" = "false"; then
+ if test -x "$(command -v sccache)"; then
+ ac_add_options --with-ccache=sccache
+ elif test -f "$HOME/.mozbuild/sccache/sccache"; then
+ ac_add_options --with-ccache="$HOME"/.mozbuild/sccache/sccache
+ fi
fi
if test "$ZEN_RELEASE"; then
From 40813820da67e6a46c979a62c8e7fdd0191daf8a Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 1 Apr 2025 19:52:54 +0200
Subject: [PATCH 095/114] fix: update syntax for environment variable
assignments in build workflows
---
.github/workflows/linux-release-build.yml | 4 ++--
.github/workflows/macos-release-build.yml | 4 ++--
.github/workflows/windows-release-build.yml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml
index 565c1dd70..dfcbc0599 100644
--- a/.github/workflows/linux-release-build.yml
+++ b/.github/workflows/linux-release-build.yml
@@ -32,9 +32,9 @@ jobs:
matrix:
arch: [x86_64, aarch64]
env:
- SCCACHE_GHA_ENABLED: ${ inputs.use-sccache && 'true' || 'false' }
+ SCCACHE_GHA_ENABLED: ${{ inputs.use-sccache && 'true' || 'false' }}
CARGO_TERM_COLOR: always
- RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' }
+ RUSTC_WRAPPER: ${{ inputs.use-sccache && 'sccache' || '' }}
CARGO_INCREMENTAL: 0
name: Build Linux - ${{ matrix.arch }}
diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml
index 22190d786..674de8891 100644
--- a/.github/workflows/macos-release-build.yml
+++ b/.github/workflows/macos-release-build.yml
@@ -31,9 +31,9 @@ jobs:
matrix:
arch: [x86_64, aarch64]
env:
- SCCACHE_GHA_ENABLED: ${ inputs.use-sccache && 'true' || 'false' }
+ SCCACHE_GHA_ENABLED: ${{ inputs.use-sccache && 'true' || 'false' }}
CARGO_TERM_COLOR: always
- RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' }
+ RUSTC_WRAPPER: ${{ inputs.use-sccache && 'sccache' || '' }}
CARGO_INCREMENTAL: 0
steps:
- name: Checkout repository
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 9e3b7e478..6ed9881be 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -34,9 +34,9 @@ jobs:
# aarch64 does not need full 16x, and we also dont use full LTO when generating GPO
runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'self-hosted' || 'ubuntu-latest' }}
env:
- SCCACHE_GHA_ENABLED: ${ inputs.use-sccache && 'true' || 'false' }
+ SCCACHE_GHA_ENABLED: ${{ inputs.use-sccache && 'true' || 'false' }}
CARGO_TERM_COLOR: always
- RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' }
+ RUSTC_WRAPPER: ${{ inputs.use-sccache && 'sccache' || '' }}
CARGO_INCREMENTAL: 0
strategy:
fail-fast: false
From 3556c664355397755b75af607eb928ce1ced0825 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Tue, 1 Apr 2025 22:08:19 +0200
Subject: [PATCH 096/114] Fixed script invoking path when generating profile
data
Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com>
---
.github/workflows/windows-profile-build.yml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index 39ee7f0d0..d682ef868 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -82,16 +82,15 @@ jobs:
- name: Generate
if: ${{ matrix.arch == 'x86_64' }}
run: |
- ls
$Env:USE_MINTTY = "0"
$workspace_dir_current = [regex]::replace($env:GITHUB_WORKSPACE, "^([A-Z]):", { "/" + $args.value.Substring(0, 1).toLower() }) -replace "\\", "/"
$workspace_dir = $workspace_dir_current + "/engine"
- echo $workspace_dir
echo "cd $workspace_dir" '' >> mozilla-build-run.sh
echo 'export PATH=/c/mozilla-build/msys2/usr/bin:$PATH' '' >> mozilla-build-run.sh
echo './mach --no-interactive bootstrap --application-choice browser' '' >> mozilla-build-run.sh
echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh
- C:\mozilla-build\start-shell.bat $workspace_dir_current\mozilla-build-run.sh
+ echo 'Running Profile Build:'
+ C:\mozilla-build\start-shell.bat mozilla-build-run.sh
- name: Move profile data
if: ${{ matrix.arch == 'x86_64' }}
From b6d1ad3418f0aaa779588072905e58bdc36ec533 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Tue, 1 Apr 2025 23:38:08 +0200
Subject: [PATCH 097/114] fix: update layout recalculation and improve CSS
styles for Zen UI components
---
src/browser/base/content/ZenStartup.mjs | 4 +++-
.../content/zen-styles/zen-compact-mode.css | 10 ++++------
.../base/content/zen-styles/zen-panel-ui.css | 2 +-
.../base/content/zen-styles/zen-popup.css | 14 -------------
.../base/zen-components/ZenWorkspaces.mjs | 2 +-
.../preferences/main-inc-xhtml.patch | 20 +++++++++++++++++--
surfer.json | 6 +++---
7 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index 662afbd55..2d774b7a1 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -58,7 +58,6 @@
closeWatermark() {
document.documentElement.removeAttribute('zen-before-loaded');
- window.dispatchEvent(new window.Event('resize')); // To recalculate the layout
if (Services.prefs.getBoolPref('zen.watermark.enabled', false)) {
gZenUIManager.motion
.animate(
@@ -77,6 +76,9 @@
}
});
}
+ window.requestAnimationFrame(() => {
+ window.dispatchEvent(new window.Event('resize')); // To recalculate the layout
+ });
},
_changeSidebarLocation() {
diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index 42b6d576f..8cc644ffe 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -15,14 +15,11 @@
#zen-tabbox-wrapper {
/* Remove extra 1px of margine we have to add to the tabbox */
- margin-left: 0 !important;
- margin-right: 0 !important;
- }
-
- #zen-appcontent-wrapper {
margin-left: var(--zen-element-separation) !important;
margin-right: var(--zen-element-separation) !important;
+ }
+ #zen-appcontent-wrapper {
& #tabbrowser-tabbox {
margin-left: 0 !important;
}
@@ -104,7 +101,8 @@
padding: var(--zen-toolbox-padding) !important;
position: relative;
background: var(--zen-dialog-background);
- border: 1px solid var(--zen-colors-border-contrast);
+ outline: 1px solid var(--zen-colors-border-contrast);
+ outline-offset: -1px;
/* times 4 because we have the inner padding and the outter padding to consider */
:root[zen-sidebar-expanded='true'] & {
&[has-animated-padding='true'] {
diff --git a/src/browser/base/content/zen-styles/zen-panel-ui.css b/src/browser/base/content/zen-styles/zen-panel-ui.css
index 2e6c1c20b..70f78c074 100644
--- a/src/browser/base/content/zen-styles/zen-panel-ui.css
+++ b/src/browser/base/content/zen-styles/zen-panel-ui.css
@@ -7,7 +7,7 @@ panel[type='arrow'][animate='open'] {
@media (-moz-platform: macos) {
animation: zen-jello-animation-macos 0.4s ease-out;
}
- @media not(-moz-platform: macos) {
+ @media not (-moz-platform: macos) {
&::part(content) {
animation: zen-jello-animation 0.35s ease;
}
diff --git a/src/browser/base/content/zen-styles/zen-popup.css b/src/browser/base/content/zen-styles/zen-popup.css
index 49fd937d7..1c15cc5dc 100644
--- a/src/browser/base/content/zen-styles/zen-popup.css
+++ b/src/browser/base/content/zen-styles/zen-popup.css
@@ -32,21 +32,7 @@
--uc-permission-item-margin-block: 4px;
--uc-permission-item-padding-inline: 16px;
- --uc-contextmenu-border-radius: 8px;
- --uc-contextmenu-padding: calc(4px - var(--uc-contextmenu-menuitem-border-width)) 0;
- --uc-contextmenu-menuitem-border-radius: calc(4px + var(--uc-contextmenu-menuitem-border-width));
- --uc-contextmenu-menuitem-padding-block: 6px;
- --uc-contextmenu-menuitem-padding-inline: 10px;
- --uc-contextmenu-menuitem-border-width: 2px;
- --uc-contextmenu-menuicon-margin-inline: 12px;
- --uc-contextmenu-menuitem-margin-inline: calc(4px - var(--uc-contextmenu-menuitem-border-width));
- --uc-contextmenu-menuitem-margin-block: 0px;
- --uc-contextmenu-menuitem-margin: var(--uc-contextmenu-menuitem-margin-block) var(--uc-contextmenu-menuitem-margin-inline);
- --uc-contextmenu-separator-vertical: calc(4px - var(--uc-contextmenu-menuitem-border-width));
- --uc-contextmenu-separator-horizontal: 0;
-
--panel-separator-color: var(--zen-colors-border);
-
--zen-panel-separator-width: 1px;
}
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index c00ddc09a..6b2227a79 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -513,7 +513,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
if (typeof this._shouldHaveWorkspaces === 'undefined') {
let docElement = document.documentElement;
this._shouldHaveWorkspaces = !(
- docElement.hasAttribute('privatebrowsingmode') ||
+ PrivateBrowsingUtils.isWindowPrivate(window) ||
docElement.getAttribute('chromehidden').includes('toolbar') ||
docElement.getAttribute('chromehidden').includes('menubar')
);
diff --git a/src/browser/components/preferences/main-inc-xhtml.patch b/src/browser/components/preferences/main-inc-xhtml.patch
index 92cfd70d0..83705bafc 100644
--- a/src/browser/components/preferences/main-inc-xhtml.patch
+++ b/src/browser/components/preferences/main-inc-xhtml.patch
@@ -1,8 +1,24 @@
diff --git a/browser/components/preferences/main.inc.xhtml b/browser/components/preferences/main.inc.xhtml
-index 4c2637db10b7ad5d253d9588be3610c1ec5ad330..b8445b808cf9dcb54d380ae78172db4bf8250cd4 100644
+index cdcf50ec1bc4a54c69f5baf4a6d40ab0c63a8121..87603323c2b0b9ea0c847a8a06e293a16c1252b8 100644
--- a/browser/components/preferences/main.inc.xhtml
+++ b/browser/components/preferences/main.inc.xhtml
-@@ -369,6 +369,7 @@
+@@ -183,6 +183,7 @@
+ </groupbox>
+
+ <!-- Browser layout -->
++#if 0
+ <groupbox data-category="paneGeneral"
+ data-subcategory="layout"
+ hidden="true">
+@@ -198,6 +199,7 @@
+ preference="sidebar.revamp"/>
+ <description class="indent" data-l10n-id="browser-layout-show-sidebar-desc"></description>
+ </groupbox>
++#endif
+
+ <hbox id="languageAndAppearanceCategory"
+ class="subcategory"
+@@ -411,6 +413,7 @@
languages-customize-add.label,
" />
</hbox>
diff --git a/surfer.json b/surfer.json
index 52ab90ef8..4a26a8591 100644
--- a/surfer.json
+++ b/surfer.json
@@ -19,7 +19,7 @@
"brandShortName": "Zen",
"brandFullName": "Zen Browser",
"release": {
- "displayVersion": "1.10.3b",
+ "displayVersion": "1.11b",
"github": {
"repo": "zen-browser/desktop"
},
@@ -39,7 +39,7 @@
"brandShortName": "Twilight",
"brandFullName": "Zen Twilight",
"release": {
- "displayVersion": "1.10.3t",
+ "displayVersion": "1.11t",
"github": {
"repo": "zen-browser/desktop"
}
@@ -53,4 +53,4 @@
"licenseType": "MPL-2.0"
},
"updateHostname": "updates.zen-browser.app"
-}
\ No newline at end of file
+}
From ce8013124bfebd0a1c0ffd36c4c4e9f8b56c6420 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 00:08:00 +0200
Subject: [PATCH 098/114] fix: adjust margins and padding for compact mode and
vertical tabs styles
---
.../base/content/zen-styles/zen-compact-mode.css | 14 ++++++++++++--
.../content/zen-styles/zen-tabs/vertical-tabs.css | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index 8cc644ffe..c28c23e51 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -33,6 +33,14 @@
display: none !important;
}
+ &:not([zen-window-buttons-reversed='true']) #zen-appcontent-navbar-container #nav-bar {
+ margin-left: var(--zen-element-separation) !important;
+ }
+
+ &[zen-window-buttons-reversed='true'] #zen-appcontent-navbar-container #nav-bar {
+ margin-right: var(--zen-element-separation) !important;
+ }
+
#navigator-toolbox {
--zen-toolbox-max-width: 64px !important;
--zen-compact-float: var(--zen-element-separation);
@@ -75,8 +83,10 @@
* we need to adjust the top-padding of the toolbox to account for the
* extra toolbar height. */
@media not -moz-pref('zen.view.compact.hide-toolbar') {
- &:not([zen-single-toolbar='true']) #navigator-toolbox:not([animate='true']) {
- margin-top: var(--zen-toolbar-height) !important;
+ &:not([zen-single-toolbar='true']) {
+ #navigator-toolbox:not([animate='true']) {
+ margin-top: var(--zen-toolbar-height) !important;
+ }
}
}
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index d7b79b8ab..337bfd515 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -636,6 +636,7 @@
#navigator-toolbox:not([zen-sidebar-expanded='true']) {
max-width: var(--zen-toolbox-max-width) !important;
min-width: var(--zen-toolbox-max-width) !important;
+ padding-bottom: var(--zen-toolbox-padding);
& .zen-current-workspace-indicator-name,
& .toolbarbutton-text {
display: none !important;
From 031926efb72d087080a0e139afc142f9f440ceda Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 10:16:07 +0200
Subject: [PATCH 099/114] refactor: remove sidebar-related code and update
localization references
---
docs/side-panels.md | 15 -
l10n | 2 +-
src/browser/app/profile/zen-browser.js | 7 -
src/browser/base/content/ZenUIManager.mjs | 2 +-
.../base/content/browser-box-inc-xhtml.patch | 5 +-
.../base/content/browser-sets-inc.patch | 6 +-
src/browser/base/content/zen-assets.inc.xhtml | 1 -
.../base/content/zen-assets.jar.inc.mn | 2 +-
.../base/content/zen-keysets.inc.xhtml | 48 ++
.../base/content/zen-locales.inc.xhtml | 2 +-
.../base/content/zen-popupset.inc.xhtml | 83 --
.../base/content/zen-preloaded.inc.xhtml | 1 +
src/browser/base/content/zen-sets.js | 92 ++
.../base/content/zen-sidebar-icons.inc.xhtml | 1 -
.../base/content/zen-sidebar-panel.inc.xhtml | 34 -
.../base/content/zen-styles/zen-decks.css | 107 ---
.../zen-components/ZenGradientGenerator.mjs | 2 +-
.../zen-components/ZenKeyboardShortcuts.mjs | 96 ++-
.../zen-components/ZenMediaController.mjs | 4 +-
.../zen-components/ZenPinnedTabManager.mjs | 8 +-
.../base/zen-components/ZenSidebarManager.mjs | 795 ------------------
.../base/zen-components/ZenTabUnloader.mjs | 6 +-
.../base/zen-components/ZenViewSplitter.mjs | 85 +-
.../base/zen-components/ZenWorkspaces.mjs | 2 +-
.../places/content/zenNewWebPanel.js | 62 --
.../places/content/zenNewWebPanel.xhtml | 44 -
src/browser/components/places/jar-mn.patch | 10 -
.../components/preferences/zen-settings.js | 10 -
.../preferences/zenLooksAndFeel.inc.xhtml | 21 -
.../preferences/zenTabsManagement.inc.xhtml | 2 +-
src/browser/themes/shared/zen-icons/icons.css | 4 -
.../themes/shared/zen-icons/lin/icons.css | 4 -
.../PictureInPicture-sys-mjs.patch | 21 +-
33 files changed, 226 insertions(+), 1358 deletions(-)
delete mode 100644 docs/side-panels.md
create mode 100644 src/browser/base/content/zen-keysets.inc.xhtml
create mode 100644 src/browser/base/content/zen-sets.js
delete mode 100644 src/browser/base/content/zen-sidebar-panel.inc.xhtml
delete mode 100644 src/browser/base/zen-components/ZenSidebarManager.mjs
delete mode 100644 src/browser/components/places/content/zenNewWebPanel.js
delete mode 100644 src/browser/components/places/content/zenNewWebPanel.xhtml
delete mode 100644 src/browser/components/places/jar-mn.patch
diff --git a/docs/side-panels.md b/docs/side-panels.md
deleted file mode 100644
index 13f4c7f2e..000000000
--- a/docs/side-panels.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Zen Side Panels
-
-The `zen.sidepanels.data` configuration will be a JSON string that follows the following data:
-
-```json
-{
- "data": {
- "p1": {
- "url": "https://google.com",
- "ua": false // "ua" may not be declared! (default: false)
- }
- },
- "index": ["p1"]
-}
-```
diff --git a/l10n b/l10n
index 4094426d2..91a004c86 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit 4094426d24cf3e131b5a07775478ed893112e9da
+Subproject commit 91a004c86085696aff68902dbed72504a0500f75
diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index dd2df31dd..fb1cf3da3 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -184,13 +184,6 @@ pref('zen.pinned-tab-manager.close-shortcut-behavior', 'reset-unload-switch');
// TODO: Check this out!
pref("browser.profiles.enabled", false);
-// Zen webpanels (calling it sidebar due to legacy reasons)
-pref('zen.sidebar.data', "{\"data\":\n {\"p1\":{\n \"url\":\"https://www.wikipedia.org/\"\n },\n\"p2\":{\n \"url\":\"https://m.twitter.com/\",\n\"ua\": true\n },\n\"p3\": {\n \"url\": \"https://www.youtube.com/\",\n\"ua\": true\n},\n\"p4\": {\n \"url\": \"https://translate.google.com/\",\n\"ua\": true\n},\n\"p5\": {\n \"url\": \"https://todoist.com/\",\n\"ua\": true\n}},\n\"index\":[\"p1\",\"p2\",\"p3\",\"p4\",\"p5\"]}");
-pref('zen.sidebar.enabled', true);
-pref('zen.sidebar.close-on-blur', true);
-pref('zen.sidebar.max-webpanels', 8);
-pref('zen.sidebar.use-google-favicons', true);
-
// Zen Split View
pref('zen.splitView.enable-tab-drop', true);
pref('zen.splitView.min-resize-width', 7);
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index b1283fad6..df822eb5c 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -334,7 +334,7 @@ var gZenVerticalTabsManager = {
type="checkbox"
${Services.prefs.getBoolPref(kConfigKey) ? 'checked="true"' : ''}
data-lazy-l10n-id="zen-toolbar-context-tabs-right"
- oncommand="gZenVerticalTabsManager.toggleTabsOnRight();"
+ command="cmd_zenToggleTabsOnRight"
/>
`);
document.getElementById('viewToolbarsMenuSeparator').before(fragment);
diff --git a/src/browser/base/content/browser-box-inc-xhtml.patch b/src/browser/base/content/browser-box-inc-xhtml.patch
index 3310c63c3..42dc4390d 100644
--- a/src/browser/base/content/browser-box-inc-xhtml.patch
+++ b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -1,12 +1,11 @@
diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index 2ca8bdd2674fb4addf3bbf94ff17abc5c93c6293..49c772ae71e6b3793ff806d22197d3028ff4385f 100644
+index 2ca8bdd2674fb4addf3bbf94ff17abc5c93c6293..dd965d8d190e8cdacbeb3d80995ad1a906e64079 100644
--- a/browser/base/content/browser-box.inc.xhtml
+++ b/browser/base/content/browser-box.inc.xhtml
-@@ -26,7 +26,14 @@
+@@ -26,7 +26,13 @@
<splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
<box id="after-splitter"></box>
</div>
-+#include zen-sidebar-panel.inc.xhtml
+<vbox flex="1" id="zen-appcontent-wrapper">
+<html:div id="zen-appcontent-navbar-container"></html:div>
+<hbox id="zen-tabbox-wrapper" flex="1">
diff --git a/src/browser/base/content/browser-sets-inc.patch b/src/browser/base/content/browser-sets-inc.patch
index c4bb1bffb..54f3f1f5d 100644
--- a/src/browser/base/content/browser-sets-inc.patch
+++ b/src/browser/base/content/browser-sets-inc.patch
@@ -1,9 +1,9 @@
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
-index 493c593d66883082c2a4df87c4706f919ea675f8..aaaa833b64b0fd890aa2a0794eaeb7e41f002f06 100644
+index 269b025d7fb942602c1b1b6c9747540bcde11375..9dcecfe205cadacace5195ec84d8b2ee292a0632 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
-@@ -393,3 +393,4 @@
+@@ -405,3 +405,4 @@
internal="true"/>
#endif
</keyset>
-+ <keyset id="zenKeyset"></keyset>
++#include zen-keysets.inc.xhtml
diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 3f08b0834..4bd038f68 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -36,7 +36,6 @@ Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/Zen
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenThemesImporter.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenCompactMode.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/ZenUIManager.mjs", this);
-Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenSidebarManager.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenTabUnloader.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs", this);
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index 3e5d5e1b0..e78e173a4 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -2,6 +2,7 @@
content/browser/zenThemeModifier.js (content/zenThemeModifier.js)
content/browser/ZenStartup.mjs (content/ZenStartup.mjs)
+ content/browser/zen-sets.js (content/zen-sets.js)
content/browser/ZenUIManager.mjs (content/ZenUIManager.mjs)
content/browser/ZenCustomizableUI.sys.mjs (content/ZenCustomizableUI.sys.mjs)
content/browser/zen-components/ZenUIMigration.mjs (zen-components/ZenUIMigration.mjs)
@@ -11,7 +12,6 @@
content/browser/zen-components/ZenWorkspaces.mjs (zen-components/ZenWorkspaces.mjs)
content/browser/zen-components/ZenWorkspacesStorage.mjs (zen-components/ZenWorkspacesStorage.mjs)
content/browser/zen-components/ZenWorkspacesSync.mjs (zen-components/ZenWorkspacesSync.mjs)
- content/browser/zen-components/ZenSidebarManager.mjs (zen-components/ZenSidebarManager.mjs)
content/browser/zen-components/ZenKeyboardShortcuts.mjs (zen-components/ZenKeyboardShortcuts.mjs)
content/browser/zen-components/ZenThemesImporter.mjs (zen-components/ZenThemesImporter.mjs)
content/browser/zen-components/ZenTabUnloader.mjs (zen-components/ZenTabUnloader.mjs)
diff --git a/src/browser/base/content/zen-keysets.inc.xhtml b/src/browser/base/content/zen-keysets.inc.xhtml
new file mode 100644
index 000000000..66d8a3a32
--- /dev/null
+++ b/src/browser/base/content/zen-keysets.inc.xhtml
@@ -0,0 +1,48 @@
+<commandset id="zenCommandSet">
+ <command id="cmd_zenCompactModeToggle" />
+ <command id="cmd_zenCompactModeShowSidebar" />
+ <command id="cmd_zenCompactModeShowToolbar" />
+
+ <command id="cmd_zenWorkspaceForward" />
+ <command id="cmd_zenWorkspaceBackward" />
+
+ <command id="cmd_zenSplitViewGrid" />
+ <command id="cmd_zenSplitViewVertical" />
+ <command id="cmd_zenSplitViewHorizontal" />
+ <command id="cmd_zenSplitViewUnsplit" />
+ <command id="cmd_zenSplitViewLinkInNewTab" />
+
+ <!-- Workspace commands -->
+ <command id="cmd_zenWorkspaceSwitch1" />
+ <command id="cmd_zenWorkspaceSwitch2" />
+ <command id="cmd_zenWorkspaceSwitch3" />
+ <command id="cmd_zenWorkspaceSwitch4" />
+ <command id="cmd_zenWorkspaceSwitch5" />
+ <command id="cmd_zenWorkspaceSwitch6" />
+ <command id="cmd_zenWorkspaceSwitch7" />
+ <command id="cmd_zenWorkspaceSwitch8" />
+ <command id="cmd_zenWorkspaceSwitch9" />
+ <command id="cmd_zenWorkspaceSwitch10" />
+
+ <command id="cmd_zenOpenZenThemePicker" />
+ <command id="cmd_zenChangeWorkspaceTabColor" />
+ <command id="cmd_zenToggleTabsOnRight" />
+
+ <command id="cmd_zenReplacePinnedUrlWithCurrent" />
+ <command id="cmd_zenAddToEssentials" />
+ <command id="cmd_zenRemoveFromEssentials" />
+
+ <command id="cmd_zenPinnedTabReset" />
+ <command id="cmd_zenPinnedTabResetNoTab" />
+
+ <command id="cmd_zenToggleSidebar" />
+
+ <command id="cmd_zenCopyCurrentURL" />
+ <command id="cmd_zenCopyCurrentURLMarkdown" />
+
+ <command id="cmd_zenUnloadTab" />
+ <command id="cmd_zenPreventUnloadTab" />
+ <command id="cmd_zenIgnoreUnloadTab" />
+</commandset>
+
+<keyset id="zenKeyset"></keyset>
diff --git a/src/browser/base/content/zen-locales.inc.xhtml b/src/browser/base/content/zen-locales.inc.xhtml
index 5bca39e99..643f917ae 100644
--- a/src/browser/base/content/zen-locales.inc.xhtml
+++ b/src/browser/base/content/zen-locales.inc.xhtml
@@ -1,4 +1,4 @@
-<link rel="localization" href="browser/zen-web-side-panels.ftl"/>
+
<link rel="localization" href="browser/zen-workspaces.ftl"/>
<link rel="localization" href="browser/zen-split-view.ftl"/>
<link rel="localization" href="browser/zen-general.ftl"/>
diff --git a/src/browser/base/content/zen-popupset.inc.xhtml b/src/browser/base/content/zen-popupset.inc.xhtml
index 3550803c2..b63212a9b 100644
--- a/src/browser/base/content/zen-popupset.inc.xhtml
+++ b/src/browser/base/content/zen-popupset.inc.xhtml
@@ -1,86 +1,3 @@
-<menupopup id="zenWebPanelContextMenu"
- onpopupshowing="if (event.target == this) gZenBrowserManagerSidebar.updateContextMenu(this);"
- onpopuphidden="if (event.target == this) gZenBrowserManagerSidebar.contextTab = null;">
- <menuitem id="context_zenUnloadWebPanel" oncommand="gZenBrowserManagerSidebar.contextUnload();" data-l10n-id="zen-web-side-panel-context-unload"/>
- <menuitem id="context_zenToggleMuteWebPanel" oncommand="gZenBrowserManagerSidebar.contextToggleMuteAudio();"/>
- <menuitem id="context_zenOpenNewTabWebPanel" oncommand="gZenBrowserManagerSidebar.contextOpenNewTab();" data-l10n-id="zen-web-side-panel-open-in-new-tab"/>
- <menuseparator/>
- <menu id="context_zenWebPanelContextInContainer"
- data-l10n-id="zen-web-side-panel-context-open-in-container-tab"
- selection-type="single"
- node-type="link"
- hide-if-private-browsing="true"
- hide-if-usercontext-disabled="true">
- <menupopup oncommand="gZenBrowserManagerSidebar.contextChangeContainerTab(event);"
- onpopupshowing="return gZenBrowserManagerSidebar.createContainerTabMenu(event);" />
- </menu>
- <menuitem id="context_zenToogleUAWebPanel" oncommand="gZenBrowserManagerSidebar.contextToggleUserAgent();"/>
- <menuseparator/>
- <menuitem id="context_zenDeleteWebPanel" oncommand="gZenBrowserManagerSidebar.contextDelete();" data-l10n-id="zen-web-side-panel-context-delete"/>
-</menupopup>
-
-<html:template id="template-zen-split-view-modifier">
-<panel id="zenSplitViewModifier"
- class="panel-no-padding"
- orient="vertical"
- role="alertdialog"
- type="arrow"
- onpopupshowing="gZenViewSplitter.disableTabRearrangeView();"
- aria-labelledby="zen-split-view-modifier-header"
- tabspecific="true">
- <panelmultiview id="zenSplitViewModifierMultiview"
- mainViewId="zenSplitViewModifierViewDefault">
- <panelview id="zenSplitViewModifierViewDefault"
- class="PanelUI-subView"
- role="document"
- mainview-with-header="true"
- has-custom-header="true">
- <box id="zenSplitViewModifierHeader"
- class="panel-header panel-header-with-additional-element panel-header-with-info-button">
- <html:h1>
- <html:span data-l10n-id="zen-split-view-modifier-header"></html:span>
- </html:h1>
- <toolbarbutton id="zenSplitViewModifierActivateReallocation"
- class="panel-info-button"
- oncommand="gZenViewSplitter.enableTabRearrangeView();"
- data-l10n-id="zen-split-view-modifier-activate-reallocation">
- <image/>
- </toolbarbutton>
- </box>
- <hbox id="zenSplitViewModifierContent">
- <vbox>
- <box class="zen-split-view-modifier-preview grid">
- <box></box>
- <box></box>
- <box></box>
- </box>
- <p>Grid Layout</p>
- </vbox>
- <vbox>
- <box class="zen-split-view-modifier-preview vsep">
- <box></box>
- <box></box>
- </box>
- <p>Vertical</p>
- </vbox>
- <vbox>
- <box class="zen-split-view-modifier-preview hsep">
- <box></box>
- <box></box>
- </box>
- <p>Horizontal</p>
- </vbox>
- <vbox>
- <box class="zen-split-view-modifier-preview unsplit">
- <box></box>
- </box>
- <p>Unsplit</p>
- </vbox>
- </hbox>
- </panelview>
- </panelmultiview>
-</panel>
-</html:template>
<panel flip="side" type="arrow" orient="vertical" id="PanelUI-zen-gradient-generator" position="bottomright topright" mainview="true" side="left" onpopuphidden="gZenThemePicker.handlePanelClose();" onpopupshowing="gZenThemePicker.handlePanelOpen();">
<panelmultiview id="PanelUI-zen-gradient-generator-multiview" mainViewId="PanelUI-zen-gradient-generator-view">
diff --git a/src/browser/base/content/zen-preloaded.inc.xhtml b/src/browser/base/content/zen-preloaded.inc.xhtml
index 1a99f5894..3578e38db 100644
--- a/src/browser/base/content/zen-preloaded.inc.xhtml
+++ b/src/browser/base/content/zen-preloaded.inc.xhtml
@@ -2,6 +2,7 @@
# the window is fully loaded.
# Make sure they are loaded before the global-scripts.inc file.
<script type="text/javascript">
+ Services.scriptloader.loadSubScript("chrome://browser/content/zen-sets.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenCommonUtils.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaces.mjs", this);
diff --git a/src/browser/base/content/zen-sets.js b/src/browser/base/content/zen-sets.js
new file mode 100644
index 000000000..f808ef087
--- /dev/null
+++ b/src/browser/base/content/zen-sets.js
@@ -0,0 +1,92 @@
+document.addEventListener(
+ 'MozBeforeInitialXULLayout',
+ () => {
+ // <commandset id="mainCommandSet"> defined in browser-sets.inc
+ document
+ .getElementById('zenCommandSet')
+ // eslint-disable-next-line complexity
+ .addEventListener('command', (event) => {
+ switch (event.target.id) {
+ case 'cmd_zenCompactModeToggle':
+ gZenCompactModeManager.toggle();
+ break;
+ case 'cmd_zenCompactModeShowSidebar':
+ gZenCompactModeManager.toggleSidebar();
+ break;
+ case 'cmd_zenCompactModeShowToolbar':
+ gZenCompactModeManager.toggleToolbar();
+ break;
+ case 'cmd_zenWorkspaceForward':
+ ZenWorkspaces.changeWorkspaceShortcut();
+ break;
+ case 'cmd_zenWorkspaceBackward':
+ ZenWorkspaces.changeWorkspaceShortcut(-1);
+ break;
+ case 'cmd_zenSplitViewGrid':
+ gZenViewSplitter.toggleShortcut('grid');
+ break;
+ case 'cmd_zenSplitViewVertical':
+ gZenViewSplitter.toggleShortcut('vsep');
+ break;
+ case 'cmd_zenSplitViewHorizontal':
+ gZenViewSplitter.toggleShortcut('hsep');
+ break;
+ case 'cmd_zenSplitViewUnsplit':
+ gZenViewSplitter.toggleShortcut('unsplit');
+ break;
+ case 'cmd_zenCopyCurrentURLMarkdown':
+ gZenCommonActions.copyCurrentURLAsMarkdownToClipboard();
+ break;
+ case 'cmd_zenCopyCurrentURL':
+ gZenCommonActions.copyCurrentURLToClipboard();
+ break;
+ case 'cmd_zenPinnedTabReset':
+ gZenPinnedTabManager.resetPinnedTab(gBrowser.selectedTab);
+ break;
+ case 'cmd_zenPinnedTabResetNoTab':
+ gZenPinnedTabManager.resetPinnedTab();
+ break;
+ case 'cmd_zenToggleSidebar':
+ gZenVerticalTabsManager.toggleExpand();
+ break;
+ case 'cmd_zenOpenZenThemePicker':
+ gZenThemePicker.openThemePicker(event);
+ break;
+ case 'cmd_zenChangeWorkspaceTab':
+ ZenWorkspaces.changeTabWorkspace(event.target.getAttribute('zen-workspace-id'));
+ break;
+ case 'cmd_zenToggleTabsOnRight':
+ gZenVerticalTabsManager.toggleTabsOnRight();
+ break;
+ case 'cmd_zenSplitViewLinkInNewTab':
+ gZenViewSplitter.splitLinkInNewTab();
+ break;
+ case 'cmd_zenReplacePinnedUrlWithCurrent':
+ gZenPinnedTabManager.replacePinnedUrlWithCurrent();
+ break;
+ case 'cmd_zenAddToEssentials':
+ gZenPinnedTabManager.addToEssentials();
+ break;
+ case 'cmd_zenRemoveFromEssentials':
+ gZenPinnedTabManager.removeEssentials();
+ break;
+ case 'cmd_zenUnloadTab':
+ gZenTabUnloader.unloadTab();
+ break;
+ case 'cmd_zenPreventUnloadTab':
+ gZenTabUnloader.preventUnloadTab();
+ break;
+ case 'cmd_zenIgnoreUnloadTab':
+ gZenTabUnloader.ignoreUnloadTab();
+ break;
+ default:
+ if (event.target.id.startsWith('cmd_zenWorkspaceSwitch')) {
+ const index = parseInt(event.target.id.replace('cmd_zenWorkspaceSwitch', ''), 10) - 1;
+ ZenWorkspaces.shortcutSwitchTo(index);
+ }
+ break;
+ }
+ });
+ },
+ { once: true }
+);
diff --git a/src/browser/base/content/zen-sidebar-icons.inc.xhtml b/src/browser/base/content/zen-sidebar-icons.inc.xhtml
index 8fd14b854..2d26c0a9c 100644
--- a/src/browser/base/content/zen-sidebar-icons.inc.xhtml
+++ b/src/browser/base/content/zen-sidebar-icons.inc.xhtml
@@ -9,6 +9,5 @@
context="toolbar-context-menu"
mode="icons">
<toolbarbutton removable="true" class="chromeclass-toolbar-additional toolbarbutton-1 zen-sidebar-action-button" id="zen-expand-sidebar-button" data-l10n-id="sidebar-zen-expand" cui-areatype="toolbar" oncommand="gZenVerticalTabsManager.toggleExpand();"></toolbarbutton>
- <toolbarbutton removable="true" class="toolbarbutton-1 zen-sidebar-action-button zen-compact-mode-ignore" id="zen-sidepanel-button" data-l10n-id="sidebar-zen-sidepanel" onclick="gZenBrowserManagerSidebar.toggle();"></toolbarbutton>
<toolbarbutton id="zen-workspaces-button" class="chromeclass-toolbar-additional" overflows="false" removable="false"></toolbarbutton>
</toolbar>
diff --git a/src/browser/base/content/zen-sidebar-panel.inc.xhtml b/src/browser/base/content/zen-sidebar-panel.inc.xhtml
deleted file mode 100644
index e089825f5..000000000
--- a/src/browser/base/content/zen-sidebar-panel.inc.xhtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<hbox id="zen-sidebar-web-panel-wrapper">
- <box id="zen-sidebar-web-panel" class="chromeclass-extrachrome" hidden="true" persist="pinned style hidden" pinned="true">
- <toolbar mode="icons" flex="1" id="zen-sidebar-web-header" fullscreentoolbar="true">
- <hbox>
- <toolbarbutton id="zen-sidebar-web-panel-back" class="toolbarbutton-1 chromeclass-toolbar-additional" oncommand="gZenBrowserManagerSidebar.back();"/>
- <toolbarbutton id="zen-sidebar-web-panel-forward" class="toolbarbutton-1 chromeclass-toolbar-additional" oncommand="gZenBrowserManagerSidebar.forward();"/>
- <toolbarbutton id="zen-sidebar-web-panel-reload" class="toolbarbutton-1 chromeclass-toolbar-additional" oncommand="gZenBrowserManagerSidebar.reload();"/>
- </hbox>
- <hbox id="zen-sidebar-web-panel-title" flex="1">
- </hbox>
- <hbox>
- <toolbarbutton id="zen-sidebar-web-panel-home" class="toolbarbutton-1 chromeclass-toolbar-additional" oncommand="gZenBrowserManagerSidebar.home();"/>
- <toolbarbutton id="zen-sidebar-web-panel-pinned" class="toolbarbutton-1 chromeclass-toolbar-additional" pinned="true" oncommand="gZenBrowserManagerSidebar.togglePinned(this);"/>
- <toolbarbutton id="zen-sidebar-web-panel-close" class="toolbarbutton-1 chromeclass-toolbar-additional" oncommand="gZenBrowserManagerSidebar.close();"/>
- </hbox>
- </toolbar>
- <vbox id="zen-sidebar-web-panel-browser-containers">
- <vbox id="zen-sidebar-introduction-panel" hidden="true">
- <html:h1 data-l10n-id="zen-webpanel-introduction-title"/>
- <html:p data-l10n-id="zen-webpanel-introduction-description"/>
- </vbox>
- </vbox>
- <toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper" fullscreentoolbar="true">
- <toolbar mode="icons" flex="1" id="zen-sidebar-panels-sites" fullscreentoolbar="true">
-
- </toolbar>
- <toolbarbutton id="zen-sidebar-add-panel-button" class="zen-sidebar-panel-button toolbarbutton-1 chromeclass-toolbar-additional" onclick="gZenBrowserManagerSidebar._openAddPanelDialog();"/>
- </toolbar>
- <html:span class="zen-sidebar-web-panel-splitter" side="left"></html:span>
- <html:span class="zen-sidebar-web-panel-splitter" side="right"></html:span>
- <html:span class="zen-sidebar-web-panel-splitter" orient="horizontal" side="top"></html:span>
- <html:span class="zen-sidebar-web-panel-splitter" orient="horizontal" side="bottom"></html:span>
- </box>
-</hbox>
diff --git a/src/browser/base/content/zen-styles/zen-decks.css b/src/browser/base/content/zen-styles/zen-decks.css
index c92fa6216..ffab75cb6 100644
--- a/src/browser/base/content/zen-styles/zen-decks.css
+++ b/src/browser/base/content/zen-styles/zen-decks.css
@@ -106,113 +106,6 @@
display: flex !important;
}
-/* Split view panel */
-
-#zenSplitViewModifierViewDefault {
- min-width: 180px;
- min-height: 180px;
-
- padding: 15px;
- padding-top: 12px;
-}
-
-#zenSplitViewModifierContent {
- display: grid;
- grid-template-columns: 1fr 1fr;
- grid-template-rows: 1fr 1fr;
-
- gap: 15px;
-}
-
-#zenSplitViewModifierContent > vbox {
- display: flex;
- align-items: center;
- flex-direction: column;
- cursor: pointer;
-}
-
-#zenSplitViewModifierContent .zen-split-view-modifier-preview {
- border-radius: 5px;
- border: 1px solid var(--zen-colors-border);
- width: 100px;
- height: 70px;
- overflow: hidden;
- padding: 5px;
- user-select: none;
- font-weight: 500;
-}
-
-#zenSplitViewModifierContent .zen-split-view-modifier-preview.active {
- box-shadow: 0 0 0 2px var(--zen-primary-color);
- border-width: 0px;
-}
-
-#zenSplitViewModifierContent p {
- margin-top: 5px;
- margin-bottom: 0;
-}
-
-#zenSplitViewModifierContent .zen-split-view-modifier-preview {
- & box {
- background-color: var(--zen-colors-secondary);
- border-radius: 3px;
- width: 100%;
- height: 100%;
- transition: 0.1s;
- }
-
- &:hover box {
- background-color: var(--zen-primary-color);
- }
-}
-
-#zenSplitViewModifierContent .zen-split-view-modifier-preview.hsep {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
-}
-
-#zenSplitViewModifierContent .zen-split-view-modifier-preview.hsep box:last-child {
- margin-top: 5px;
-}
-
-#zenSplitViewModifierContent .zen-split-view-modifier-preview.vsep box:last-child {
- margin-left: 5px;
-}
-
-#zenSplitViewModifierContent .zen-split-view-modifier-preview.grid {
- display: grid;
- grid-template-areas: 'a b' 'c b';
- gap: 5px;
-}
-
-#zenSplitViewModifierContent .zen-split-view-modifier-preview.grid box:nth-child(1) {
- grid-area: a;
-}
-
-#zenSplitViewModifierContent .zen-split-view-modifier-preview.grid box:nth-child(2) {
- grid-area: b;
-}
-
-#zenSplitViewModifierContent .zen-split-view-modifier-preview.grid box:nth-child(3) {
- grid-area: c;
-}
-
-#zenSplitViewModifierHeader {
- min-height: 0;
- padding: 0;
- margin: 0;
- margin-bottom: 12px;
-}
-
-#zenSplitViewModifierEnabledToast {
- display: none;
-}
-
-#zenSplitViewModifier:not([has-enabled-realloc])[toast] #zenSplitViewModifierEnabledToast {
- display: revert;
-}
-
.zen-view-splitter-header-container {
position: absolute;
top: calc(var(--zen-split-column-gap) / -2);
diff --git a/src/browser/base/zen-components/ZenGradientGenerator.mjs b/src/browser/base/zen-components/ZenGradientGenerator.mjs
index 97dce58c9..7e43b36a0 100644
--- a/src/browser/base/zen-components/ZenGradientGenerator.mjs
+++ b/src/browser/base/zen-components/ZenGradientGenerator.mjs
@@ -52,7 +52,7 @@
const menu = window.MozXULElement.parseXULToFragment(`
<menuitem id="zenToolbarThemePicker"
data-lazy-l10n-id="zen-workspaces-change-gradient"
- oncommand="gZenThemePicker.openThemePicker(event);"/>
+ command="cmd_zenOpenZenThemePicker"/>
`);
document.getElementById('toolbar-context-customize').before(menu);
}
diff --git a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
index 986dd3d26..d0723eaa4 100644
--- a/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
+++ b/src/browser/base/zen-components/ZenKeyboardShortcuts.mjs
@@ -403,11 +403,7 @@ class KeyShortcut {
}
key.setAttribute('modifiers', this.#modifiers.toString());
if (this.#action) {
- if (this.#action?.startsWith('code:')) {
- key.setAttribute('oncommand', this.#action.substring(5));
- } else {
- key.setAttribute('command', this.#action);
- }
+ key.setAttribute('command', this.#action);
}
if (this.#disabled) {
key.setAttribute('disabled', this.#disabled);
@@ -442,6 +438,11 @@ class KeyShortcut {
return this.#action;
}
+ // Only used for migration!
+ _setAction(action) {
+ this.#action = action;
+ }
+
getL10NID() {
return this.#l10nId;
}
@@ -603,7 +604,7 @@ class ZenKeyboardShortcutsLoader {
'',
ZEN_COMPACT_MODE_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, alt: true }),
- 'code:gZenCompactModeManager.toggle()',
+ 'cmd_zenCompactModeToggle',
'zen-compact-mode-shortcut-toggle'
)
);
@@ -614,7 +615,7 @@ class ZenKeyboardShortcutsLoader {
'',
ZEN_COMPACT_MODE_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, alt: true }),
- 'code:gZenCompactModeManager.toggleSidebar()',
+ 'cmd_zenCompactModeShowSidebar',
'zen-compact-mode-shortcut-show-sidebar'
)
);
@@ -625,12 +626,12 @@ class ZenKeyboardShortcutsLoader {
'',
ZEN_COMPACT_MODE_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, alt: true }),
- 'code:gZenCompactModeManager.toggleToolbar()',
+ 'cmd_zenCompactModeShowToolbar',
'zen-compact-mode-shortcut-show-toolbar'
)
);
- // Workspace's keyset
+ // Workspace shortcuts
for (let i = 10; i > 0; i--) {
newShortcutList.push(
new KeyShortcut(
@@ -639,7 +640,7 @@ class ZenKeyboardShortcutsLoader {
'',
ZEN_WORKSPACE_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({}),
- `code:ZenWorkspaces.shortcutSwitchTo(${i - 1})`,
+ `cmd_zenWorkspaceSwitch${i}`,
`zen-workspace-shortcut-switch-${i}`
)
);
@@ -651,7 +652,7 @@ class ZenKeyboardShortcutsLoader {
'',
ZEN_WORKSPACE_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, alt: true }),
- 'code:ZenWorkspaces.changeWorkspaceShortcut()',
+ 'cmd_zenWorkspaceForward',
'zen-workspace-shortcut-forward'
)
);
@@ -662,24 +663,11 @@ class ZenKeyboardShortcutsLoader {
'',
ZEN_WORKSPACE_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, alt: true }),
- 'code:ZenWorkspaces.changeWorkspaceShortcut(-1)',
+ 'cmd_zenWorkspaceBackward',
'zen-workspace-shortcut-backward'
)
);
- // Other keyset
- newShortcutList.push(
- new KeyShortcut(
- 'zen-toggle-web-panel',
- 'P',
- '',
- ZEN_OTHER_SHORTCUTS_GROUP,
- KeyShortcutModifiers.fromObject({ alt: true }),
- 'code:gZenBrowserManagerSidebar.toggle()',
- 'zen-web-panel-shortcut-toggle'
- )
- );
-
// Split view
newShortcutList.push(
new KeyShortcut(
@@ -688,7 +676,7 @@ class ZenKeyboardShortcutsLoader {
'',
ZEN_SPLIT_VIEW_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, alt: true }),
- "code:gZenViewSplitter.toggleShortcut('grid')",
+ 'cmd_zenSplitViewGrid',
'zen-split-view-shortcut-grid'
)
);
@@ -699,7 +687,7 @@ class ZenKeyboardShortcutsLoader {
'',
ZEN_SPLIT_VIEW_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, alt: true }),
- "code:gZenViewSplitter.toggleShortcut('vsep')",
+ 'cmd_zenSplitViewVertical',
'zen-split-view-shortcut-vertical'
)
);
@@ -710,7 +698,7 @@ class ZenKeyboardShortcutsLoader {
'',
ZEN_SPLIT_VIEW_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, alt: true }),
- "code:gZenViewSplitter.toggleShortcut('hsep')",
+ 'cmd_zenSplitViewHorizontal',
'zen-split-view-shortcut-horizontal'
)
);
@@ -721,7 +709,7 @@ class ZenKeyboardShortcutsLoader {
'',
ZEN_SPLIT_VIEW_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, alt: true }),
- "code:gZenViewSplitter.toggleShortcut('unsplit')",
+ 'cmd_zenSplitViewUnsplit',
'zen-split-view-shortcut-unsplit'
)
);
@@ -756,7 +744,7 @@ class ZenKeyboardShortcutsLoader {
}
class ZenKeyboardShortcutsVersioner {
- static LATEST_KBS_VERSION = 8;
+ static LATEST_KBS_VERSION = 9;
constructor() {}
@@ -848,7 +836,7 @@ class ZenKeyboardShortcutsVersioner {
'',
ZEN_OTHER_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({}),
- 'code:gZenPinnedTabManager.resetPinnedTab(gBrowser.selectedTab)',
+ 'cmd_zenPinnedTabReset',
'zen-pinned-tab-shortcut-reset'
)
);
@@ -885,7 +873,7 @@ class ZenKeyboardShortcutsVersioner {
'',
ZEN_OTHER_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ alt: true }),
- 'code:gZenVerticalTabsManager.toggleExpand()',
+ 'cmd_zenToggleSidebar',
'zen-sidebar-shortcut-toggle'
)
);
@@ -900,7 +888,7 @@ class ZenKeyboardShortcutsVersioner {
'',
ZEN_OTHER_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, shift: true }),
- 'code:gZenCommonActions.copyCurrentURLToClipboard()',
+ 'cmd_zenCopyCurrentURL',
'zen-text-action-copy-url-shortcut'
)
);
@@ -932,11 +920,50 @@ class ZenKeyboardShortcutsVersioner {
'',
ZEN_OTHER_SHORTCUTS_GROUP,
KeyShortcutModifiers.fromObject({ accel: true, shift: true, alt: true }),
- 'code:gZenCommonActions.copyCurrentURLAsMarkdownToClipboard()',
+ 'cmd_zenCopyCurrentURLMarkdown',
'zen-text-action-copy-url-markdown-shortcut'
)
);
}
+ if (version < 9) {
+ // Migrate from version 8 to 9
+ // Due to security concerns, replace "code:" actions with corresponding <command> IDs
+ // we also remove 'zen-toggle-web-panel' since it's not used anymore
+ data = data.filter((shortcut) => shortcut.getID() != 'zen-toggle-web-panel');
+ for (let shortcut of data) {
+ if (shortcut.getAction()?.startsWith('code:')) {
+ const id = shortcut.getID();
+
+ // Map old shortcut IDs to new <command> IDs
+ const commandMap = {
+ 'zen-compact-mode-toggle': 'cmd_zenCompactModeToggle',
+ 'zen-compact-mode-show-sidebar': 'cmd_zenCompactModeShowSidebar',
+ 'zen-compact-mode-show-toolbar': 'cmd_zenCompactModeShowToolbar',
+ 'zen-workspace-forward': 'cmd_zenWorkspaceForward',
+ 'zen-workspace-backward': 'cmd_zenWorkspaceBackward',
+ 'zen-split-view-grid': 'cmd_zenSplitViewGrid',
+ 'zen-split-view-vertical': 'cmd_zenSplitViewVertical',
+ 'zen-split-view-horizontal': 'cmd_zenSplitViewHorizontal',
+ 'zen-split-view-unsplit': 'cmd_zenSplitViewUnsplit',
+ 'zen-copy-url': 'cmd_zenCopyCurrentURL',
+ 'zen-copy-url-markdown': 'cmd_zenCopyCurrentURLMarkdown',
+ 'zen-pinned-tab-reset-shortcut': 'cmd_zenPinnedTabReset',
+ 'zen-toggle-sidebar': 'cmd_zenToggleSidebar',
+ };
+
+ // Dynamically handle workspace switch shortcuts (zen-workspace-switch-1 to 10)
+ if (id?.startsWith('zen-workspace-switch-')) {
+ const num = id.replace('zen-workspace-switch-', '');
+ commandMap[id] = `cmd_zenWorkspaceSwitch${num}`;
+ }
+
+ // Replace action if a corresponding command exists
+ if (commandMap[id]) {
+ shortcut._setAction(commandMap[id]);
+ }
+ }
+ }
+ }
return data;
}
}
@@ -944,6 +971,7 @@ class ZenKeyboardShortcutsVersioner {
var gZenKeyboardShortcutsManager = {
loader: new ZenKeyboardShortcutsLoader(),
_hasToLoadDevtools: false,
+ _inlineCommands: [],
beforeInit() {
if (!this.inBrowserView) {
diff --git a/src/browser/base/zen-components/ZenMediaController.mjs b/src/browser/base/zen-components/ZenMediaController.mjs
index 57bc92cdb..f4e17aab8 100644
--- a/src/browser/base/zen-components/ZenMediaController.mjs
+++ b/src/browser/base/zen-components/ZenMediaController.mjs
@@ -442,9 +442,7 @@ class ZenMediaController {
onMediaFocus() {
if (!this._currentBrowser) return;
- const sidebarId = this._currentBrowser.getAttribute('zen-sidebar-id');
- if (sidebarId) gZenBrowserManagerSidebar.open(sidebarId);
- else this._currentMediaController?.focus();
+ this._currentMediaController?.focus();
}
onMediaMute() {
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 69df77ee4..b73a25d27 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -672,11 +672,11 @@
<menuitem id="context_zen-replace-pinned-url-with-current"
data-lazy-l10n-id="tab-context-zen-replace-pinned-url-with-current"
hidden="true"
- oncommand="gZenPinnedTabManager.replacePinnedUrlWithCurrent();"/>
+ command="cmd_zenReplacePinnedUrlWithCurrent"/>
<menuitem id="context_zen-reset-pinned-tab"
data-lazy-l10n-id="tab-context-zen-reset-pinned-tab"
hidden="true"
- oncommand="gZenPinnedTabManager.resetPinnedTab();"/>
+ command="cmd_zenPinnedTabResetNoTab"/>
`);
document.getElementById('tabContextMenu').appendChild(elements);
@@ -684,11 +684,11 @@
<menuitem id="context_zen-add-essential"
data-lazy-l10n-id="tab-context-zen-add-essential"
hidden="true"
- oncommand="gZenPinnedTabManager.addToEssentials();"/>
+ command="cmd_zenAddToEssentials"/>
<menuitem id="context_zen-remove-essential"
data-lazy-l10n-id="tab-context-zen-remove-essential"
hidden="true"
- oncommand="gZenPinnedTabManager.removeEssentials();"/>
+ command="cmd_zenRemoveFromEssentials"/>
`);
document.getElementById('context_pinTab')?.before(element);
diff --git a/src/browser/base/zen-components/ZenSidebarManager.mjs b/src/browser/base/zen-components/ZenSidebarManager.mjs
deleted file mode 100644
index 3dfaa8a99..000000000
--- a/src/browser/base/zen-components/ZenSidebarManager.mjs
+++ /dev/null
@@ -1,795 +0,0 @@
-class ZenBrowserManagerSidebar extends ZenDOMOperatedFeature {
- _sidebarElement = null;
- _currentPanel = null;
- _lastOpenedPanel = null;
- _hasChangedConfig = true;
- _splitterElement = null;
- _hSplitterElement = null;
- _hasRegisteredPinnedClickOutside = false;
- _isDragging = false;
- contextTab = null;
- sidebar = null;
- forwardButton = null;
- backButton = null;
- progressListener = null;
- _tabBrowserSet = new WeakMap();
- tabBox;
-
- DEFAULT_MOBILE_USER_AGENT = `Mozilla/5.0 (Android 12; Mobile; rv:129.0) Gecko/20100101 Firefox/${AppConstants.ZEN_FIREFOX_VERSION}`;
- MAX_SIDEBAR_PANELS = Services.prefs.getIntPref('zen.sidebar.max-webpanels');
-
- init() {
- ChromeUtils.defineLazyGetter(this, 'sidebar', () => document.getElementById('zen-sidebar-web-panel'));
- ChromeUtils.defineLazyGetter(this, 'forwardButton', () => document.getElementById('zen-sidebar-web-panel-forward'));
- ChromeUtils.defineLazyGetter(this, 'backButton', () => document.getElementById('zen-sidebar-web-panel-back'));
- ChromeUtils.defineLazyGetter(this, 'tabBox', () => document.getElementById('tabbrowser-tabbox'));
-
- this.onlySafeWidthAndHeight();
-
- this.initProgressListener();
- this.close(); // avoid caching
- this.tabBox.prepend(this.sidebarWrapper);
- this.listenForPrefChanges();
- this.insertIntoContextMenu();
- this.addPositioningListeners();
- this.syncPinnedState();
- }
-
- onlySafeWidthAndHeight() {
- const panel = this.sidebar;
- const width = panel.style.width;
- const height = panel.style.height;
- panel.setAttribute('style', '');
- panel.style.width = width;
- panel.style.height = height;
- }
-
- initProgressListener() {
- this.progressListener = {
- QueryInterface: ChromeUtils.generateQI(['nsIWebProgressListener', 'nsISupportsWeakReference']),
- onLocationChange: function (aWebProgress, aRequest, aLocation, aFlags) {
- const browser = this._getCurrentBrowser();
- if (!browser) return;
- const forwardDisabled = this.forwardButton.hasAttribute('disabled');
- const backDisabled = this.backButton.hasAttribute('disabled');
-
- if (browser.canGoForward === forwardDisabled) {
- if (browser.canGoForward) {
- this.forwardButton.removeAttribute('disabled');
- } else {
- this.forwardButton.setAttribute('disabled', true);
- }
- }
- if (browser.canGoBack === backDisabled) {
- if (browser.canGoBack) {
- this.backButton.removeAttribute('disabled');
- } else {
- this.backButton.setAttribute('disabled', true);
- }
- }
- }.bind(gZenBrowserManagerSidebar),
- };
- }
-
- get sidebarData() {
- let services = Services.prefs.getStringPref('zen.sidebar.data');
- if (services === '') {
- return {};
- }
- return JSON.parse(services);
- }
-
- get shouldCloseOnBlur() {
- return Services.prefs.getBoolPref('zen.sidebar.close-on-blur');
- }
-
- listenForPrefChanges() {
- Services.prefs.addObserver('zen.sidebar.data', this.handleEvent.bind(this));
- Services.prefs.addObserver('zen.sidebar.enabled', this.handleEvent.bind(this));
-
- this.handleEvent();
- }
-
- addPositioningListeners() {
- this.sidebar
- .querySelectorAll('.zen-sidebar-web-panel-splitter')
- .forEach((s) => s.addEventListener('mousedown', this.handleSplitterMouseDown.bind(this)));
- this.sidebarHeader.addEventListener('mousedown', this.handleDragPanel.bind(this));
- window.addEventListener('resize', this.onWindowResize.bind(this));
- }
-
- syncPinnedState() {
- const sidebar = document.getElementById('zen-sidebar-web-panel');
- const pinButton = document.getElementById('zen-sidebar-web-panel-pinned');
-
- if (sidebar.hasAttribute('pinned')) {
- pinButton.setAttribute('pinned', 'true');
- } else {
- pinButton.removeAttribute('pinned');
- }
- }
-
- handleSplitterMouseDown(mouseDownEvent) {
- if (this._isDragging) return;
- this._isDragging = true;
-
- const isHorizontal = mouseDownEvent.target.getAttribute('orient') === 'horizontal';
- setCursor(isHorizontal ? 'ns-resize' : 'ew-resize');
- const reverse = ['left', 'top'].includes(mouseDownEvent.target.getAttribute('side'));
- const direction = isHorizontal ? 'height' : 'width';
- const axis = isHorizontal ? 'Y' : 'X';
-
- const computedStyle = window.getComputedStyle(this.sidebar);
- const maxSize = parseInt(computedStyle.getPropertyValue(`max-${direction}`).match(/(\d+)px/)?.[1]) || Infinity;
- const minSize = parseInt(computedStyle.getPropertyValue(`min-${direction}`).match(/(\d+)px/)?.[1]) || 0;
-
- const sidebarSizeStart = this.sidebar.getBoundingClientRect()[direction];
-
- const startPos = mouseDownEvent[`screen${axis}`];
-
- const toAdjust = isHorizontal ? 'top' : 'left';
- const sidebarPosStart = parseInt(this.sidebar.style[toAdjust].match(/\d+/));
-
- let mouseMove = function (e) {
- let mouseMoved = e[`screen${axis}`] - startPos;
- if (reverse) {
- mouseMoved *= -1;
- }
- let newSize = sidebarSizeStart + mouseMoved;
- let currentMax = maxSize;
- const wrapperBox = this.sidebarWrapper.getBoundingClientRect();
- let maxWrapperSize = Infinity;
- if (this.isFloating) {
- maxWrapperSize = reverse ? sidebarPosStart + sidebarSizeStart : wrapperBox[direction] - sidebarPosStart;
- }
- newSize = Math.max(minSize, Math.min(currentMax, maxWrapperSize, newSize));
-
- window.requestAnimationFrame(() => {
- if (reverse) {
- const actualMoved = newSize - sidebarSizeStart;
- this.sidebar.style[toAdjust] = sidebarPosStart - actualMoved + 'px';
- }
- this.sidebar.style[direction] = `${newSize}px`;
- });
- }.bind(this);
-
- document.addEventListener('mousemove', mouseMove);
- document.addEventListener(
- 'mouseup',
- () => {
- document.removeEventListener('mousemove', mouseMove);
- this._isDragging = false;
- setCursor('auto');
- },
- { once: true }
- );
- }
-
- handleDragPanel(mouseDownEvent) {
- if (this.sidebarHeaderButtons.find((b) => b.contains(mouseDownEvent.target))) {
- return;
- }
- this._isDragging = true;
- const startTop = this.sidebar.style.top?.match(/\d+/)?.[0] || 0;
- const startLeft = this.sidebar.style.left?.match(/\d+/)?.[0] || 0;
-
- const sidebarBBox = this.sidebar.getBoundingClientRect();
- const sideBarHeight = sidebarBBox.height;
- const sideBarWidth = sidebarBBox.width;
-
- const topMouseOffset = startTop - mouseDownEvent.screenY;
- const leftMouseOffset = startLeft - mouseDownEvent.screenX;
- const moveListener = (mouseMoveEvent) => {
- window.requestAnimationFrame(() => {
- let top = mouseMoveEvent.clientY + topMouseOffset;
- let left = mouseMoveEvent.clientX + leftMouseOffset;
-
- const wrapperBounds = this.sidebarWrapper.getBoundingClientRect();
- top = Math.max(0, Math.min(top, wrapperBounds.height - sideBarHeight));
- left = Math.max(0, Math.min(left, wrapperBounds.width - sideBarWidth));
-
- this.sidebar.style.top = top + 'px';
- this.sidebar.style.left = left + 'px';
- });
- };
-
- document.addEventListener('mousemove', moveListener);
- document.addEventListener(
- 'mouseup',
- () => {
- document.removeEventListener('mousemove', moveListener);
- this._isDragging = false;
- },
- { once: true }
- );
- }
-
- onWindowResize() {
- if (!this.isFloating) return;
- const top = parseInt(this.sidebar.style.top?.match(/\d+/)?.[0] || 0);
- const left = parseInt(this.sidebar.style.left?.match(/\d+/)?.[0] || 0);
- const wrapperRect = this.sidebarWrapper.getBoundingClientRect();
- const sidebarRect = this.sidebar.getBoundingClientRect();
-
- if (sidebarRect.height < wrapperRect.height && top + sidebarRect.height > wrapperRect.height) {
- this.sidebar.style.top = wrapperRect.height - sidebarRect.height + 'px';
- }
- if (sidebarRect.width < wrapperRect.width && left + sidebarRect.width > wrapperRect.width) {
- this.sidebar.style.left = wrapperRect.width - sidebarRect.width + 'px';
- }
- }
-
- get isFloating() {
- return document.getElementById('zen-sidebar-web-panel').hasAttribute('pinned');
- }
-
- handleEvent() {
- this._hasChangedConfig = true;
- this.update();
- this._hasChangedConfig = false;
-
- // https://stackoverflow.com/questions/11565471/removing-event-listener-which-was-added-with-bind
- var clickOutsideHandler = this._handleClickOutside.bind(this);
- let isFloating = this.isFloating;
- if (isFloating && !this._hasRegisteredPinnedClickOutside) {
- document.addEventListener('mouseup', clickOutsideHandler);
- this._hasRegisteredPinnedClickOutside = true;
- } else if (!isFloating && this._hasRegisteredPinnedClickOutside) {
- document.removeEventListener('mouseup', clickOutsideHandler);
- this._hasRegisteredPinnedClickOutside = false;
- }
-
- const button = document.getElementById('zen-sidepanel-button');
- if (!button) return;
- if (Services.prefs.getBoolPref('zen.sidebar.enabled')) {
- button.removeAttribute('hidden');
- } else {
- button.setAttribute('hidden', 'true');
- this._closeSidebarPanel();
- return;
- }
- }
-
- _handleClickOutside(event) {
- if (!this.sidebar.hasAttribute('pinned') || this._isDragging || !this.shouldCloseOnBlur) {
- return;
- }
- let target = event.target;
- const closestSelector = [
- '#zen-sidebar-web-panel',
- '#zen-sidebar-panels-wrapper',
- '#zenWebPanelContextMenu',
- '#zen-sidebar-web-panel-splitter',
- '#contentAreaContextMenu',
- '#zen-sidepanel-button',
- ].join(', ');
- if (target.closest(closestSelector)) {
- return;
- }
- this.close();
- }
-
- toggle() {
- if (!this._currentPanel) {
- this._currentPanel = this._lastOpenedPanel;
- }
- if (document.getElementById('zen-sidebar-web-panel').hasAttribute('hidden')) {
- this.open();
- return;
- }
- this.close();
- }
-
- open(id = null) {
- let sidebar = document.getElementById('zen-sidebar-web-panel');
- if (id) this._currentPanel = id;
-
- sidebar.removeAttribute('hidden');
- this.update();
- }
-
- update() {
- this._updateWebPanels();
- this._updateSidebarButton();
- this._updateWebPanel();
- this._updateButtons();
- }
-
- _updateSidebarButton() {
- let button = document.getElementById('zen-sidepanel-button');
- if (!button) return;
- if (!document.getElementById('zen-sidebar-web-panel').hasAttribute('hidden')) {
- button.setAttribute('open', 'true');
- } else {
- button.removeAttribute('open');
- }
- }
-
- _updateWebPanels() {
- if (Services.prefs.getBoolPref('zen.sidebar.enabled')) {
- this.sidebarElement.removeAttribute('hidden');
- } else {
- this.sidebarElement.setAttribute('hidden', 'true');
- this._closeSidebarPanel();
- return;
- }
-
- // Don't reload content if at least one of the panel tabs was loaded
- if (this._lastOpenedPanel) {
- return;
- }
-
- let data = this.sidebarData;
- if (!data.data || !data.index) {
- return;
- }
- this.sidebarElement.innerHTML = '';
- for (let site of data.index) {
- let panel = data.data[site];
- if (!panel || !panel.url) {
- continue;
- }
- let button = document.createXULElement('toolbarbutton');
- button.classList.add('zen-sidebar-panel-button', 'toolbarbutton-1', 'chromeclass-toolbar-additional');
- button.setAttribute('flex', '1');
- button.setAttribute('zen-sidebar-id', site);
- button.setAttribute('context', 'zenWebPanelContextMenu');
- this._getWebPanelIcon(panel.url, button);
- button.addEventListener('click', this._handleClick.bind(this));
- button.addEventListener('dragstart', this._handleDragStart.bind(this));
- button.addEventListener('dragover', this._handleDragOver.bind(this));
- button.addEventListener('dragenter', this._handleDragEnter.bind(this));
- button.addEventListener('dragend', this._handleDragEnd.bind(this));
- this.sidebarElement.appendChild(button);
- }
- const addButton = document.getElementById('zen-sidebar-add-panel-button');
- if (data.index.length < this.MAX_SIDEBAR_PANELS) {
- addButton.removeAttribute('hidden');
- } else {
- addButton.setAttribute('hidden', 'true');
- }
- }
-
- async _openAddPanelDialog() {
- let dialogURL = 'chrome://browser/content/places/zenNewWebPanel.xhtml';
- let features = 'centerscreen,chrome,modal,resizable=no';
- let aParentWindow = Services.wm.getMostRecentWindow('navigator:browser');
-
- if (aParentWindow?.gDialogBox) {
- await aParentWindow.gDialogBox.open(dialogURL, {});
- } else {
- aParentWindow.openDialog(dialogURL, '', features, {});
- }
- }
-
- _setPinnedToElements() {
- let sidebar = document.getElementById('zen-sidebar-web-panel');
- sidebar.setAttribute('pinned', 'true');
- document.getElementById('zen-sidebar-web-panel-pinned').setAttribute('pinned', 'true');
- }
-
- _removePinnedFromElements() {
- let sidebar = document.getElementById('zen-sidebar-web-panel');
- sidebar.removeAttribute('pinned');
- document.getElementById('zen-sidebar-web-panel-pinned').removeAttribute('pinned');
- }
-
- _closeSidebarPanel() {
- let sidebar = document.getElementById('zen-sidebar-web-panel');
- sidebar.setAttribute('hidden', 'true');
- this._lastOpenedPanel = this._currentPanel;
- this._currentPanel = null;
- }
-
- _handleClick(event) {
- let target = event.target;
- let panelId = target.getAttribute('zen-sidebar-id');
- if (this._currentPanel === panelId) {
- return;
- }
- this._currentPanel = panelId;
- this._updateWebPanel();
- }
-
- _handleDragStart(event) {
- this.__dragingElement = event.target;
- this.__dragingIndex = Array.prototype.indexOf.call(event.target.parentNode.children, event.target);
- event.target.style.opacity = '0.7';
-
- event.dataTransfer.effectAllowed = 'move';
- event.dataTransfer.setData('text/html', event.target.innerHTML);
- event.dataTransfer.setData('text/plain', event.target.id);
- }
-
- _handleDragOver(event) {}
-
- _handleDragEnter(event) {
- if (typeof this.__dragingElement === 'undefined') {
- return;
- }
- const target = event.target;
- const elIndex = Array.prototype.indexOf.call(target.parentNode.children, target);
- if (elIndex < this.__dragingIndex) {
- target.before(this.__dragingElement);
- this.__dragingIndex = elIndex - 1;
- }
- target.after(this.__dragingElement);
- this.__dragingIndex = elIndex + 1;
- }
-
- _handleDragEnd(event) {
- event.target.style.opacity = '1';
-
- let data = this.sidebarData;
- let newPos = [];
- for (let element of this.__dragingElement.parentNode.children) {
- let panelId = element.getAttribute('zen-sidebar-id');
- newPos.push(panelId);
- }
- data.index = newPos;
- Services.prefs.setStringPref('zen.sidebar.data', JSON.stringify(data));
- this._currentPanel = this.__dragingElement.getAttribute('zen-sidebar-id');
- this.open();
- this.__dragingElement = undefined;
- }
-
- _createNewPanel(url) {
- let data = this.sidebarData;
- let newName = 'p' + new Date().getTime();
- data.index.push(newName);
- data.data[newName] = {
- url: url,
- ua: false,
- };
- Services.prefs.setStringPref('zen.sidebar.data', JSON.stringify(data));
- this._currentPanel = newName;
- this.open();
- }
-
- _updateButtons() {
- for (let button of this.sidebarElement.querySelectorAll('.zen-sidebar-panel-button')) {
- if (button.getAttribute('zen-sidebar-id') === this._currentPanel) {
- button.setAttribute('selected', 'true');
- } else {
- button.removeAttribute('selected');
- }
- }
- }
-
- _hideAllWebPanels() {
- let sidebar = document.getElementById('zen-sidebar-web-panel');
- for (let browser of sidebar.querySelectorAll('browser[zen-sidebar-id]')) {
- browser.setAttribute('hidden', 'true');
- browser.docShellIsActive = false;
- browser.zenModeActive = false;
- }
- }
-
- get introductionPanel() {
- return document.getElementById('zen-sidebar-introduction-panel');
- }
-
- _updateWebPanel() {
- this._updateButtons();
- // let sidebar = document.getElementById("zen-sidebar-web-panel");
- this._hideAllWebPanels();
- if (!this._currentPanel) {
- this.introductionPanel.removeAttribute('hidden');
- this.forwardButton.setAttribute('disabled', true);
- this.backButton.setAttribute('disabled', true);
- return;
- }
- this.introductionPanel.setAttribute('hidden', 'true');
- let existantWebview = this._getCurrentBrowser();
- if (existantWebview) {
- existantWebview.docShellIsActive = true;
- existantWebview.zenModeActive = true;
- existantWebview.removeAttribute('hidden');
- document.getElementById('zen-sidebar-web-panel-title').textContent = existantWebview.contentTitle;
- return;
- }
- let data = this._getWebPanelData(this._currentPanel);
- let browser = this._createWebPanelBrowser(data);
- let browserContainers = document.getElementById('zen-sidebar-web-panel-browser-containers');
- browserContainers.appendChild(browser);
- browser.addProgressListener(this.progressListener, Ci.nsIWebProgress.NOTIFY_LOCATION);
- if (data.ua) {
- browser.browsingContext.customUserAgent = this.DEFAULT_MOBILE_USER_AGENT;
- browser.reload();
- }
- browser.docShellIsActive = true;
- browser.zenModeActive = true;
- }
-
- _getWebPanelData(id) {
- let data = this.sidebarData;
- let panel = data.data[id];
- if (!panel || !panel.url) {
- return {};
- }
- return {
- id: id,
- ...panel,
- };
- }
-
- getTabForBrowser(browser) {
- return this._tabBrowserSet.get(browser);
- }
-
- setTabForBrowser(browser, tab) {
- this._tabBrowserSet.set(browser, tab);
- }
-
- removeTabForBrowser(browser) {
- this._tabBrowserSet.delete(browser);
- }
-
- _createWebPanelBrowser(data) {
- const titleContainer = document.getElementById('zen-sidebar-web-panel-title');
- titleContainer.textContent = 'Loading...';
- let browser = gBrowser.createBrowser({
- userContextId: data.userContextId,
- });
- const tab = this.sidebar.querySelector(`[zen-sidebar-id='${data.id}']`);
- this.setTabForBrowser(browser, tab);
- tab.linkedBrowser = browser;
- tab.permanentKey = browser.permanentKey;
- browser.setAttribute('disablefullscreen', 'true');
- browser.setAttribute('src', data.url);
- browser.setAttribute('zen-sidebar-id', data.id);
- browser.addEventListener(
- 'pagetitlechanged',
- function (event) {
- let browser = event.target;
- let title = browser.contentTitle;
- if (!title) {
- return;
- }
- let id = browser.getAttribute('zen-sidebar-id');
- if (id === this._currentPanel) {
- titleContainer.textContent = title;
- }
- }.bind(this)
- );
- return browser;
- }
-
- _getWebPanelIcon(url, element) {
- let { preferredURI } = Services.uriFixup.getFixupURIInfo(url);
- element.setAttribute('image', `page-icon:${preferredURI.spec}`);
- if (Services.prefs.getBoolPref('zen.sidebar.use-google-favicons')) {
- fetch(`https://s2.googleusercontent.com/s2/favicons?domain_url=${preferredURI.spec}`).then(async (response) => {
- if (response.ok) {
- let blob = await response.blob();
- let reader = new FileReader();
- reader.onload = function () {
- element.setAttribute('image', reader.result);
- };
- reader.readAsDataURL(blob);
- }
- });
- }
- }
-
- _getBrowserById(id) {
- let sidebar = document.getElementById('zen-sidebar-web-panel');
- return sidebar.querySelector(`browser[zen-sidebar-id="${id}"]`);
- }
-
- _getCurrentBrowser() {
- return this._getBrowserById(this._currentPanel);
- }
-
- reload() {
- let browser = this._getCurrentBrowser();
- if (browser) {
- browser.reload();
- }
- }
-
- forward() {
- let browser = this._getCurrentBrowser();
- if (browser) {
- browser.goForward();
- }
- }
-
- back() {
- let browser = this._getCurrentBrowser();
- if (browser) {
- browser.goBack();
- }
- }
-
- home() {
- let browser = this._getCurrentBrowser();
- if (browser) {
- browser.gotoIndex();
- }
- }
-
- close() {
- this._hideAllWebPanels();
- this._closeSidebarPanel();
- this._updateSidebarButton();
- }
-
- togglePinned(elem) {
- if (this.sidebar.hasAttribute('pinned')) {
- this._removePinnedFromElements();
- } else {
- this._setPinnedToElements();
- }
- this.update();
- }
-
- get sidebarElement() {
- if (!this._sidebarElement) {
- this._sidebarElement = document.getElementById('zen-sidebar-panels-sites');
- }
- return this._sidebarElement;
- }
-
- get splitterElement() {
- if (!this._splitterElement) {
- this._splitterElement = document.getElementById('zen-sidebar-web-panel-splitter');
- }
- return this._splitterElement;
- }
-
- get hSplitterElement() {
- if (!this._hSplitterElement) {
- this._hSplitterElement = document.getElementById('zen-sidebar-web-panel-hsplitter');
- }
- return this._hSplitterElement;
- }
-
- get sidebarHeader() {
- if (!this._sidebarHeader) {
- this._sidebarHeader = document.getElementById('zen-sidebar-web-header');
- }
- return this._sidebarHeader;
- }
-
- get sidebarWrapper() {
- if (!this._sideBarWrapper) {
- this._sideBarWrapper = document.getElementById('zen-sidebar-web-panel-wrapper');
- }
- return this._sideBarWrapper;
- }
-
- get sidebarHeaderButtons() {
- if (!this._sidebarHeaderButtons) {
- this._sidebarHeaderButtons = [...this.sidebarHeader.querySelectorAll('.toolbarbutton-1')];
- }
- return this._sidebarHeaderButtons;
- }
-
- // Context menu
-
- updateContextMenu(aPopupMenu) {
- let panel =
- aPopupMenu.triggerNode && (aPopupMenu.triggerNode || aPopupMenu.triggerNode.closest('toolbarbutton[zen-sidebar-id]'));
- if (!panel) {
- return;
- }
- let id = panel.getAttribute('zen-sidebar-id');
- this.contextTab = id;
- let data = this._getWebPanelData(id);
- let browser = this._getBrowserById(id);
- let isMuted = browser && browser.audioMuted;
- let mutedContextItem = document.getElementById('context_zenToggleMuteWebPanel');
- document.l10n.setAttributes(
- mutedContextItem,
- !isMuted ? 'zen-web-side-panel-context-mute-panel' : 'zen-web-side-panel-context-unmute-panel'
- );
- if (!isMuted) {
- mutedContextItem.setAttribute('muted', 'true');
- } else {
- mutedContextItem.removeAttribute('muted');
- }
- document.l10n.setAttributes(
- document.getElementById('context_zenToogleUAWebPanel'),
- data.ua ? 'zen-web-side-panel-context-disable-ua' : 'zen-web-side-panel-context-enable-ua'
- );
- if (!browser) {
- document.getElementById('context_zenUnloadWebPanel').setAttribute('disabled', 'true');
- } else {
- document.getElementById('context_zenUnloadWebPanel').removeAttribute('disabled');
- }
- }
-
- createContainerTabMenu(event) {
- let window = event.target.ownerGlobal;
- let data = this.sidebarData;
- let panelData = data.data[this.contextTab];
- return window.createUserContextMenu(event, {
- isContextMenu: true,
- excludeUserContextId: panelData.userContextId,
- showDefaultTab: true,
- });
- }
-
- contextChangeContainerTab(event) {
- let data = this.sidebarData;
- let userContextId = parseInt(event.target.getAttribute('data-usercontextid'));
- data.data[this.contextTab].userContextId = userContextId;
- Services.prefs.setStringPref('zen.sidebar.data', JSON.stringify(data));
- let browser = this._getBrowserById(this.contextTab);
- if (browser) {
- browser.remove();
- // We need to re-apply a new browser so it takes the new userContextId
- this._updateWebPanel();
- }
- }
-
- contextOpenNewTab() {
- let browser = this._getBrowserById(this.contextTab);
- let data = this.sidebarData;
- let panel = data.data[this.contextTab];
- let url = browser == null ? panel.url : browser.currentURI.spec;
- gZenUIManager.openAndChangeToTab(url);
- this.close();
- }
-
- contextToggleMuteAudio() {
- let browser = this._getBrowserById(this.contextTab);
- if (browser.audioMuted) {
- browser.unmute();
- } else {
- browser.mute();
- }
- }
-
- contextToggleUserAgent() {
- let browser = this._getBrowserById(this.contextTab);
- browser.browsingContext.customUserAgent = browser.browsingContext.customUserAgent ? null : this.DEFAULT_MOBILE_USER_AGENT;
- let data = this.sidebarData;
- data.data[this.contextTab].ua = !data.data[this.contextTab].ua;
- Services.prefs.setStringPref('zen.sidebar.data', JSON.stringify(data));
- browser.reload();
- }
-
- contextDelete() {
- let data = this.sidebarData;
- delete data.data[this.contextTab];
- data.index = data.index.filter((id) => id !== this.contextTab);
- let browser = this._getBrowserById(this.contextTab);
- if (browser) {
- browser.remove();
- document.getElementById('zen-sidebar-web-panel-title').textContent = '';
- }
- this._currentPanel = null;
- this._lastOpenedPanel = null;
- this.update();
- Services.prefs.setStringPref('zen.sidebar.data', JSON.stringify(data));
- }
-
- contextUnload() {
- let browser = this._getBrowserById(this.contextTab);
- this.removeTabForBrowser(browser);
- browser.remove();
- document.getElementById('zen-sidebar-web-panel-title').textContent = '';
- this._closeSidebarPanel();
- this.close();
- this._lastOpenedPanel = null;
- }
-
- insertIntoContextMenu() {
- const sibling = document.getElementById('context-stripOnShareLink');
- const menuitem = document.createXULElement('menuitem');
- menuitem.setAttribute('id', 'context-zenAddToWebPanel');
- menuitem.setAttribute('hidden', 'true');
- menuitem.setAttribute('oncommand', 'gZenBrowserManagerSidebar.addPanelFromContextMenu();');
- menuitem.setAttribute('data-l10n-id', 'zen-web-side-panel-context-add-to-panel');
- sibling.insertAdjacentElement('afterend', menuitem);
- }
-
- addPanelFromContextMenu() {
- const url = gContextMenu.linkURL || gContextMenu.target.ownerDocument.location.href;
- this._createNewPanel(url);
- }
-}
-
-window.gZenBrowserManagerSidebar = new ZenBrowserManagerSidebar();
diff --git a/src/browser/base/zen-components/ZenTabUnloader.mjs b/src/browser/base/zen-components/ZenTabUnloader.mjs
index cf3015532..768bd4e04 100644
--- a/src/browser/base/zen-components/ZenTabUnloader.mjs
+++ b/src/browser/base/zen-components/ZenTabUnloader.mjs
@@ -202,15 +202,15 @@
<menuseparator/>
<menuitem id="context_zenUnloadTab"
data-lazy-l10n-id="tab-zen-unload"
- oncommand="gZenTabUnloader.unloadTab();"/>
+ command="cmd_zenUnloadTab"/>
<menu data-lazy-l10n-id="zen-tabs-unloader-tab-actions" id="context_zenTabActions">
<menupopup>
<menuitem id="context_zenPreventUnloadTab"
data-lazy-l10n-id="tab-zen-prevent-unload"
- oncommand="gZenTabUnloader.preventUnloadTab();"/>
+ command="cmd_zenPreventUnloadTab"/>
<menuitem id="context_zenIgnoreUnloadTab"
data-lazy-l10n-id="tab-zen-ignore-unload"
- oncommand="gZenTabUnloader.ignoreUnloadTab();"/>
+ command="cmd_zenIgnoreUnloadTab"/>
</menupopup>
</menu>
`);
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index c8951caec..d6e9e8fe7 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -63,7 +63,6 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
currentView = -1;
_data = [];
_tabBrowserPanel = null;
- __modifierElement = null;
__hasSetMenuListener = false;
overlay = null;
_splitNodeToSplitters = new Map();
@@ -89,7 +88,6 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
window.addEventListener('TabClose', this.handleTabClose.bind(this));
window.addEventListener('TabSelect', this.onTabSelect.bind(this));
this.initializeContextMenu();
- this.insertPageActionButton();
this.insertIntoContextMenu();
// Add drag over listener to the browser view
@@ -105,7 +103,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
const menuitem = document.createXULElement('menuitem');
menuitem.setAttribute('id', 'context-zenSplitLink');
menuitem.setAttribute('hidden', 'true');
- menuitem.setAttribute('oncommand', 'gZenViewSplitter.splitLinkInNewTab();');
+ menuitem.setAttribute('command', 'cmd_zenSplitViewLinkInNewTab');
menuitem.setAttribute('data-l10n-id', 'zen-split-link');
sibling.insertAdjacentElement('beforebegin', menuitem);
}
@@ -835,23 +833,6 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
this.insetUpdateContextMenuItems();
}
- /**
- * Insert Page Action button
- */
- insertPageActionButton() {
- const element = window.MozXULElement.parseXULToFragment(`
- <hbox id="zen-split-views-box"
- hidden="true"
- role="button"
- class="urlbar-page-action"
- onclick="gZenViewSplitter.openSplitViewPanel(event);">
- <image id="zen-split-views-button"
- class="urlbar-icon"/>
- </hbox>
- `);
- document.getElementById('star-button-box').after(element);
- }
-
/**
* Gets the tab browser panel.
*
@@ -1400,42 +1381,6 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
}
- /**
- * Gets the modifier element.
- *
- * @returns {Element} The modifier element.
- */
- get modifierElement() {
- if (!this.__modifierElement) {
- const wrapper = document.getElementById('template-zen-split-view-modifier');
- const panel = wrapper.content.firstElementChild;
- wrapper.replaceWith(wrapper.content);
- this.__modifierElement = panel;
- }
- return this.__modifierElement;
- }
-
- /**
- * Opens the split view panel.
- *
- * @param {Event} event - The event that triggered the panel opening.
- */
- async openSplitViewPanel(event) {
- const panel = this.modifierElement;
- const target = event.target.parentNode;
- this.updatePanelUI(panel);
-
- if (!this.__hasSetMenuListener) {
- this.setupPanelListeners(panel);
- this.__hasSetMenuListener = true;
- }
-
- window.PanelMultiView.openPopup(panel, target, {
- position: 'bottomright topright',
- triggerEvent: event,
- }).catch(console.error);
- }
-
/**
* Updates the UI of the panel.
*
@@ -1451,34 +1396,6 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
}
- /**
- * @description sets up the listeners for the panel.
- * @param {Element} panel - The panel element
- */
- setupPanelListeners(panel) {
- for (const gridType of ['hsep', 'vsep', 'grid', 'unsplit']) {
- const selector = panel.querySelector(`.zen-split-view-modifier-preview.${gridType}`);
- selector.addEventListener('click', () => this.handlePanelSelection(gridType, panel));
- }
- }
-
- /**
- * @description handles the panel selection.
- * @param {string} gridType - The grid type
- * @param {Element} panel - The panel element
- */
- handlePanelSelection(gridType, panel) {
- if (gridType === 'unsplit') {
- this.unsplitCurrentView();
- } else {
- const group = this._data[this.currentView];
- group.gridType = gridType;
- group.layoutTree = this.calculateLayoutTree(group.tabs, gridType);
- this.activateSplitView(group, true);
- }
- panel.hidePopup();
- }
-
/**
* @description unsplit the current view.]
*/
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 6b2227a79..70f602b5e 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -2199,7 +2199,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
const menuPopup = document.createXULElement('menupopup');
menuPopup.setAttribute('id', 'context-zen-change-workspace-tab-menu-popup');
- menuPopup.setAttribute('oncommand', "ZenWorkspaces.changeTabWorkspace(event.target.getAttribute('zen-workspace-id'))");
+ menuPopup.setAttribute('command', 'cmd_zenChangeWorkspaceTab');
menu.appendChild(menuPopup);
diff --git a/src/browser/components/places/content/zenNewWebPanel.js b/src/browser/components/places/content/zenNewWebPanel.js
deleted file mode 100644
index 6b7374ff6..000000000
--- a/src/browser/components/places/content/zenNewWebPanel.js
+++ /dev/null
@@ -1,62 +0,0 @@
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-var gZenNewWebPanel = {
- init: function () {
- document.addEventListener('dialogaccept', this.handleDialogAccept.bind(this));
- },
-
- handleURLChange: async function (aURL) {
- try {
- let url = new URL(aURL.value);
- } catch (_) {
- // TODO: Show error message
- return;
- }
- },
-
- addHttpIfMissing(url) {
- // List of schemes to avoid
- const avoidSchemes = ['about:', 'chrome:', 'moz-extension:', 'view-source:'];
- // Check if the URL starts with any of the avoid schemes
- for (let scheme of avoidSchemes) {
- if (url.startsWith(scheme)) {
- return url;
- }
- }
- if (!url.startsWith('http://') && !url.startsWith('https://')) {
- return 'https://' + url;
- }
- return url;
- },
-
- handleDialogAccept: async function (aEvent) {
- document.commandDispatcher.focusedElement?.blur();
- let url = document.getElementById('zenNWP_url');
- let ua = document.getElementById('zenNWP_userAgent'); // checbkox
- if (!url || !ua) {
- return;
- }
- let urlValue = url.value;
- try {
- new URL(urlValue);
- } catch (_) {
- urlValue = this.addHttpIfMissing(url.value);
- }
- if (!url.value) {
- return;
- }
- let newSite = {
- url: urlValue,
- ua: ua.checked,
- };
- let currentData = JSON.parse(Services.prefs.getStringPref('zen.sidebar.data'));
- let newName = 'p' + new Date().getTime();
- currentData.index.push(newName);
- currentData.data[newName] = newSite;
- Services.prefs.setStringPref('zen.sidebar.data', JSON.stringify(currentData));
- },
-};
-
-gZenNewWebPanel.init();
diff --git a/src/browser/components/places/content/zenNewWebPanel.xhtml b/src/browser/components/places/content/zenNewWebPanel.xhtml
deleted file mode 100644
index 4187bb8c7..000000000
--- a/src/browser/components/places/content/zenNewWebPanel.xhtml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this
- - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE window>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- xmlns:html="http://www.w3.org/1999/xhtml"
- id="zenNewWebPanel"
- headerparent="zenNewWebPanelDialog"
- style="min-width: 40em;">
-<dialog id="zenNewWebPanelDialog"
- buttons="accept, cancel">
-
- <linkset>
- <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
- <html:link
- rel="stylesheet"
- href="chrome://global/content/commonDialog.css"
- />
- <html:link rel="stylesheet" href="chrome://global/skin/commonDialog.css" />
-
- <html:link rel="localization" href="browser/zenNewWebPanel.ftl"/>
- <script src="chrome://browser/content/zenThemeModifier.js"></script>
- </linkset>
-
- <script src="chrome://browser/content/places/zenNewWebPanel.js"/>
-
- <label data-l10n-id="zen-new-web-panel-url"
- control="zenNWP_url"/>
- <html:input id="zenNWP_url"
- type="url" onchange="gZenNewWebPanel.handleURLChange(this);"/>
-
- <hbox flex="1" style="margin: 10px 5px;">
- <html:input id="zenNWP_userAgent"
- type="checkbox"/>
- <label data-l10n-id="zen-new-web-panel-user-agent"
- control="zenNWP_userAgent" for="zenNWP_userAgent"/>
- </hbox>
-
-</dialog>
-</window>
diff --git a/src/browser/components/places/jar-mn.patch b/src/browser/components/places/jar-mn.patch
deleted file mode 100644
index 446ce0cd4..000000000
--- a/src/browser/components/places/jar-mn.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/browser/components/places/jar.mn b/browser/components/places/jar.mn
-index e12c6bbf449f062fd22ef260909b539857f52c6a..2dcc143109de015e4c9d486b83119ae1122d2e71 100644
---- a/browser/components/places/jar.mn
-+++ b/browser/components/places/jar.mn
-@@ -25,3 +25,5 @@ browser.jar:
- content/browser/places/interactionsViewer.css (metadataViewer/interactionsViewer.css)
- content/browser/places/interactionsViewer.html (metadataViewer/interactionsViewer.html)
- content/browser/places/interactionsViewer.js (metadataViewer/interactionsViewer.js)
-+ content/browser/places/zenNewWebPanel.xhtml (content/zenNewWebPanel.xhtml)
-+ content/browser/places/zenNewWebPanel.js (content/zenNewWebPanel.js)
diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js
index ad1903850..e8d32f43a 100644
--- a/src/browser/components/preferences/zen-settings.js
+++ b/src/browser/components/preferences/zen-settings.js
@@ -919,16 +919,6 @@ var gZenCKSSettings = {
};
Preferences.addAll([
- {
- id: 'zen.sidebar.enabled',
- type: 'bool',
- default: true,
- },
- {
- id: 'zen.sidebar.close-on-blur',
- type: 'bool',
- default: true,
- },
{
id: 'zen.view.compact.hide-toolbar',
type: 'bool',
diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index e9f5fe73a..59fc7dcf9 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -134,27 +134,6 @@
</vbox>
</groupbox>
-<hbox id="zenSidePanelsCategory"
- class="subcategory"
- hidden="true"
- data-category="paneZenLooks">
-<html:h1 data-l10n-id="pane-zen-side-panels-title"/>
-</hbox>
-
-<groupbox id="zenSidePanelsGroup" data-category="paneZenLooks" hidden="true" class="highlighting-group">
- <label><html:h2 data-l10n-id="zen-side-panels-header"/></label>
- <description class="description-deemphasized" data-l10n-id="zen-side-panels-description" />
-
- <checkbox id="zenLooksAndFeelUseThemedToolbar"
- data-l10n-id="zen-side-panels-enabled"
- preference="zen.sidebar.enabled"/>
- <hbox class="indent">
- <checkbox id="zenLooksAndFeelSidebarCloseOnBlur"
- data-l10n-id="zen-side-panels-close-on-blur"
- preference="zen.sidebar.close-on-blur"/>
- </hbox>
-</groupbox>
-
<hbox id="zenGlanceCategory"
class="subcategory"
hidden="true"
diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index 47236d364..ed1ef4432 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -6,7 +6,7 @@
<html:h1 data-l10n-id="pane-workspaces-title"/>
</hbox>
-<hbox id="zenSidePanelsCategory"
+<hbox id="zenTabManagementCategory"
class="subcategory"
hidden="true"
data-category="paneZenTabManagement">
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index cf000af85..74bb5d11d 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -82,10 +82,6 @@
list-style-image: url('chrome://browser/skin/sidebars.svg') !important;
}
-#zen-sidepanel-button {
- list-style-image: url('sidebar.svg');
-}
-
#downloads-button,
#downloads-indicator-anchor,
#appMenu-downloads-button,
diff --git a/src/browser/themes/shared/zen-icons/lin/icons.css b/src/browser/themes/shared/zen-icons/lin/icons.css
index e492aa771..d52a1e7fe 100644
--- a/src/browser/themes/shared/zen-icons/lin/icons.css
+++ b/src/browser/themes/shared/zen-icons/lin/icons.css
@@ -72,10 +72,6 @@
list-style-image: url('chrome://browser/skin/sidebars.svg') !important;
}
-#zen-sidepanel-button {
- list-style-image: url('sidebar.svg');
-}
-
#downloads-button,
#downloads-indicator-anchor,
#appMenu-downloads-button,
diff --git a/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch b/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch
index feaef745e..67c667969 100644
--- a/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch
+++ b/src/toolkit/components/pictureinpicture/PictureInPicture-sys-mjs.patch
@@ -1,16 +1,8 @@
diff --git a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
-index 5da0404b2672ba8cce7bcf808bf2373474776654..44b62bd752294c2af96dd5b5d08c90ddf3dc513f 100644
+index 5da0404b2672ba8cce7bcf808bf2373474776654..1405c53a927a64ecda8255d78d9aa5ddf8806685 100644
--- a/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
+++ b/toolkit/components/pictureinpicture/PictureInPicture.sys.mjs
-@@ -488,13 +488,13 @@ export var PictureInPicture = {
- return;
- }
-
-- let gBrowser = browser.getTabBrowser();
-- let tab = gBrowser.getTabForBrowser(browser);
-+ let gBrowser = browser?.ownerGlobal?.gBrowser;
-+ let tab = browser?.ownerGlobal?.gZenBrowserManagerSidebar.getTabForBrowser(browser) ?? gBrowser.getTabForBrowser(browser);
-
+@@ -494,7 +494,7 @@ export var PictureInPicture = {
// focus the tab's window
tab.ownerGlobal.focus();
@@ -27,12 +19,3 @@ index 5da0404b2672ba8cce7bcf808bf2373474776654..44b62bd752294c2af96dd5b5d08c90dd
let browserHasPip = !!this.browserWeakMap.get(browser);
if (browserHasPip) {
this.setUrlbarPipIconActive(browser.ownerGlobal);
-@@ -877,7 +878,7 @@ export var PictureInPicture = {
- win.setIsMutedState(videoData.isMuted);
-
- // set attribute which shows pip icon in tab
-- let tab = parentWin.gBrowser.getTabForBrowser(browser);
-+ let tab = parentWin.gBrowser.getTabForBrowser(browser) ?? parentWin.gZenBrowserManagerSidebar.getTabForBrowser(browser);;
- tab.setAttribute("pictureinpicture", true);
-
- this.setUrlbarPipIconActive(parentWin);
From 0a51ad3725e8a3802c62fbefdd0caeb2c0a2dc24 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 11:13:03 +0200
Subject: [PATCH 100/114] fix: enhance popup appearance with improved contrast
and styling for Mica popups
---
.../base/content/zen-styles/zen-panel-ui.css | 13 ++++++++++++
src/toolkit/themes/shared/popup-css.patch | 21 +++----------------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/browser/base/content/zen-styles/zen-panel-ui.css b/src/browser/base/content/zen-styles/zen-panel-ui.css
index 70f78c074..72c8954d6 100644
--- a/src/browser/base/content/zen-styles/zen-panel-ui.css
+++ b/src/browser/base/content/zen-styles/zen-panel-ui.css
@@ -17,3 +17,16 @@ panel[type='arrow'][animate='open'] {
panel[type='arrow'][animate]:not([animate='open']) {
animation: zen-jello-out-animation 0.3s ease-in-out;
}
+
+menupopup,
+panel {
+ @media (-moz-windows-mica-popups) {
+ appearance: auto !important;
+ -moz-default-appearance: menupopup;
+ /* The blur behind doesn't blur all that much, add a semi-transparent
+ * background to improve contrast */
+ --panel-background: light-dark(rgba(255, 255, 255, .5), rgba(0, 0, 0, .5)) !important;
+ --panel-border-color: transparent !important;
+ --panel-shadow-margin: 0px !important;
+ }
+}
diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch
index 82cb8cc98..1cb4dd167 100644
--- a/src/toolkit/themes/shared/popup-css.patch
+++ b/src/toolkit/themes/shared/popup-css.patch
@@ -1,5 +1,5 @@
diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css
-index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..e7847601bb9bedd01228ef5e6464b18eca587263 100644
+index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..ebb312830670564175cc98f11af1b29b80711ceb 100644
--- a/toolkit/themes/shared/popup.css
+++ b/toolkit/themes/shared/popup.css
@@ -21,8 +21,8 @@ panel {
@@ -22,22 +22,7 @@ index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..e7847601bb9bedd01228ef5e6464b18e
@media (prefers-contrast) {
--panel-border-color: color-mix(in srgb, currentColor 60%, transparent);
-@@ -50,23 +48,26 @@ panel {
- }
-
- @media (-moz-windows-mica-popups) {
-+ &:is(menupopup) {
- appearance: auto;
- -moz-default-appearance: menupopup;
- /* The blur behind doesn't blur all that much, add a semi-transparent
- * background to improve contrast */
-- --panel-background: light-dark(rgba(255, 255, 255, .5), rgba(0, 0, 0, .5));
-- --panel-border-color: transparent;
-- --panel-shadow-margin: 0px;
-+ --panel-background: light-dark(rgba(255, 255, 255, .5), rgba(0, 0, 0, .5)) !important;
-+ --panel-border-color: transparent !important;
-+ --panel-shadow-margin: 0px !important;
-+ }
+@@ -60,13 +58,14 @@ panel {
}
@media (-moz-platform: macos) {
@@ -54,7 +39,7 @@ index ed0caa97db5726a7d1bc1cd0aa7af3fdf99690dc..e7847601bb9bedd01228ef5e6464b18e
--panel-border-color: transparent;
/* This should be kept in sync with GetMenuMaskImage() */
--panel-border-radius: 6px;
-@@ -208,7 +209,6 @@ panel:where([type="arrow"]) {
+@@ -208,7 +207,6 @@ panel:where([type="arrow"]) {
}
&[animating] {
From 2a5c5e5d69de68b50da06ef5d406d1b41e0001e0 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 11:23:50 +0200
Subject: [PATCH 101/114] fix: improve panel background contrast and adjust min
width logic for browser elements
---
.../base/content/zen-styles/zen-panel-ui.css | 2 +-
src/browser/base/zen-components/ZenViewSplitter.mjs | 13 +++++++++----
src/browser/base/zen-components/ZenWorkspaces.mjs | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/browser/base/content/zen-styles/zen-panel-ui.css b/src/browser/base/content/zen-styles/zen-panel-ui.css
index 72c8954d6..239c30509 100644
--- a/src/browser/base/content/zen-styles/zen-panel-ui.css
+++ b/src/browser/base/content/zen-styles/zen-panel-ui.css
@@ -25,7 +25,7 @@ panel {
-moz-default-appearance: menupopup;
/* The blur behind doesn't blur all that much, add a semi-transparent
* background to improve contrast */
- --panel-background: light-dark(rgba(255, 255, 255, .5), rgba(0, 0, 0, .5)) !important;
+ --panel-background: light-dark(rgba(255, 255, 255, 0.5), rgba(0, 0, 0, 0.5)) !important;
--panel-border-color: transparent !important;
--panel-shadow-margin: 0px !important;
}
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index d6e9e8fe7..f3d0d49ec 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -228,13 +228,18 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
}
// Add a min width to all the browser elements to prevent them from resizing
- for (const browser of gBrowser.browsers) {
- const width = browser.getBoundingClientRect().width;
- browser.style.minWidth = `${width}px`;
- }
const panelsWidth = gBrowser.tabbox.getBoundingClientRect().width;
const halfWidth = panelsWidth / 2;
const side = event.clientX > halfWidth ? 'right' : 'left';
+ for (const browser of gBrowser.browsers) {
+ const width = browser.getBoundingClientRect().width;
+ // Only apply it to the left side because if we add it to the right side,
+ // we wont be able to move the element to the left.
+ // FIXME: This is a workaround, we should find a better way to do this
+ if (side === 'left') {
+ browser.style.minWidth = `${width}px`;
+ }
+ }
this.fakeBrowser = document.createXULElement('vbox');
window.addEventListener('dragend', this.onBrowserDragEndToSplit, { once: true });
const padding = Services.prefs.getIntPref('zen.theme.content-element-separation', 0);
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 70f602b5e..d6e4f0b64 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1414,7 +1414,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
const parent = tab.pinned ? '#vertical-pinned-tabs-container ' : '#tabbrowser-arrowscrollbox ';
const container = document.querySelector(parent + `.zen-workspace-tabs-section[zen-workspace-id="${workspaceID}"]`);
- if (container.contains(tab)) {
+ if (container?.contains(tab)) {
return false;
}
From 2bb183d675ffd6c27608bb65a35fff302f948501 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 14:32:25 +0200
Subject: [PATCH 102/114] fix: add optional chaining to prevent errors when
checking PIP mode or fullscreen status
---
src/browser/base/zen-components/ZenMediaController.mjs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/browser/base/zen-components/ZenMediaController.mjs b/src/browser/base/zen-components/ZenMediaController.mjs
index f4e17aab8..6dce54585 100644
--- a/src/browser/base/zen-components/ZenMediaController.mjs
+++ b/src/browser/base/zen-components/ZenMediaController.mjs
@@ -148,7 +148,7 @@ class ZenMediaController {
}
showMediaControls() {
- if (this._currentMediaController.isBeingUsedInPIPModeOrFullscreen) return this.hideMediaControls();
+ if (this._currentMediaController?.isBeingUsedInPIPModeOrFullscreen) return this.hideMediaControls();
if (!this.mediaControlBar.hasAttribute('hidden')) return;
this.updatePipButton();
From 1e678008a20116cdca391510e90e0af1e11713cf Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 15:33:58 +0200
Subject: [PATCH 103/114] Added a `split glance` button
---
src/browser/base/content/zen-glance.inc.xhtml | 5 +-
.../base/zen-components/ZenGlanceManager.mjs | 42 +-
.../base/zen-components/ZenViewSplitter.mjs | 41 +-
src/browser/themes/shared/zen-icons/icons.css | 6 +-
.../themes/shared/zen-icons/lin/icons.css | 1135 -----------------
5 files changed, 66 insertions(+), 1163 deletions(-)
delete mode 100644 src/browser/themes/shared/zen-icons/lin/icons.css
diff --git a/src/browser/base/content/zen-glance.inc.xhtml b/src/browser/base/content/zen-glance.inc.xhtml
index 51891d19c..3a2dcc0ae 100644
--- a/src/browser/base/content/zen-glance.inc.xhtml
+++ b/src/browser/base/content/zen-glance.inc.xhtml
@@ -1,4 +1,5 @@
<vbox id="zen-glance-sidebar-container" hidden="true">
- <toolbarbutton id="zen-glance-sidebar-close" data-l10n-id="zen-general-confirm" class="toolbarbutton-1" oncommand="gZenGlanceManager.closeGlance({ onTabClose: true })"/>
- <toolbarbutton id="zen-glance-sidebar-open" class="toolbarbutton-1" oncommand="gZenGlanceManager.fullyOpenGlance()"/>
+ <toolbarbutton id="zen-glance-sidebar-close" data-l10n-id="zen-general-confirm" class="toolbarbutton-1"/>
+ <toolbarbutton id="zen-glance-sidebar-open" class="toolbarbutton-1"/>
+ <toolbarbutton id="zen-glance-sidebar-split" class="toolbarbutton-1"/>
</vbox>
diff --git a/src/browser/base/zen-components/ZenGlanceManager.mjs b/src/browser/base/zen-components/ZenGlanceManager.mjs
index 80947e1a8..a450dc6f8 100644
--- a/src/browser/base/zen-components/ZenGlanceManager.mjs
+++ b/src/browser/base/zen-components/ZenGlanceManager.mjs
@@ -20,10 +20,30 @@
);
ChromeUtils.defineLazyGetter(this, 'sidebarButtons', () => document.getElementById('zen-glance-sidebar-container'));
-
document.getElementById('tabbrowser-tabpanels').addEventListener('click', this.onOverlayClick.bind(this));
-
Services.obs.addObserver(this, 'quit-application-requested');
+
+ this.#addSidebarButtonListeners();
+ }
+
+ #addSidebarButtonListeners() {
+ this.sidebarButtons.addEventListener('command', (event) => {
+ const button = event.target.closest('toolbarbutton');
+ if (!button) {
+ return;
+ }
+ switch (button.id) {
+ case 'zen-glance-sidebar-close':
+ this.closeGlance({ onTabClose: true });
+ break;
+ case 'zen-glance-sidebar-fullscreen':
+ this.fullyOpenGlance();
+ break;
+ case 'zen-glance-sidebar-split':
+ this.splitGlance();
+ break;
+ }
+ });
}
get #currentBrowser() {
@@ -524,7 +544,7 @@
this.#glances.delete(this.#currentGlanceID);
}
- async fullyOpenGlance() {
+ async fullyOpenGlance({ forSplit = false } = {}) {
this.animatingFullOpen = true;
gBrowser._insertTabAtIndex(this.#currentTab, {
index: this.getTabPosition(this.#currentTab),
@@ -540,7 +560,7 @@
this.#currentParentTab.linkedBrowser.closest('.browserSidebarContainer').classList.remove('zen-glance-background');
this.#currentParentTab._visuallySelected = false;
this.hideSidebarButtons();
- if (gReduceMotion) {
+ if (gReduceMotion || forSplit) {
this.finishOpeningGlance();
return;
}
@@ -593,6 +613,20 @@
getFocusedTab(aDir) {
return aDir < 0 ? this.#currentParentTab : this.#currentTab;
}
+
+ async splitGlance() {
+ if (this.#currentGlanceID) {
+ const currentTab = this.#currentTab;
+ const currentParentTab = this.#currentParentTab;
+
+ await this.fullyOpenGlance({ forSplit: true });
+ gZenViewSplitter.splitTabs([currentTab, currentParentTab], 'vsep');
+ const browserContainer = currentTab.linkedBrowser?.closest('.browserSidebarContainer');
+ if (!gReduceMotion && browserContainer) {
+ gZenViewSplitter.animateBrowserDrop(browserContainer);
+ }
+ }
+ }
}
window.gZenGlanceManager = new ZenGlanceManager();
diff --git a/src/browser/base/zen-components/ZenViewSplitter.mjs b/src/browser/base/zen-components/ZenViewSplitter.mjs
index f3d0d49ec..ac5243750 100644
--- a/src/browser/base/zen-components/ZenViewSplitter.mjs
+++ b/src/browser/base/zen-components/ZenViewSplitter.mjs
@@ -624,6 +624,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
this.dropZone.setAttribute('enabled', true);
}
const splitNode = this.getSplitNodeFromTab(tab);
+ if (!splitNode) return;
const posToRoot = { ...splitNode.positionToRoot };
const browserRect = browser.getBoundingClientRect();
@@ -1589,28 +1590,32 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
}
if (browserContainer) {
- gZenUIManager.motion
- .animate(
- browserContainer,
- {
- scale: [0.97, 1],
- opacity: [0, 1],
- },
- {
- type: 'spring',
- bounce: 0.4,
- duration: 0.2,
- delay: 0.1,
- }
- )
- .then(() => {
- this._maybeRemoveFakeBrowser(false);
- this._finishAllAnimatingPromise = null;
- });
+ this.animateBrowserDrop(browserContainer, () => {
+ this._maybeRemoveFakeBrowser(false);
+ this._finishAllAnimatingPromise = null;
+ });
}
return true;
}
+ animateBrowserDrop(browserContainer, callback = () => {}) {
+ gZenUIManager.motion
+ .animate(
+ browserContainer,
+ {
+ scale: [0.97, 1],
+ opacity: [0, 1],
+ },
+ {
+ type: 'spring',
+ bounce: 0.4,
+ duration: 0.2,
+ delay: 0.1,
+ }
+ )
+ .then(callback);
+ }
+
handleTabDrop(event, urls, replace, inBackground) {
if (replace || urls.length !== 1) {
return false;
diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css
index 74bb5d11d..13ca3d7dc 100644
--- a/src/browser/themes/shared/zen-icons/icons.css
+++ b/src/browser/themes/shared/zen-icons/icons.css
@@ -432,10 +432,8 @@
list-style-image: url('bookmark.svg') !important;
}
-#zen-split-views-button {
- list-style-image: url('split.svg') !important;
- fill: var(--toolbarbutton-icon-fill-attention);
- fill-opacity: 1;
+#zen-glance-sidebar-split {
+ list-style-image: url('split.svg');
}
#sidebar-box[sidebarcommand='viewTabsSidebar'] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon,
diff --git a/src/browser/themes/shared/zen-icons/lin/icons.css b/src/browser/themes/shared/zen-icons/lin/icons.css
deleted file mode 100644
index d52a1e7fe..000000000
--- a/src/browser/themes/shared/zen-icons/lin/icons.css
+++ /dev/null
@@ -1,1135 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-.subviewbutton {
- -moz-context-properties: fill, fill-opacity !important;
- fill: currentColor !important;
-}
-
-.private-browsing-indicator-icon {
- list-style-image: url('account-private.svg') !important;
- border-radius: 100% !important;
-}
-
-#back-button,
-#zen-sidebar-web-panel-back {
- list-style-image: url('back.svg') !important;
-}
-
-#zenSplitViewModifierActivateReallocation > image {
- list-style-image: url('move-tab.svg') !important;
-}
-
-#forward-button,
-#zen-sidebar-web-panel-forward {
- list-style-image: url('forward.svg') !important;
-}
-
-#reload-button,
-#zen-sidebar-web-panel-reload {
- list-style-image: url('reload.svg') !important;
-}
-
-#stop-button,
-.close-icon,
-#zen-sidebar-web-panel-close,
-#zen-glance-sidebar-close,
-.zen-theme-picker-custom-list-item-remove {
- list-style-image: url('close.svg') !important;
-}
-
-.reset-icon {
- list-style-image: url('reload.svg') !important;
-}
-
-.tab-reset-button {
- list-style-image: url('unpin.svg') !important;
-}
-
-#sidebar-button {
- list-style-image: url('sidebars-right.svg') !important;
-}
-
-#context_zenSplitTabs,
-#context-zenAddToWebPanel {
- /* TODO: Add split view icon */
- --menu-image: url('sidebars-right.svg') !important;
-}
-
-#context-zen-change-workspace-tab {
- --menu-image: url('move-tab.svg') !important;
-}
-
-#context-zenSplitLink {
- --menu-image: url('split.svg') !important;
-}
-
-#sidebar-button:-moz-locale-dir(ltr):not([positionend]),
-#sidebar-button:-moz-locale-dir(rtl)[positionend] {
- list-style-image: url('chrome://browser/skin/sidebars.svg') !important;
-}
-
-#downloads-button,
-#downloads-indicator-anchor,
-#appMenu-downloads-button,
-#appMenu-library-downloads-button {
- list-style-image: url('downloads.svg') !important;
-}
-
-#appMenu-translate-button {
- list-style-image: url('translations.svg') !important;
-}
-
-#appMenu-zoom-controls {
- list-style-image: url('plus.svg') !important;
-}
-
-#appMenu-passwords-button,
-#password-notification-icon,
-#PopupAutoComplete > richlistbox > richlistitem[originaltype='generatedPassword'] > .two-line-wrapper > .ac-site-icon,
-#PopupAutoComplete > richlistbox > richlistitem[originaltype='loginWithOrigin'] > .two-line-wrapper > .ac-site-icon,
-#PopupAutoComplete > richlistbox > richlistitem[originaltype='login'] > .ac-site-icon {
- list-style-image: url('passwords.svg') !important;
-}
-
-#nav-bar-overflow-button {
- list-style-image: url('chevron.svg') !important;
-}
-
-#zen-rice-share-options .options-header {
- list-style-image: url('arrow-right.svg');
-}
-
-#PanelUI-menu-button,
-#appMenu-more-button2,
-#zen-workspace-actions-menu-icon {
- list-style-image: url('menu.svg') !important;
-}
-
-#appMenu-help-button2 {
- list-style-image: url('help.svg') !important;
-}
-
-#sync-button,
-.urlbarView-row[source='tabs'] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
-#urlbar-engine-one-off-item-tabs {
- list-style-image: url('tab.svg') !important;
-}
-
-#history-panelmenu,
-.urlbarView-row[source='history'] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
-#urlbar-engine-one-off-item-history,
-#appMenu-history-button,
-#appMenu-library-history-button,
-#sidebar-switcher-history,
-#zen-history-button,
-#sidebar-box[sidebarcommand='viewHistorySidebar'] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
- list-style-image: url('history.svg') !important;
-}
-
-#save-page-button,
-#appMenu-save-file-button2 {
- list-style-image: url('save.svg') !important;
-}
-
-#print-button,
-#appMenu-print-button2 {
- list-style-image: url('print.svg') !important;
-}
-
-.searchbar-search-icon {
- list-style-image: url('search-glass.svg') !important;
-}
-
-#find-button,
-#appMenu-find-button2 {
- list-style-image: url('search-page.svg') !important;
-}
-
-#open-file-button {
- list-style-image: url('open.svg') !important;
-}
-
-#context_zenOpenWorkspace {
- --menu-image: url('open.svg') !important;
-}
-
-#context_zenSetAsDefaultWorkspace {
- --menu-image: url('bookmark-hollow.svg') !important;
-}
-
-#context_zenEditWorkspace,
-#zenToolbarThemePicker {
- --menu-image: url('edit-theme.svg') !important;
-}
-
-#add-ons-button,
-#appMenu-extensions-themes-button,
-#unified-extensions-button {
- list-style-image: url('extension.svg') !important;
-}
-
-#zoom-out-button,
-#appMenu-zoomReduce-button2 {
- list-style-image: url('zoom-out.svg') !important;
-}
-
-#zoom-in-button,
-#tabs-newtab-button,
-#new-tab-button,
-#appMenu-zoomEnlarge-button2,
-#PanelUI-zen-profiles-newProfile,
-#zen-sidebar-add-panel-button,
-#PanelUI-zen-workspaces-new image,
-#PanelUI-zen-gradient-generator-color-custom-add image {
- list-style-image: url('plus.svg') !important;
-}
-
-#PanelUI-zen-workspaces-reorder-mode image {
- list-style-image: url('move-tab.svg') !important;
- rotate: 90deg;
-}
-
-#cut-button {
- list-style-image: url('edit-cut.svg') !important;
-}
-
-#copy-button {
- list-style-image: url('edit-copy.svg') !important;
-}
-
-#paste-button {
- list-style-image: url('edit-paste.svg') !important;
-}
-
-#email-link-button {
- list-style-image: url('mail.svg') !important;
-}
-
-#screenshot-button {
- list-style-image: url('screenshot.svg') !important;
-}
-
-#preferences-button,
-#zen-preferences-button,
-.search-setting-button > .button-box > .button-icon,
-#appMenu-settings-button,
-#PanelUI-zen-profiles-managePrfs,
-.unified-extensions-item-open-menu.subviewbutton {
- list-style-image: url('settings.svg') !important;
-}
-
-#spell-check-enabled {
- list-style-image: url('spell-check.svg') !important;
-}
-
-#panic-button {
- list-style-image: url('forget.svg') !important;
-}
-
-#appMenu-new-private-window-button2,
-#PanelUI-zen-profiles-privateWin {
- list-style-image: url('private-window.svg') !important;
-}
-
-#privatebrowsing-button {
- list-style-image: url('privateBrowsing.svg') !important;
-}
-
-#save-to-pocket-button {
- list-style-image: url('pocket-outline.svg') !important;
-}
-
-#profiler-button-button > .toolbarbutton-icon,
-.subviewbutton[label='Task Manager'] {
- list-style-image: url('tool-profiler.svg') !important;
-}
-
-#developer-button {
- list-style-image: url('developer.svg') !important;
-}
-
-#new-window-button,
-#appMenu-new-window-button2 {
- list-style-image: url('window.svg') !important;
-}
-
-#restore-button,
-#fullscreen-button,
-#zen-glance-sidebar-open,
-#appMenu-fullscreen-button2 {
- list-style-image: url('fullscreen.svg') !important;
-}
-
-#restore-button[checked],
-#fullscreen-button[checked],
-#appMenu-fullscreen-button2[checked] {
- list-style-image: url('fullscreen-exit.svg') !important;
-}
-
-#bookmarks-menu-button,
-#appMenu-bookmarks-button,
-#sidebar-switcher-bookmarks,
-#appMenu-library-bookmarks-button,
-#sidebar-box[sidebarcommand='viewBookmarksSidebar'] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
- list-style-image: url('bookmark-star-on-tray.svg') !important;
-}
-
-#home-button,
-#zen-sidebar-web-panel-home {
- list-style-image: url('home.svg') !important;
-}
-
-#library-button {
- list-style-image: url('library.svg') !important;
-}
-
-/* identity icons */
-#identity-icon {
- list-style-image: url('info.svg');
-}
-
-#identity-box[pageproxystate='valid'].chromeUI #identity-icon {
- filter: grayscale(1);
-}
-
-#identity-box[pageproxystate='valid'].localResource #identity-icon {
- list-style-image: url('page-portrait.svg') !important;
-}
-
-#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate='invalid'] #identity-icon {
- list-style-image: url('search-glass.svg') !important;
-}
-
-#urlbar[actiontype='extension'] > #urlbar-input-container > #identity-box #identity-icon,
-#identity-box[pageproxystate='valid'].extensionPage #identity-icon {
- list-style-image: url('extension.svg') !important;
-}
-
-#identity-box[pageproxystate='valid'].verifiedDomain #identity-icon,
-#identity-box[pageproxystate='valid'].mixedActiveBlocked #identity-icon {
- list-style-image: url('security.svg') !important;
-}
-
-#urlbar-input-container[pageproxystate='valid']
- > #tracking-protection-icon-container
- > #tracking-protection-icon-box
- > #tracking-protection-icon {
- list-style-image: url('tracking-protection.svg') !important;
-}
-
-/* security */
-.identity-popup-security-connection {
- list-style-image: url('security-broken.svg') !important;
-}
-
-#identity-box[pageproxystate='valid'].notSecure #identity-icon,
-#identity-box[pageproxystate='valid'].mixedActiveContent #identity-icon,
-#identity-box[pageproxystate='valid'].httpsOnlyErrorPage #identity-icon {
- list-style-image: url('security-broken.svg') !important;
-}
-
-#identity-popup[connection='chrome'] .identity-popup-security-connection {
- filter: grayscale(1);
-}
-
-#identity-popup[connection='file'] .identity-popup-security-connection {
- list-style-image: url('page-portrait.svg') !important;
-}
-
-#identity-popup[connection^='secure'] .identity-popup-security-connection {
- list-style-image: url('security.svg') !important;
-}
-
-#identity-popup[ciphers='weak'] .identity-popup-security-connection,
-#identity-popup[mixedcontent~='passive-loaded'][isbroken] .identity-popup-security-connection,
-#identity-popup[connection='secure-cert-user-overridden'] .identity-popup-security-connection,
-#identity-popup[connection='cert-error-page'] .identity-popup-security-connection {
- list-style-image: url('security-warning.svg') !important;
-}
-
-#identity-popup[connection='net-error-page'] .identity-popup-security-connection {
- list-style-image: url('info.svg') !important;
-}
-
-#identity-popup[connection='extension'] .identity-popup-security-connection {
- list-style-image: url('extension.svg') !important;
-}
-
-#appMenu-new-tab-button2 {
- list-style-image: url('new-tab-image.svg') !important;
-}
-
-.findbar-find-previous {
- list-style-image: url('arrow-up.svg') !important;
-}
-
-.findbar-find-next {
- list-style-image: url('arrow-down.svg') !important;
-}
-
-.zen-workspace-actions-reorder-icon {
- list-style-image: url('drag-indicator.svg') !important;
-}
-
-#protections-popup-mainView .subviewbutton-nav:not(.notFound)::after,
-#identity-popup-mainView .subviewbutton-nav::after,
-.widget-overflow-list .subviewbutton-nav::after,
-.menu-right {
- content: url('arrow-right.svg') !important;
-}
-
-@media not (-moz-platform: windows) {
- #PanelUI-subView .subviewbutton-nav::after {
- content: url('arrow-right.svg') !important;
- }
-}
-
-#PlacesChevron,
-#urlbar-go-button {
- list-style-image: url('arrow-right.svg') !important;
-}
-
-#zen-expand-sidebar-button {
- list-style-image: url('expand-sidebar.svg') !important;
-}
-
-.panel-header > .subviewbutton-back {
- list-style-image: url('arrow-left.svg') !important;
-}
-
-#overflowMenu-customize-button,
-#appmenu-moreTools-button {
- list-style-image: url('customize.svg') !important;
-}
-
-#appmenu-zen-share-rice {
- list-style-image: url('share.svg');
-}
-
-.bookmark-item[container] {
- list-style-image: url('folder.svg') !important;
-}
-
-#pageAction-panel-bookmark,
-#star-button,
-#zen-bookmark-button {
- list-style-image: url('bookmark-hollow.svg') !important;
-}
-
-#pageAction-panel-bookmark[starred],
-#star-button[starred] {
- list-style-image: url('bookmark.svg') !important;
-}
-
-#zen-split-views-button {
- list-style-image: url('split.svg') !important;
- fill: var(--toolbarbutton-icon-fill-attention);
- fill-opacity: 1;
-}
-
-#sidebar-box[sidebarcommand='viewTabsSidebar'] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon,
-#sidebar-switcher-tabs {
- list-style-image: url('send-to-device.svg') !important;
-}
-
-/* tab icons */
-.tab-icon-image[src="chrome://branding/content/icon32.png"],
-.tab-icon-image[src="chrome://browser/skin/privatebrowsing/favicon.svg"]
-{
- content: url('new-tab-image.svg') !important;
-}
-
-.tab-icon-image[src="chrome://global/skin/icons/settings.svg"]
-{
- content: url('settings.svg') !important;
-}
-
-.tab-icon-image[src="chrome://mozapps/skin/extensions/extension.svg"]
-{
- content: url('extension.svg') !important;
-}
-
-.tab-icon-image[src="chrome://browser/skin/customize.svg"]
-{
- content: url('customize.svg') !important;
-}
-
-/* permissions */
-#permissions-granted-icon {
- list-style-image: url('permissions.svg') !important;
-}
-
-.geo-icon {
- list-style-image: url('geo.svg') !important;
-}
-
-.geo-icon.blocked-permission-icon {
- list-style-image: url('geo-blocked.svg') !important;
-}
-
-.xr-icon {
- list-style-image: url('xr.svg') !important;
-}
-
-.xr-icon.blocked-permission-icon {
- list-style-image: url('xr-blocked.svg') !important;
-}
-
-.popup-notification-icon[popupid='web-notifications'],
-.desktop-notification-icon {
- list-style-image: url('desktop-notification.svg') !important;
-}
-
-.desktop-notification-icon.blocked-permission-icon {
- list-style-image: url('desktop-notification-blocked.svg') !important;
-}
-
-.camera-icon {
- list-style-image: url('camera.svg') !important;
-}
-
-.camera-icon.blocked-permission-icon {
- list-style-image: url('camera-blocked.svg') !important;
-}
-
-.microphone-icon {
- list-style-image: url('microphone.svg') !important;
-}
-
-.microphone-icon.blocked-permission-icon {
- list-style-image: url('microphone-blocked.svg') !important;
-}
-
-.screen-icon {
- list-style-image: url('screen.svg') !important;
-}
-
-.screen-icon.blocked-permission-icon {
- list-style-image: url('screen-blocked.svg') !important;
-}
-
-.popup-notification-icon[popupid='persistent-storage'],
-.persistent-storage-icon,
-.indexedDB-icon {
- list-style-image: url('persistent-storage.svg') !important;
-}
-
-.persistent-storage-icon.blocked-permission-icon {
- list-style-image: url('persistent-storage-blocked.svg') !important;
-}
-
-.popup-icon {
- list-style-image: url('popup.svg') !important;
-}
-
-.autoplay-media-icon {
- list-style-image: url('autoplay-media.svg') !important;
-}
-
-.autoplay-media-icon.blocked-permission-icon {
- list-style-image: url('autoplay-media-blocked.svg') !important;
-}
-
-#canvas-notification-icon,
-.popup-notification-icon[popupid='canvas-permissions-prompt'],
-.canvas-icon {
- list-style-image: url('canvas.svg') !important;
-}
-
-.canvas-icon.blocked-permission-icon {
- list-style-image: url('canvas-blocked.svg') !important;
-}
-
-.midi-icon,
-.midi-sysex-icon,
-.popup-notification-icon[popupid='midi'],
-.popup-notification-icon[popupid='midi-sysex'] {
- list-style-image: url('midi.svg') !important;
-}
-
-.install-icon {
- list-style-image: url('extension.svg') !important;
-}
-
-.install-icon.blocked-permission-icon,
-.popup-notification-icon[popupid='xpinstall-disabled'],
-.popup-notification-icon[popupid='addon-install-blocked'],
-.popup-notification-icon[popupid='addon-install-origin-blocked'] {
- list-style-image: url('extension-blocked.svg') !important;
-}
-
-/* tab sound icons */
-.tab-icon-overlay[soundplaying] {
- list-style-image: url('tab-audio-playing-small.svg') !important;
- background-image: none !important;
- fill: white !important;
-}
-
-.tab-icon-overlay[muted] {
- list-style-image: url('tab-audio-muted-small.svg') !important;
- background-image: none !important;
- fill: white !important;
-}
-
-.tab-icon-overlay[activemedia-blocked] {
- list-style-image: url('tab-audio-blocked-small.svg') !important;
- background-image: none !important;
- fill: white !important;
-}
-
-/* reload/stop animation */
-#stop-reload-button[animate]
- > #reload-button[displaystop]
- + #stop-button
- > .toolbarbutton-animatable-box
- > .toolbarbutton-animatable-image,
-#zen-sidebar-web-panel-reload[animate]
- > #zen-sidebar-web-panel-reload-button[displaystop]
- + #zen-sidebar-web-panel-stop-button
- > .toolbarbutton-animatable-box
- > .toolbarbutton-animatable-image {
- background-image: url('reload-to-stop.svg') !important;
-}
-
-#stop-reload-button[animate] > #reload-button > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image,
-#zen-sidebar-web-panel-reload[animate]
- > #zen-sidebar-web-panel-reload-button
- > .toolbarbutton-animatable-box
- > .toolbarbutton-animatable-image {
- background-image: url('stop-to-reload.svg') !important;
-}
-
-#reader-mode-button > .urlbar-icon {
- list-style-image: url('reader-mode.svg') !important;
-}
-
-#unified-extensions-manage-extensions {
- list-style-image: url('manage.svg') !important;
-}
-
-/* Context Menu Icons */
-
-#context-video-pictureinpicture:not([checked='true']) .menu-iconic-icon {
- list-style-image: url('media-pip.svg') !important;
-}
-
-#context-media-loop:not([checked='true']) .menu-iconic-icon {
- list-style-image: url('media-loop.svg') !important;
-}
-
-:not(:not(menubar) > menu, #ContentSelectDropdown)
- > menupopup
- > menuitem:not(
- .menuitem-iconic,
- [type='checkbox'],
- [type='radio'],
- .in-menulist,
- .in-menulist menuitem,
- .unified-nav-current
- ),
-:not(:not(menubar) > menu, #ContentSelectDropdown)
- > menupopup
- > menu:not(.menu-iconic, [type='checkbox'], [type='radio'], .in-menulist, .in-menulist menu, .unified-nav-current),
-#toggle_toolbar-menubar,
-#PanelUI-history toolbarbutton,
-#unified-extensions-context-menu menuitem {
- background-image: var(--menu-image) !important;
- background-size: 16px !important;
- background-position: var(--fp-contextmenu-menuitem-padding-inline) center !important;
- background-repeat: no-repeat !important;
- -moz-context-properties: fill, fill-opacity !important;
- fill: currentColor !important;
-}
-
-@media not (-moz-platform: windows) {
- menu > .menu-iconic-text,
- menuitem > .menu-iconic-text {
- padding-inline-start: var(--fp-contextmenu-menuicon-margin-inline) !important;
- }
-}
-
-#context-savepage {
- --menu-image: url('save.svg');
-}
-
-#context-selectall,
-.textbox-contextmenu menuitem[cmd*='selectAll'],
-#context_selectAllTabs,
-#toolbar-context-selectAllTabs {
- --menu-image: url('edit-select-all.svg');
-}
-
-#context-undo,
-.textbox-contextmenu menuitem[cmd*='undo'],
-#context_undoCloseTab,
-#toolbar-context-undoCloseTab {
- --menu-image: url('edit-undo.svg');
-}
-
-#toggle_toolbar-menubar {
- --menu-image: url('menu-bar.svg');
-}
-
-#context-redo,
-.textbox-contextmenu menuitem[cmd*='redo'] {
- --menu-image: url('edit-redo.svg');
-}
-
-#context-copy,
-.textbox-contextmenu menuitem[cmd*='copy'],
-.textbox-contextmenu #strip-on-share,
-#placesContext_copy {
- --menu-image: url('edit-copy.svg');
-}
-
-#context-paste,
-.textbox-contextmenu menuitem[cmd*='paste'],
-#placesContext_paste_group {
- --menu-image: url('edit-paste.svg');
-}
-
-#context-cut,
-.textbox-contextmenu menuitem[cmd*='cut'],
-#placesContext_cut {
- --menu-image: url('edit-cut.svg');
-}
-
-#context-delete,
-.customize-context-removeExtension,
-.unified-extensions-context-menu-remove-extension,
-.textbox-contextmenu menuitem[cmd*='delete'],
-menuitem[id='placesContext_deleteBookmark'],
-menuitem[id='placesContext_deleteFolder'],
-menuitem[id='placesContext_delete'],
-menuitem[id='placesContext_delete_history'],
-menuitem[id='placesContext_deleteHost'],
-#context_zenDeleteWebPanel,
-#context_zenDeleteWorkspace {
- --menu-image: url('edit-delete.svg');
-}
-
-#paste-and-go {
- --menu-image: url('paste-and-go.svg');
-}
-
-#context-print-selection {
- --menu-image: url('print.svg');
-}
-
-#context-take-screenshot {
- --menu-image: url('screenshot.svg');
-}
-
-#context-viewsource {
- --menu-image: url('source-code.svg');
-}
-
-#context-inspect-a11y {
- --menu-image: url('accessibility.svg');
-}
-
-#context-inspect {
- --menu-image: url('inspect.svg');
-}
-
-#context-searchselect {
- --menu-image: url('search-glass.svg');
-}
-
-#context-viewimage {
- --menu-image: url('image-open.svg');
-}
-
-#context-viewimageinfo {
- --menu-image: url('info.svg');
-}
-
-#context-saveimage,
-#context-video-saveimage {
- --menu-image: url('image-save.svg');
-}
-
-#context-savevideo {
- --menu-image: url('video-save.svg');
-}
-
-#context-viewvideo {
- --menu-image: url('video-open.svg');
-}
-
-#context-saveaudio {
- --menu-image: url('audio-save.svg');
-}
-
-#context-copyimage-contents {
- --menu-image: url('image-copy.svg');
-}
-
-#context-copyimage,
-#context-copyvideourl,
-#context-copylink,
-#context-stripOnShareLink,
-#context_zenOpenNewTabWebPanel,
-#context-pdfjs-copy {
- --menu-image: url('link.svg');
-}
-
-#context-openlinkincurrent {
- --menu-image: url('ext-link.svg');
-}
-
-#context-viewsource,
-#context-viewframesource,
-#context-viewpartialsource-selection {
- --menu-image: url('source-code.svg');
-}
-
-#context-sendimage,
-#context-sendvideo,
-#context-sendaudio {
- --menu-image: url('mail.svg');
-}
-
-#context-setDesktopBackground,
-.viewCustomizeToolbar {
- --menu-image: url('customize.svg');
-}
-
-#context-reloadimage,
-#context_reloadTab,
-#context_reloadSelectedTabs,
-#toolbar-context-reloadSelectedTab,
-#toolbar-context-reloadSelectedTabs,
-#context_zen-reset-pinned-tab {
- --menu-image: url('reload.svg');
-}
-
-#context-sendlinktodevice,
-#context_sendTabToDevice,
-#context-sendpagetodevice {
- --menu-image: url('send-to-device.svg');
-}
-
-#context-openlinkintab,
-#context-openlinkincontainertab,
-#context_zenWorkspacesOpenInContainerTab,
-#context_zenWebPanelContextInContainer,
-menuitem[id='placesContext_open:newtab'],
-menuitem[id='placesContext_openLinks:tabs'],
-menuitem[id='placesContext_openBookmarkLinks:tabs'],
-menuitem[id='placesContext_openBookmarkContainer:tabs'] {
- --menu-image: url('tab.svg');
-}
-
-#context_openANewTab,
-#toolbar-context-openANewTab {
- --menu-image: url('new-tab-image.svg');
-}
-
-#context-openlinkinusercontext-menu,
-menu[id='placesContext_open:newcontainertab'],
-menu[id='placesContext_openContainer:tabs'] {
- --menu-image: url('container-tab.svg');
-}
-
-#context-openlink,
-menuitem[id='placesContext_open:newwindow'] {
- --menu-image: url('window.svg');
-}
-
-#context-openlinkprivate,
-menuitem[id='placesContext_open:newprivatewindow'] {
- --menu-image: url('private-window.svg');
-}
-
-#context-savelink {
- --menu-image: url('downloads.svg');
-}
-
-#spell-add-to-dictionary {
- --menu-image: url('add-to-dictionary.svg');
-}
-
-#manage-saved-logins {
- --menu-image: url('passwords.svg');
-}
-
-#context-media-play,
-#context_playTab,
-#context_playSelectedTabs {
- --menu-image: url('media-play.svg');
-}
-
-#context-media-pause {
- --menu-image: url('media-pause.svg');
-}
-
-#context-media-mute,
-#context_toggleMuteTab,
-#context_toggleMuteSelectedTabs,
-#context_zenToggleMuteWebPanel {
- --menu-image: url('media-mute.svg');
-}
-
-#context-media-unmute,
-#context_toggleMuteTab[muted],
-#context_toggleMuteSelectedTabs[muted],
-#context_zenToggleMuteWebPanel[muted] {
- --menu-image: url('media-unmute.svg');
-}
-
-#context-media-playbackrate {
- --menu-image: url('media-speed.svg');
-}
-
-#context-video-fullscreen {
- --menu-image: url('fullscreen.svg');
-}
-
-#context-leave-dom-fullscreen,
-menuitem[contexttype='fullscreen'][label*='Exit'] {
- --menu-image: url('fullscreen-exit.svg');
-}
-
-#context-media-hidecontrols,
-#context-media-showcontrols {
- --menu-image: url('permissions.svg');
-}
-
-#context_pinTab,
-#context_unpinTab,
-#context_pinSelectedTabs,
-#context_unpinSelectedTabs,
-.customize-context-moveToPanel,
-#context_zen-replace-pinned-url-with-current {
- --menu-image: url('pin.svg');
-}
-
-#context_zen-add-essential {
- --menu-image: url('essential-add.svg');
-}
-
-#context_zen-remove-essential {
- --menu-image: url('essential-remove.svg');
-}
-
-.customize-context-removeFromToolbar {
- --menu-image: url('unpin.svg');
-}
-
-#zen-sidebar-web-panel-pinned[pinned='true'] {
- list-style-image: url('pin.svg') !important;
-}
-
-#zen-sidebar-web-panel-pinned {
- list-style-image: url('unpin.svg') !important;
-}
-
-#context_duplicateTab,
-#context_duplicateTabs {
- --menu-image: url('duplicate-tab.svg');
-}
-
-#zen-context-menu-compact-mode {
- --menu-image: url('sidebar.svg');
-}
-
-#context_bookmarkTab,
-#context_bookmarkSelectedTabs,
-#toggle_PersonalToolbar,
-#context-bookmarklink,
-#toolbar-context-bookmarkSelectedTab,
-#toolbar-context-bookmarkSelectedTabs {
- --menu-image: url('bookmark-hollow.svg');
-}
-
-menuitem[id='placesContext_show_bookmark:info'],
-menuitem[id='placesContext_show_folder:info'],
-menuitem[id='placesContext_show:info'] {
- --menu-image: url('edit.svg');
-}
-
-menuitem[id='placesContext_showAllBookmarks'],
-#BMB_bookmarksShowAllTop,
-#BMB_bookmarksShowAll,
-.customize-context-manageExtension,
-.unified-extensions-context-menu-manage-extension {
- --menu-image: url('manage.svg');
-}
-
-#BMB_viewBookmarksSidebar {
- --menu-image: url('chrome://browser/skin/sidebars.svg');
-}
-
-#BMB_searchBookmarks {
- --menu-image: url('search-page.svg');
-}
-
-#appMenuRecentlyClosedTabs {
- --menu-image: url('container-tab.svg');
-}
-
-#appMenuClearRecentHistory {
- --menu-image: url('edit-delete.svg');
-}
-
-#appMenuRecentlyClosedWindows {
- --menu-image: url('window.svg');
-}
-
-#appMenuSearchHistory {
- --menu-image: url('search-glass.svg');
-}
-
-#PanelUI-historyMore {
- --menu-image: url('manage.svg');
-}
-
-menuitem[id='placesContext_new:bookmark'],
-menuitem[id='placesContext_new:folder'],
-menuitem[id='placesContext_new:separator'] {
- --menu-image: url('plus.svg');
-}
-
-#context-savelinktopocket,
-#context-pocket {
- --menu-image: url('pocket-outline.svg');
-}
-
-#context_moveTabOptions {
- --menu-image: url('move-tab.svg');
-}
-
-.share-tab-url-item {
- --menu-image: url('share.svg');
-}
-
-#context_reopenInContainer {
- --menu-image: url('container-tab.svg');
-}
-
-#context_closeTab {
- --menu-image: url('close.svg');
-}
-
-#context_closeTabOptions {
- --menu-image: url('close-all.svg');
-}
-
-#context_zenUnloadTab,
-#context_zenUnloadWebPanel,
-#context_zenTabActions {
- --menu-image: url('close-all.svg');
-}
-
-.customize-context-reportExtension,
-.unified-extensions-context-menu-report-extension {
- --menu-image: url('report.svg');
-}
-
-/* FIX header icons for the app menu sub menus (eg. fx account, history...) */
-.panel-header > h1 {
- text-align: left;
- margin-left: 8px !important;
-}
-
-.wordmark::after {
- content: 'Plus' !important;
-}
-
-/* header icons for the app menu sub menus (eg. fx account, history...) */
-.panel-header > h1 > span::before {
- content: '';
- background: var(--header-image, none) center / 16px no-repeat;
- -moz-context-properties: fill, fill-opacity;
- fill: currentColor;
- padding-inline-start: calc(var(--fp-enabled, 0) * 16px);
- margin-inline-end: calc(var(--fp-enabled, 0) * 8px);
-}
-
-#PanelUI-fxa .panel-header > h1 > span::before {
- --header-image: var(--avatar-image-url);
- --fp-enabled: 1;
- transform: scale(1.25);
- border-radius: 99px;
- display: inline-block;
- height: 16px;
-}
-
-#PanelUI-bookmarks .panel-header > h1 > span::before {
- --header-image: url('bookmark-star-on-tray.svg');
- --fp-enabled: 1;
-}
-
-#PanelUI-history .panel-header > h1 > span::before {
- --header-image: url('history.svg');
- --fp-enabled: 1;
-}
-
-#PanelUI-helpView .panel-header > h1 > span::before {
- --header-image: url('help.svg');
- --fp-enabled: 1;
-}
-
-#appMenu-libraryView .panel-header > h1 > span::before {
- --header-image: url('library.svg');
- --fp-enabled: 1;
-}
-
-#unified-extensions-panel .panel-header > h1 > span::before {
- --header-image: url('extension.svg');
- --fp-enabled: 1;
-}
-
-@media not (-moz-platform: linux) {
- .unified-extensions-context-menu-pin-to-toolbar {
- --menu-image: url('pin.svg');
- }
-}
-
-.unified-extensions-context-menu-move-widget-down {
- --menu-image: url('arrow-down.svg');
-}
-
-.unified-extensions-context-menu-move-widget-up {
- --menu-image: url('arrow-up.svg');
-}
-
-:not(:not(menubar) > menu, #ContentSelectDropdown)
- > menupopup
- > menuitem:not(
- .menuitem-iconic,
- [type='checkbox'],
- [type='radio'],
- .in-menulist,
- .in-menulist menuitem,
- .unified-nav-current
- ),
-:not(:not(menubar) > menu, #ContentSelectDropdown)
- > menupopup
- > menu:not(.menu-iconic, [type='checkbox'], [type='radio'], .in-menulist, .in-menulist menu, .unified-nav-current),
-:not(:not(menubar) > menu, #ContentSelectDropdown) > menupopup > menucaption {
- padding-inline-start: calc(
- var(--fp-contextmenu-menuitem-padding-inline) + 16px + var(--fp-contextmenu-menuicon-margin-inline)
- ) !important;
-}
-
-menupopup > menuitem:is([type='checkbox']) .menu-iconic-left {
- --menu-image: none !important;
- margin-inline-start: 4px;
-
- @media not (-moz-platform: windows) {
- margin-inline-end: 0;
- padding-inline-end: 0;
- }
-}
-
-@media (-moz-platform: windows) {
- menupopup > menuitem[checked='true'] {
- padding-inline-start: 6px;
- }
-}
From 6a14f85d226ae04a2b990541eb6021fb8aa3ae9c Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 16:17:06 +0200
Subject: [PATCH 104/114] fix: update CSS media queries for Linux and remove
unused border color variable
---
.../base/content/zen-styles/zen-panel-ui.css | 2 +-
.../base/content/zen-styles/zen-theme.css | 1 -
.../libpref/init/StaticPrefList-yaml.patch | 25 +++----------------
src/modules/libpref/init/zen-static-prefs.inc | 20 +++++++++++++++
4 files changed, 24 insertions(+), 24 deletions(-)
create mode 100644 src/modules/libpref/init/zen-static-prefs.inc
diff --git a/src/browser/base/content/zen-styles/zen-panel-ui.css b/src/browser/base/content/zen-styles/zen-panel-ui.css
index 239c30509..9fed475c3 100644
--- a/src/browser/base/content/zen-styles/zen-panel-ui.css
+++ b/src/browser/base/content/zen-styles/zen-panel-ui.css
@@ -7,7 +7,7 @@ panel[type='arrow'][animate='open'] {
@media (-moz-platform: macos) {
animation: zen-jello-animation-macos 0.4s ease-out;
}
- @media not (-moz-platform: macos) {
+ @media (-moz-platform: linux) {
&::part(content) {
animation: zen-jello-animation 0.35s ease;
}
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index 0a914baa0..1f46023fd 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -64,7 +64,6 @@
--in-content-primary-button-border-color: transparent !important;
--in-content-primary-button-border-hover: transparent !important;
--in-content-primary-button-border-active: var(--zen-colors-border) !important;
- --in-content-box-border-color: var(--zen-colors-border) !important;
--in-content-accent-color: var(--zen-colors-primary) !important;
--in-content-accent-color-active: currentColor !important;
diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch
index f45fcb94d..378369bea 100644
--- a/src/modules/libpref/init/StaticPrefList-yaml.patch
+++ b/src/modules/libpref/init/StaticPrefList-yaml.patch
@@ -1,5 +1,5 @@
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index 85974462e5ce2b7dbf85bd5c79f09b3db5c25915..428a245cdf58d959256aa3c975687f31aed16b05 100644
+index 85974462e5ce2b7dbf85bd5c79f09b3db5c25915..f914f5c0f29be4149be15265bb6571ae92fb23cc 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -18462,13 +18462,13 @@
@@ -18,30 +18,11 @@ index 85974462e5ce2b7dbf85bd5c79f09b3db5c25915..428a245cdf58d959256aa3c975687f31
mirror: always
# Whether we expand the client area into the taskbar hidden edge on maximized
-@@ -18594,6 +18594,26 @@
+@@ -18594,6 +18594,7 @@
mirror: always
#endif
-+# Dummy pref to always generate StaticPrefs_zen.h in every OS
-+- name: zen.browser.is-cool
-+ type: bool
-+ value: true
-+ mirror: never
-+
-+#ifdef XP_MACOSX
-+- name: zen.widget.macos.window-material
-+ type: uint32_t
-+ value: 1
-+ mirror: always
-+#endif
-+
-+#ifdef XP_WIN
-+- name: zen.widget.windows.acrylic
-+ type: bool
-+ value: true
-+ mirror: once
-+#endif
-+
++#include zen-static-prefs.inc
#---------------------------------------------------------------------------
# Prefs starting with "zoom."
#---------------------------------------------------------------------------
diff --git a/src/modules/libpref/init/zen-static-prefs.inc b/src/modules/libpref/init/zen-static-prefs.inc
new file mode 100644
index 000000000..b53d20ae2
--- /dev/null
+++ b/src/modules/libpref/init/zen-static-prefs.inc
@@ -0,0 +1,20 @@
+
+# Dummy pref to always generate StaticPrefs_zen.h in every OS
+- name: zen.browser.is-cool
+ type: bool
+ value: true
+ mirror: never
+
+#ifdef XP_MACOSX
+- name: zen.widget.macos.window-material
+ type: uint32_t
+ value: 1
+ mirror: always
+#endif
+
+#ifdef XP_WIN
+- name: zen.widget.windows.acrylic
+ type: bool
+ value: true
+ mirror: always
+#endif
From a0f5101ac5e42bde18dfb74471945b6ed8d01d3f Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 16:23:57 +0200
Subject: [PATCH 105/114] fix: add animation for content part in Windows
platform without Mica popups
---
src/browser/base/content/zen-styles/zen-panel-ui.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/browser/base/content/zen-styles/zen-panel-ui.css b/src/browser/base/content/zen-styles/zen-panel-ui.css
index 9fed475c3..2983abb76 100644
--- a/src/browser/base/content/zen-styles/zen-panel-ui.css
+++ b/src/browser/base/content/zen-styles/zen-panel-ui.css
@@ -7,7 +7,8 @@ panel[type='arrow'][animate='open'] {
@media (-moz-platform: macos) {
animation: zen-jello-animation-macos 0.4s ease-out;
}
- @media (-moz-platform: linux) {
+ @media (-moz-platform: linux) or ((-moz-platform: windows) and (not (-moz-windows-mica-popups))) {
+ /* Mica popups have a weird background while the animation is running */
&::part(content) {
animation: zen-jello-animation 0.35s ease;
}
From f61bd68ad2b587e209c3b5648e6f7ddc5a73362b Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 16:27:03 +0200
Subject: [PATCH 106/114] Update l10n subproject commit
---
.prettierignore | 2 ++
l10n | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/.prettierignore b/.prettierignore
index 9fe0d06c0..167e24b61 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -26,3 +26,5 @@ src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
src/browser/base/content/zen-styles/zen-compact-mode.css
src/browser/base/zen-components/ZenEmojies.mjs
build/codesign/codesign.bash
+
+*.inc
diff --git a/l10n b/l10n
index 91a004c86..950562cd7 160000
--- a/l10n
+++ b/l10n
@@ -1 +1 @@
-Subproject commit 91a004c86085696aff68902dbed72504a0500f75
+Subproject commit 950562cd71c8a6cbc196234620055dfecbe082d0
From 8f571d580003d4252a8bef459be8a533fcfc79b7 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Wed, 2 Apr 2025 21:35:01 +0700
Subject: [PATCH 107/114] fix: skip permit unload if already checked
---
.../base/zen-components/ZenTabUnloader.mjs | 2 +-
.../tabbrowser/content/tabbrowser-js.patch | 47 +++++++++++++------
2 files changed, 33 insertions(+), 16 deletions(-)
diff --git a/src/browser/base/zen-components/ZenTabUnloader.mjs b/src/browser/base/zen-components/ZenTabUnloader.mjs
index 768bd4e04..63dd70ca2 100644
--- a/src/browser/base/zen-components/ZenTabUnloader.mjs
+++ b/src/browser/base/zen-components/ZenTabUnloader.mjs
@@ -218,7 +218,7 @@
}
unload(tab) {
- gBrowser.explicitUnloadTabs([tab]);
+ gBrowser.explicitUnloadTabs([tab], true);
tab.removeAttribute('linkedpanel');
}
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 25e151f57..25657ddbd 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 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c459be4eb 100644
+index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b7764b1a16e 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -424,11 +424,67 @@
@@ -553,7 +553,24 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
-@@ -5159,7 +5323,7 @@
+@@ -5064,10 +5228,12 @@
+ return closedCount;
+ }
+
+- async explicitUnloadTabs(tabs) {
+- let unloadBlocked = await this.runBeforeUnloadForTabs(tabs);
+- if (unloadBlocked) {
+- return;
++ async explicitUnloadTabs(tabs, skipPermitUnload) {
++ if (!skipPermitUnload) {
++ let unloadBlocked = await this.runBeforeUnloadForTabs(tabs);
++ if (unloadBlocked) {
++ return;
++ }
+ }
+ let unloadSelectedTab = false;
+ let allTabsUnloaded = false;
+@@ -5159,7 +5325,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -562,7 +579,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
}
// Try to find a remaining tab that comes after the given tab
-@@ -5181,7 +5345,7 @@
+@@ -5181,7 +5347,7 @@
}
if (tab) {
@@ -571,7 +588,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
}
// If no qualifying visible tab was found, see if there is a tab in
-@@ -5599,10 +5763,10 @@
+@@ -5599,10 +5765,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -584,7 +601,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5838,7 +6002,7 @@
+@@ -5838,7 +6004,7 @@
moveTabTo(aTab, aIndex, { forceStandaloneTab = false } = {}) {
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
@@ -593,7 +610,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
} else {
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
-@@ -5848,10 +6012,17 @@
+@@ -5848,10 +6014,17 @@
this.#handleTabMove(aTab, () => {
let neighbor = this.tabs[aIndex];
@@ -613,7 +630,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5901,13 +6072,22 @@
+@@ -5901,13 +6074,22 @@
* Bug 1955388 - prevent pinned tabs from commingling with non-pinned tabs
* when there are hidden tabs present
*/
@@ -637,7 +654,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
if (tab.pinned && this.tabContainer.verticalMode) {
return this.tabContainer.verticalPinnedTabsContainer;
}
-@@ -5937,7 +6117,7 @@
+@@ -5937,7 +6119,7 @@
}
moveTabToGroup(aTab, aGroup) {
@@ -646,7 +663,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -5961,6 +6141,10 @@
+@@ -5961,6 +6143,10 @@
moveActionCallback();
@@ -657,7 +674,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
-@@ -6015,7 +6199,7 @@
+@@ -6015,7 +6201,7 @@
createLazyBrowser,
};
@@ -666,7 +683,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
-@@ -6765,7 +6949,7 @@
+@@ -6765,7 +6951,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -675,7 +692,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
window.focus();
aEvent.preventDefault();
break;
-@@ -7671,6 +7855,7 @@
+@@ -7671,6 +7857,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -683,7 +700,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
-@@ -8640,7 +8825,7 @@ var TabContextMenu = {
+@@ -8640,7 +8827,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@@ -692,7 +709,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
-@@ -8674,7 +8859,7 @@ var TabContextMenu = {
+@@ -8674,7 +8861,7 @@ var TabContextMenu = {
let isFirstTab =
!this.contextTabs[0].group &&
(this.contextTabs[0] == visibleTabs[0] ||
@@ -701,7 +718,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..65c22c405fd1b9497df9ade0ff0b343c
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
-@@ -8904,6 +9089,7 @@ var TabContextMenu = {
+@@ -8904,6 +9091,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {
From bb9711639c8b09d369b38b441eb1283e85838a46 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Wed, 2 Apr 2025 21:36:15 +0700
Subject: [PATCH 108/114] fix: add null checks for media controller
---
src/browser/base/zen-components/ZenMediaController.mjs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/browser/base/zen-components/ZenMediaController.mjs b/src/browser/base/zen-components/ZenMediaController.mjs
index 6dce54585..029407918 100644
--- a/src/browser/base/zen-components/ZenMediaController.mjs
+++ b/src/browser/base/zen-components/ZenMediaController.mjs
@@ -148,7 +148,9 @@ class ZenMediaController {
}
showMediaControls() {
- if (this._currentMediaController?.isBeingUsedInPIPModeOrFullscreen) return this.hideMediaControls();
+ if (!this._currentMediaController) return;
+
+ if (this._currentMediaController.isBeingUsedInPIPModeOrFullscreen) return this.hideMediaControls();
if (!this.mediaControlBar.hasAttribute('hidden')) return;
this.updatePipButton();
@@ -485,6 +487,8 @@ class ZenMediaController {
}
updatePipButton() {
+ if (!this._currentBrowser) return;
+
const isPipEligible = this.pipEligibilityMap.get(this._currentBrowser.browserId);
if (isPipEligible) this.mediaControlBar.setAttribute('can-pip', '');
else this.mediaControlBar.removeAttribute('can-pip');
From 853811d387d112310d109684886318b31e159324 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Wed, 2 Apr 2025 21:46:36 +0700
Subject: [PATCH 109/114] chore: shorten tabbrowser patch
---
.../tabbrowser/content/tabbrowser-js.patch | 46 ++++++++-----------
1 file changed, 20 insertions(+), 26 deletions(-)
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 25657ddbd..1e60e3acd 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 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b7764b1a16e 100644
+index 5f406ea5d09273c9b70b84eee24c6267f88692f8..70cde185cb560a325f894c0ce79f1344b86e2a7c 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -424,11 +424,67 @@
@@ -553,24 +553,18 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
-@@ -5064,10 +5228,12 @@
+@@ -5064,8 +5228,8 @@
return closedCount;
}
- async explicitUnloadTabs(tabs) {
- let unloadBlocked = await this.runBeforeUnloadForTabs(tabs);
-- if (unloadBlocked) {
-- return;
-+ async explicitUnloadTabs(tabs, skipPermitUnload) {
-+ if (!skipPermitUnload) {
-+ let unloadBlocked = await this.runBeforeUnloadForTabs(tabs);
-+ if (unloadBlocked) {
-+ return;
-+ }
++ async explicitUnloadTabs(tabs, skipPermitUnload = false) {
++ let unloadBlocked = skipPermitUnload ? false : await this.runBeforeUnloadForTabs(tabs);
+ if (unloadBlocked) {
+ return;
}
- let unloadSelectedTab = false;
- let allTabsUnloaded = false;
-@@ -5159,7 +5325,7 @@
+@@ -5159,7 +5323,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -579,7 +573,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
}
// Try to find a remaining tab that comes after the given tab
-@@ -5181,7 +5347,7 @@
+@@ -5181,7 +5345,7 @@
}
if (tab) {
@@ -588,7 +582,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
}
// If no qualifying visible tab was found, see if there is a tab in
-@@ -5599,10 +5765,10 @@
+@@ -5599,10 +5763,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -601,7 +595,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5838,7 +6004,7 @@
+@@ -5838,7 +6002,7 @@
moveTabTo(aTab, aIndex, { forceStandaloneTab = false } = {}) {
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
@@ -610,7 +604,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
} else {
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
-@@ -5848,10 +6014,17 @@
+@@ -5848,10 +6012,17 @@
this.#handleTabMove(aTab, () => {
let neighbor = this.tabs[aIndex];
@@ -630,7 +624,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
-@@ -5901,13 +6074,22 @@
+@@ -5901,13 +6072,22 @@
* Bug 1955388 - prevent pinned tabs from commingling with non-pinned tabs
* when there are hidden tabs present
*/
@@ -654,7 +648,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
if (tab.pinned && this.tabContainer.verticalMode) {
return this.tabContainer.verticalPinnedTabsContainer;
}
-@@ -5937,7 +6119,7 @@
+@@ -5937,7 +6117,7 @@
}
moveTabToGroup(aTab, aGroup) {
@@ -663,7 +657,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
-@@ -5961,6 +6143,10 @@
+@@ -5961,6 +6141,10 @@
moveActionCallback();
@@ -674,7 +668,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
-@@ -6015,7 +6201,7 @@
+@@ -6015,7 +6199,7 @@
createLazyBrowser,
};
@@ -683,7 +677,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
-@@ -6765,7 +6951,7 @@
+@@ -6765,7 +6949,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -692,7 +686,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
window.focus();
aEvent.preventDefault();
break;
-@@ -7671,6 +7857,7 @@
+@@ -7671,6 +7855,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -700,7 +694,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
-@@ -8640,7 +8827,7 @@ var TabContextMenu = {
+@@ -8640,7 +8825,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@@ -709,7 +703,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
-@@ -8674,7 +8861,7 @@ var TabContextMenu = {
+@@ -8674,7 +8859,7 @@ var TabContextMenu = {
let isFirstTab =
!this.contextTabs[0].group &&
(this.contextTabs[0] == visibleTabs[0] ||
@@ -718,7 +712,7 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..d6a3622db3ad235786fceba40f965b77
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
-@@ -8904,6 +9091,7 @@ var TabContextMenu = {
+@@ -8904,6 +9089,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {
From 209428bdc709890e8891e3bf992227ff85d871e1 Mon Sep 17 00:00:00 2001
From: Slowlife01 <slowlife1165@gmail.com>
Date: Wed, 2 Apr 2025 21:48:14 +0700
Subject: [PATCH 110/114] refactor: make skipPermitUnload a function argument
---
src/browser/base/zen-components/ZenTabUnloader.mjs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/browser/base/zen-components/ZenTabUnloader.mjs b/src/browser/base/zen-components/ZenTabUnloader.mjs
index 63dd70ca2..9fe8dab20 100644
--- a/src/browser/base/zen-components/ZenTabUnloader.mjs
+++ b/src/browser/base/zen-components/ZenTabUnloader.mjs
@@ -217,8 +217,8 @@
document.getElementById('context_closeDuplicateTabs').parentNode.appendChild(element);
}
- unload(tab) {
- gBrowser.explicitUnloadTabs([tab], true);
+ unload(tab, skipPermitUnload = false) {
+ gBrowser.explicitUnloadTabs([tab], skipPermitUnload);
tab.removeAttribute('linkedpanel');
}
@@ -230,7 +230,7 @@
explicitUnloadTabs(tabs, extraArgs = {}) {
for (let i = 0; i < tabs.length; i++) {
if (this.canUnloadTab(tabs[i], Date.now(), this.intervalUnloader.excludedUrls, true, extraArgs)) {
- this.unload(tabs[i]);
+ this.unload(tabs[i], true);
}
}
}
From 69c406c3d6cdb5ad95b11a4b929d620a77de21c9 Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Wed, 2 Apr 2025 20:29:41 +0200
Subject: [PATCH 111/114] Fixed startup function for acrylic
Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com>
---
src/widget/windows/nsWindow-cpp.patch | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/widget/windows/nsWindow-cpp.patch b/src/widget/windows/nsWindow-cpp.patch
index 2c1d4f797..0de755b0a 100644
--- a/src/widget/windows/nsWindow-cpp.patch
+++ b/src/widget/windows/nsWindow-cpp.patch
@@ -1,5 +1,5 @@
diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
-index d2863d5fd9ce5cedc88253a07cb061a660d42e61..28e63f8bb0b6c8d3b5655b285ea1040ea426616d 100644
+index d2863d5fd9ce5cedc88253a07cb061a660d42e61..5c1097ad16cd6e27e76cc6dfbed85218d36cc36f 100644
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -165,6 +165,7 @@
@@ -15,7 +15,7 @@ index d2863d5fd9ce5cedc88253a07cb061a660d42e61..28e63f8bb0b6c8d3b5655b285ea1040e
return DWMSBT_AUTO;
}
- return IsPopup() ? DWMSBT_TRANSIENTWINDOW : DWMSBT_TABBEDWINDOW;
-+ return IsPopup() ? DWMSBT_TRANSIENTWINDOW : (StaticPrefs::zen_widget_windows_acrylic_AtStartup() ? DWMSBT_TRANSIENTWINDOW : DWMSBT_TABBEDWINDOW);
++ return IsPopup() ? DWMSBT_TRANSIENTWINDOW : (StaticPrefs::zen_widget_windows_acrylic() ? DWMSBT_TRANSIENTWINDOW : DWMSBT_TABBEDWINDOW);
}();
::DwmSetWindowAttribute(mWnd, DWMWA_SYSTEMBACKDROP_TYPE, &backdrop,
sizeof backdrop);
From abedfedac6166532a8b4d02af5751d22f00d45dc Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 22:34:46 +0200
Subject: [PATCH 112/114] fix: update workspace change logic and remove
redundant event listener
---
src/browser/base/zen-components/ZenWorkspaces.mjs | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index d6e4f0b64..4c8903be6 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1986,9 +1986,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
}
if (workspaceID) {
- if (tab.hasAttribute('change-workspace') && this.moveTabToWorkspace(tab, workspaceID))
+ if (tab.hasAttribute('change-workspace') && this.moveTabToWorkspace(tab, workspaceID)) {
this._lastSelectedWorkspaceTabs[workspaceID] = tab;
-
+ tab.removeAttribute('change-workspace');
+ await this.changeWorkspace({ uuid: workspaceID }, { onInit: true });
+ }
return;
}
@@ -2251,13 +2253,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
if (matchingWorkspaces.length === 1) {
const workspace = matchingWorkspaces[0];
if (workspace.uuid !== this.getActiveWorkspaceFromCache().uuid) {
- window.addEventListener(
- 'TabSelected',
- (event) => {
- this.changeWorkspace(workspace, { alwaysChange: true });
- },
- { once: true }
- );
return [userContextId, true, workspace.uuid];
}
}
From 9762d74256674d2bffa964f36f56f895053e45f6 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 2 Apr 2025 23:11:04 +0200
Subject: [PATCH 113/114] refactor: streamline media button event handling and
remove inline commands
---
.../base/content/zen-media-player.inc.xhtml | 25 +++++--------
.../zen-components/ZenMediaController.mjs | 35 +++++++++++++++++++
.../tabbrowser/content/tabs-js.patch | 11 +++++-
3 files changed, 53 insertions(+), 18 deletions(-)
diff --git a/src/browser/base/content/zen-media-player.inc.xhtml b/src/browser/base/content/zen-media-player.inc.xhtml
index 20e42d254..1e53438cc 100644
--- a/src/browser/base/content/zen-media-player.inc.xhtml
+++ b/src/browser/base/content/zen-media-player.inc.xhtml
@@ -13,38 +13,29 @@
</vbox>
<hbox id="zen-media-buttons-hbox">
<toolbarbutton id="zen-media-pip-button"
- class="toolbarbutton-1"
- oncommand="gZenMediaController.onMediaPip();" />
+ class="toolbarbutton-1" />
<toolbarbutton id="zen-media-close-button"
- class="toolbarbutton-1"
- oncommand="gZenMediaController.onControllerClose();" />
+ class="toolbarbutton-1" />
</hbox>
</hbox>
<hbox id="zen-media-progress-hbox" class="show-on-hover">
<label id="zen-media-current-time">0:00</label>
<html:input type="range" id="zen-media-progress-bar"
- value="0" min="0" max="100" step="0.1"
- oninput="gZenMediaController.onMediaSeekDrag(event);"
- onchange="gZenMediaController.onMediaSeekComplete(event);"/>
+ value="0" min="0" max="100" step="0.1"/>
<label id="zen-media-duration">0:00</label>
</hbox>
</vbox>
<hbox id="zen-media-controls-hbox">
<toolbarbutton id="zen-media-focus-button"
- class="toolbarbutton-1"
- oncommand="gZenMediaController.onMediaFocus();" />
+ class="toolbarbutton-1" />
<toolbarbutton id="zen-media-previoustrack-button"
- class="toolbarbutton-1"
- oncommand="gZenMediaController.onMediaPlayPrev();" />
+ class="toolbarbutton-1" />
<toolbarbutton id="zen-media-playpause-button"
- class="toolbarbutton-1"
- oncommand="gZenMediaController.onMediaToggle();" />
+ class="toolbarbutton-1" />
<toolbarbutton id="zen-media-nexttrack-button"
- class="toolbarbutton-1"
- oncommand="gZenMediaController.onMediaPlayNext();" />
+ class="toolbarbutton-1" />
<toolbarbutton id="zen-media-mute-button"
- class="toolbarbutton-1"
- oncommand="gZenMediaController.onMediaMute();" />
+ class="toolbarbutton-1" />
</hbox>
</vbox>
</toolbaritem>
diff --git a/src/browser/base/zen-components/ZenMediaController.mjs b/src/browser/base/zen-components/ZenMediaController.mjs
index 029407918..6f0daebd3 100644
--- a/src/browser/base/zen-components/ZenMediaController.mjs
+++ b/src/browser/base/zen-components/ZenMediaController.mjs
@@ -39,6 +39,41 @@ class ZenMediaController {
this.onDeactivated = this._onDeactivated.bind(this);
this.onPipModeChange = this._onPictureInPictureModeChange.bind(this);
+ this.#initEventListeners();
+ }
+
+ #initEventListeners() {
+ this.mediaControlBar.addEventListener('command', (event) => {
+ const button = event.target.closest('toolbarbutton');
+ if (!button) return;
+ switch (button.id) {
+ case 'zen-media-pip-button':
+ this.onMediaPip();
+ break;
+ case 'zen-media-close-button':
+ this.onControllerClose();
+ break;
+ case 'zen-media-focus-button':
+ this.onMediaFocus();
+ break;
+ case 'zen-media-mute-button':
+ this.onMediaMute();
+ break;
+ case 'zen-media-previoustrack-button':
+ this.onMediaPlayPrev();
+ break;
+ case 'zen-media-nexttrack-button':
+ this.onMediaPlayNext();
+ break;
+ case 'zen-media-playpause-button':
+ this.onMediaToggle();
+ break;
+ }
+ });
+
+ this.mediaProgressBar.addEventListener('input', this.onMediaSeekDrag.bind(this));
+ this.mediaProgressBar.addEventListener('change', this.onMediaSeekComplete.bind(this));
+
window.addEventListener('TabSelect', (event) => {
const linkedBrowser = event.target.linkedBrowser;
this.switchController();
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 7418cf6fc..5b5181a4e 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..99a84a1cae6c18f3a80b7490dfc61712b38f6909 100644
+index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..0d3919b288afefb05e3ec54ddfa90f001dd4c3b1 100644
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
@@ -93,7 +93,7 @@
@@ -413,6 +413,15 @@ index 0fbdbf3aefc467880e6b0bae2615cb145735cb0f..99a84a1cae6c18f3a80b7490dfc61712
if (this.#rtlMode) {
tabs.reverse();
+@@ -2314,7 +2350,7 @@
+ let size = this.verticalMode ? "height" : "width";
+ let translateAxis = this.verticalMode ? "translateY" : "translateX";
+ let scrollDirection = this.verticalMode ? "scrollTop" : "scrollLeft";
+- let { width: tabWidth, height: tabHeight } = bounds(draggedTab);
++ let { width: tabWidth, height: tabHeight } = bounds(draggedTab.group?.hasAttribute("split-view-group") ? draggedTab.group : draggedTab);
+ let translateX = event.screenX - dragData.screenX;
+ let translateY = event.screenY - dragData.screenY;
+
@@ -2328,6 +2364,12 @@
let lastTab = tabs.at(-1);
let lastMovingTab = movingTabs.at(-1);
From 5473afac238ee5f73dc29c84a5dc78db3e64d4aa Mon Sep 17 00:00:00 2001
From: "mr. m" <91018726+mauro-balades@users.noreply.github.com>
Date: Thu, 3 Apr 2025 00:04:45 +0200
Subject: [PATCH 114/114] Added option to use sccache for release builds
Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com>
---
.github/workflows/build.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d390375cf..ad72068a4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,6 +21,11 @@ on:
options:
- 'release'
- 'twilight'
+ use-sccache:
+ description: 'Use sccache'
+ required: true
+ type: 'boolean'
+ default: false
workflow_call:
inputs:
create_release:
@@ -53,6 +58,7 @@ jobs:
run: |
echo "create_release: ${{ inputs.create_release }}"
echo "update_version: ${{ inputs.update_version }}"
+ echo "use sccache: ${{ inputs.use-sccache }}"
echo "update_branch: ${{ inputs.update_branch }}"
echo "GITHUB_REPOSITORY: ${{ github.repository }}"
echo "GITHUB_REPOSITORY_OWNER: ${{ github.repository_owner }}"