From 18ddbf986c2f551669b4272ac7313fecfdb40a96 Mon Sep 17 00:00:00 2001 From: programORdie Date: Mon, 11 Nov 2024 20:37:35 +0100 Subject: [PATCH 1/3] Style: make the URL bar more rounded --- src/browser/base/content/zen-styles/zen-urlbar.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css index bb9fff21d..3394e1b09 100644 --- a/src/browser/base/content/zen-styles/zen-urlbar.css +++ b/src/browser/base/content/zen-styles/zen-urlbar.css @@ -5,7 +5,7 @@ } #urlbar { - --toolbarbutton-border-radius: 6px; + --toolbarbutton-border-radius: 10px; --urlbarView-separator-color: var(--zen-colors-border); --urlbarView-hover-background: var(--toolbarbutton-hover-background); --urlbarView-highlight-background: var(--toolbarbutton-hover-background); @@ -195,28 +195,28 @@ button.popup-notification-dropmarker { */ #notification-popup-box { - border-radius: 6px !important; + border-radius: 10px !important; } /* Border radius on hover */ #urlbar .urlbar-page-action, #urlbar #tracking-protection-icon-container, #urlbar:not([breakout-extend='true']) #identity-box:is(:not(.chromeUI), [pageproxystate='invalid']) #identity-icon-box { - border-radius: 6px !important; + border-radius: 10px !important; } /* Border radius of boxes on the left */ #identity-box:has(#identity-permission-box:is([hasPermissions], [hasSharingIcon])):not([pageproxystate='invalid']) #identity-icon-box { - border-top-left-radius: 6px !important; - border-bottom-left-radius: 6px !important; + border-top-left-radius: 10px !important; + border-bottom-left-radius: 10px !important; border-top-right-radius: 0 !important; border-bottom-right-radius: 0 !important; } /* Extensions or similar */ #urlbar:not([breakout-extend='true']) #identity-box.chromeUI:not([pageproxystate='invalid']) #identity-icon-box { - border-radius: 6px 6px 6px 6px !important; + border-radius: 10px !important; } /* Notification Stack */ @@ -275,6 +275,6 @@ button.popup-notification-dropmarker { }*/ #PersonalToolbar:not([collapsed='true']) { - padding-bottom: 6px; + padding-bottom: 10px; padding-left: 0 !important; } From 62d5684435a3a8e871a99378d00272184466694c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristijan=20Ribari=C4=87?= Date: Fri, 15 Nov 2024 13:35:10 +0100 Subject: [PATCH 2/3] Fix: Restore pinned tabs to their pinned URLs on startup if the option is checked This change modifies the pinned tab initialization logic to restore pinned tabs to their original pinned URLs when the browser starts. Previously, pinned tabs would open to their last visited URL, even if the option for restoring them to the pinned URL was checked. --- .../base/zen-components/ZenPinnedTabManager.mjs | 10 +++++++--- .../base/zen-components/ZenPinnedTabsStorage.mjs | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs index 35e164fc2..a0bfae125 100644 --- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs +++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs @@ -68,9 +68,9 @@ return this._enabled; } - async _refreshPinnedTabs() { + async _refreshPinnedTabs({ init = false } = {}) { await this._initializePinsCache(); - this._initializePinnedTabs(); + this._initializePinnedTabs(init); } async _initializePinsCache() { @@ -109,7 +109,7 @@ return this._pinsCache; } - _initializePinnedTabs() { + _initializePinnedTabs(init = false) { const pins = this._pinsCache; if (!pins?.length) { return; @@ -130,6 +130,10 @@ // This is a valid pinned tab that matches a pin pinnedTabsByUUID.set(pinId, tab); pinsToCreate.delete(pinId); + + if(lazy.zenPinnedTabRestorePinnedTabsToPinnedUrl && init) { + this._resetTabToStoredState(tab); + } } else { // This is a pinned tab that no longer has a corresponding pin gBrowser.removeTab(tab); diff --git a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs index 92e8fe99e..9283cdd7a 100644 --- a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs +++ b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs @@ -48,7 +48,7 @@ var ZenPinnedTabsStorage = { CREATE INDEX IF NOT EXISTS idx_zen_pins_changes_uuid ON zen_pins_changes(uuid) `); - await gZenPinnedTabManager._refreshPinnedTabs(); + await gZenPinnedTabManager._refreshPinnedTabs({init: true}); }); }, From 597f7dbeb8a72f584852b53412cfee8b3b043f33 Mon Sep 17 00:00:00 2001 From: pc-v2 <58063311+pc-v2@users.noreply.github.com> Date: Sat, 16 Nov 2024 10:11:26 +0700 Subject: [PATCH 3/3] Add _moveWindowButtons support for -moz-gtk-csd-reversed-placement I add 'or' operator to set window buttons if -moz-gtk-csd-reversed-placement is true Signed-off-by: pc-v2 <58063311+pc-v2@users.noreply.github.com> --- src/browser/base/content/ZenCustomizableUI.sys.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/base/content/ZenCustomizableUI.sys.mjs b/src/browser/base/content/ZenCustomizableUI.sys.mjs index 782a13df7..31e55623c 100644 --- a/src/browser/base/content/ZenCustomizableUI.sys.mjs +++ b/src/browser/base/content/ZenCustomizableUI.sys.mjs @@ -71,7 +71,7 @@ export var ZenCustomizableUI = new (class { _moveWindowButtons(window) { const windowControls = window.document.getElementsByClassName('titlebar-buttonbox-container'); const toolboxIcons = window.document.getElementById('zen-sidebar-top-buttons-customization-target'); - if (window.AppConstants.platform === 'macosx') { + if (window.AppConstants.platform === 'macosx'|| matchMedia('(-moz-gtk-csd-reversed-placement)').matches) { for (let i = 0; i < windowControls.length; i++) { if (i === 0) { toolboxIcons.prepend(windowControls[i]);