From 0c68c72b295a17b475ca2ab9c9325046e0c0d63a Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 16 Apr 2025 16:50:15 +0200 Subject: [PATCH 1/4] fix: Inconsistent spacing with the native firefox sidebar on compact mode (multiple toolbars), b=(closes #7118), c=compact-mode --- src/zen/compact-mode/zen-compact-mode.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css index a5b3b25b4..267f8750a 100644 --- a/src/zen/compact-mode/zen-compact-mode.css +++ b/src/zen/compact-mode/zen-compact-mode.css @@ -296,7 +296,6 @@ --zen-toolbox-top-align: var(--zen-element-separation); } - & #sidebar-box, & #titlebar, & #zen-appcontent-wrapper, & #zen-sidebar-web-panel-wrapper:has(#zen-sidebar-web-panel:not([pinned='true'])) { From 31a5e70b26c905af7a636bfbfbd24fd86466b0af Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 16 Apr 2025 17:05:46 +0200 Subject: [PATCH 2/4] chore: Re-export all patches, b=(no-bug), c=no-component --- src/browser/app/profile/firefox-js.patch | 4 ++-- .../components/tabbrowser/content/tabbrowser-js.patch | 11 ++++++++++- src/browser/installer/windows/nsis/shared-nsh.patch | 11 ++++++++++- src/widget/cocoa/VibrancyManager-mm.patch | 2 +- 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/browser/app/profile/firefox-js.patch b/src/browser/app/profile/firefox-js.patch index ccd07cd6a..0f2aa228c 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 97acbf826f9427b06e0a54679b30269ce7b695f5..aeadcd0c72816612cd5c1ca1199fe2a363c637f4 100644 +index 78572e5480a6137c5b7de89c489956f5d68ef698..1c72fe9a5419e211dea25271113981aeda46ec66 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -3362,3 +3362,5 @@ pref("toolkit.contentRelevancy.enabled", false); +@@ -3363,3 +3363,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/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch index 858c37880..775cec820 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..22d077e528387a6fbe59a170784dd8caa0c65b26 100644 +index 5f406ea5d09273c9b70b84eee24c6267f88692f8..3e6b06aef1f74416f67e2e4bba39e5918bec2d47 100644 --- a/browser/components/tabbrowser/content/tabbrowser.js +++ b/browser/components/tabbrowser/content/tabbrowser.js @@ -424,11 +424,67 @@ @@ -590,6 +590,15 @@ index 5f406ea5d09273c9b70b84eee24c6267f88692f8..22d077e528387a6fbe59a170784dd8ca } // If no qualifying visible tab was found, see if there is a tab in +@@ -5202,7 +5367,7 @@ + }); + } + +- return tab; ++ return ZenWorkspaces.findTabToBlur(tab); + } + + _blurTab(aTab) { @@ -5599,10 +5764,10 @@ SessionStore.deleteCustomTabValue(aTab, "hiddenBy"); } diff --git a/src/browser/installer/windows/nsis/shared-nsh.patch b/src/browser/installer/windows/nsis/shared-nsh.patch index 09a2396f0..bf8242d26 100644 --- a/src/browser/installer/windows/nsis/shared-nsh.patch +++ b/src/browser/installer/windows/nsis/shared-nsh.patch @@ -1,7 +1,7 @@ diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh old mode 100755 new mode 100644 -index bc8f5775785e08a0cc1c8a6ad1f0e19e980c607d..bf11d30d10fb38855f6a0e8d5346be271042769e +index bc8f5775785e08a0cc1c8a6ad1f0e19e980c607d..f45dd4d2b0623a4502bf63dd4e580faa674bd2bb --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -513,6 +513,7 @@ ${RemoveDefaultBrowserAgentShortcut} @@ -28,6 +28,15 @@ index bc8f5775785e08a0cc1c8a6ad1f0e19e980c607d..bf11d30d10fb38855f6a0e8d5346be27 ${WriteApplicationsSupportedType} ${RegKey} ".xht" ${WriteApplicationsSupportedType} ${RegKey} ".xhtml" ${WriteApplicationsSupportedType} ${RegKey} ".xml" +@@ -878,7 +881,7 @@ ${RemoveDefaultBrowserAgentShortcut} + ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0 + ${WriteRegStr2} $1 "$0" "HelpLink" "${HelpLink}" 0 + ${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0 +- ${WriteRegStr2} $1 "$0" "Publisher" "Mozilla" 0 ++ ${WriteRegStr2} $1 "$0" "Publisher" "Zen OSS Team" 0 + ${WriteRegStr2} $1 "$0" "UninstallString" "$\"$8\uninstall\helper.exe$\"" 0 + DeleteRegValue SHCTX "$0" "URLInfoAbout" + ; Don't add URLUpdateInfo which is the release notes url except for the release @@ -1727,6 +1730,8 @@ Function SetAsDefaultAppUserHKCU Pop $0 AppAssocReg::SetAppAsDefault "$R9" ".avif" "file" diff --git a/src/widget/cocoa/VibrancyManager-mm.patch b/src/widget/cocoa/VibrancyManager-mm.patch index 1270745ca..28fe7f476 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 @@ static NSVisualEffectBlendingMode VisualEffectBlendingModeForVibrancyType( +@@ -78,6 +95,7 @@ - (NSView*)hitTest:(NSPoint)aPoint { - (void)prefChanged { self.blendingMode = VisualEffectBlendingModeForVibrancyType(mType); From c671d1e3897c4e3cf62b23fccae5f19024e56c7d Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Wed, 16 Apr 2025 19:51:48 +0200 Subject: [PATCH 3/4] fix: Revert export from https://github.com/zen-browser/desktop/commit/31a5e70b26c905af7a636bfbfbd24fd86466b0af#diff-0dad6ae9e720c6b380d48f7e19654910c30256bacc25567e1319a927bace7e5f, b=(no-bug), c=no-component --- src/browser/installer/windows/nsis/shared-nsh.patch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/browser/installer/windows/nsis/shared-nsh.patch b/src/browser/installer/windows/nsis/shared-nsh.patch index bf8242d26..09a2396f0 100644 --- a/src/browser/installer/windows/nsis/shared-nsh.patch +++ b/src/browser/installer/windows/nsis/shared-nsh.patch @@ -1,7 +1,7 @@ diff --git a/browser/installer/windows/nsis/shared.nsh b/browser/installer/windows/nsis/shared.nsh old mode 100755 new mode 100644 -index bc8f5775785e08a0cc1c8a6ad1f0e19e980c607d..f45dd4d2b0623a4502bf63dd4e580faa674bd2bb +index bc8f5775785e08a0cc1c8a6ad1f0e19e980c607d..bf11d30d10fb38855f6a0e8d5346be271042769e --- a/browser/installer/windows/nsis/shared.nsh +++ b/browser/installer/windows/nsis/shared.nsh @@ -513,6 +513,7 @@ ${RemoveDefaultBrowserAgentShortcut} @@ -28,15 +28,6 @@ index bc8f5775785e08a0cc1c8a6ad1f0e19e980c607d..f45dd4d2b0623a4502bf63dd4e580faa ${WriteApplicationsSupportedType} ${RegKey} ".xht" ${WriteApplicationsSupportedType} ${RegKey} ".xhtml" ${WriteApplicationsSupportedType} ${RegKey} ".xml" -@@ -878,7 +881,7 @@ ${RemoveDefaultBrowserAgentShortcut} - ${WriteRegStr2} $1 "$0" "DisplayVersion" "${AppVersion}" 0 - ${WriteRegStr2} $1 "$0" "HelpLink" "${HelpLink}" 0 - ${WriteRegStr2} $1 "$0" "InstallLocation" "$8" 0 -- ${WriteRegStr2} $1 "$0" "Publisher" "Mozilla" 0 -+ ${WriteRegStr2} $1 "$0" "Publisher" "Zen OSS Team" 0 - ${WriteRegStr2} $1 "$0" "UninstallString" "$\"$8\uninstall\helper.exe$\"" 0 - DeleteRegValue SHCTX "$0" "URLInfoAbout" - ; Don't add URLUpdateInfo which is the release notes url except for the release @@ -1727,6 +1730,8 @@ Function SetAsDefaultAppUserHKCU Pop $0 AppAssocReg::SetAppAsDefault "$R9" ".avif" "file" From e4311704354737d5026dcafbd9f4dd5b63d580e8 Mon Sep 17 00:00:00 2001 From: "mr. m" Date: Thu, 17 Apr 2025 00:36:43 +0200 Subject: [PATCH 4/4] fix: Split views not selected still having the pending attribute, b=(no-bug), c=split-view, tabs --- src/zen/split-view/ZenViewSplitter.mjs | 1 + src/zen/tabs/zen-tabs/vertical-tabs.css | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/zen/split-view/ZenViewSplitter.mjs b/src/zen/split-view/ZenViewSplitter.mjs index 9c6b64eed..100f56d25 100644 --- a/src/zen/split-view/ZenViewSplitter.mjs +++ b/src/zen/split-view/ZenViewSplitter.mjs @@ -1379,6 +1379,7 @@ class ZenViewSplitter extends ZenDOMOperatedFeature { } const browser = tab.linkedBrowser.closest('.browserSidebarContainer'); if (active) { + tab.removeAttribute('pending'); browser.setAttribute('zen-split', 'true'); browser.addEventListener('dragstart', this.onBrowserDragStart); diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css index 9944489ac..ab72bcd07 100644 --- a/src/zen/tabs/zen-tabs/vertical-tabs.css +++ b/src/zen/tabs/zen-tabs/vertical-tabs.css @@ -1122,7 +1122,7 @@ --zen-essential-bg-margin: 2px; &::before { - background: light-dark(rgba(255, 255, 255, 0.85), rgba(255, 255, 255, 0.65)); + background: light-dark(rgba(255, 255, 255, 0.85), rgba(68, 64, 64, 0.85)); margin: var(--zen-essential-bg-margin); border-radius: calc(var(--border-radius-medium) - var(--zen-essential-bg-margin)); position: absolute; @@ -1134,7 +1134,7 @@ } &[visuallyselected]:hover .tab-background::before { - background: light-dark(rgba(255, 255, 255, 0.80), rgba(255, 255, 255, 0.45)); + background: light-dark(rgba(255, 255, 255, 0.80), rgba(68, 64, 64, 0.75)); } } }