mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-08-11 01:08:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into window-sync

Browse Source
This commit is contained in:
mr. m
2025-10-19 23:11:11 +02:00
committed by GitHub
parent 4a7f8fc9c0 a6bbd4ad30
commit af20a65fa1
13 changed files with 120 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/build.yml vendored
View File

@@ -264,6 +264,9 @@ jobs:
- name: Import
run: npm run import -- --verbose
- name: Build language packs
run: sh scripts/download-language-packs.sh
- name: Compress
run: |
tar \

2
locales/fr/browser/browser/zen-general.ftl
View File

@@ -59,7 +59,7 @@ zen-generic-next = Suivant
# These labels will be used for the site data panel settings
zen-site-data-setting-allow = Autorisé
zen-site-data-setting-block = Bloqué
zen-site-data-setting-cross-site = cookie intersite
zen-site-data-setting-cross-site = Cookie intersite
zen-site-data-security-info-extension =
.label = Extension
zen-site-data-security-info-secure =

47
src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1acfd896f 100644
index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..b286fc5b40a6e32a3af0bb0f209e58c64ab7bed9 100644
--- a/browser/components/urlbar/UrlbarInput.sys.mjs
+++ b/browser/components/urlbar/UrlbarInput.sys.mjs
@@ -76,6 +76,13 @@ ChromeUtils.defineLazyGetter(lazy, "logger", () =>
@@ -108,10 +108,11 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
startLayoutExtend() {
if (!this.#allowBreakout || this.hasAttribute("breakout-extend")) {
// Do not expand if the Urlbar does not support being expanded or it is
@@ -2312,6 +2370,12 @@ export class UrlbarInput {
@@ -2312,6 +2370,13 @@ export class UrlbarInput {
this.setAttribute("breakout-extend", "true");
+ this.window.gZenUIManager.onUrlbarOpen();
+ if (this.zenUrlbarBehavior == 'float' || (this.zenUrlbarBehavior == 'floating-on-type' && !this.focusedViaMousedown)) {
+ this.setAttribute("zen-floating-urlbar", "true");
+ this.window.gZenUIManager.onFloatingURLBarOpen();
@@ -121,13 +122,14 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
// 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")) {
@@ -2331,6 +2395,24 @@ export class UrlbarInput {
@@ -2331,6 +2396,25 @@ export class UrlbarInput {
return;
}
+ if (this._zenHandleUrlbarClose) {
+ this._zenHandleUrlbarClose();
+ }
+ this.window.gZenUIManager.onUrlbarClose();
+
+ // Arc like URLbar: Blur the input on exit
+ const zenToolbox = this.document.getElementById("navigator-toolbox");
@@ -146,7 +148,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
this.removeAttribute("breakout-extend");
this.#updateTextboxPosition();
}
@@ -2595,10 +2677,12 @@ export class UrlbarInput {
@@ -2595,10 +2679,12 @@ export class UrlbarInput {
return;
}
this.textbox.style.top = px(
@@ -155,12 +157,15 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
ignoreTransforms: true,
flush: false,
})[0].p1.y
+ : -5
+ : (AppConstants.platform == "macosx" ? -2 : -5)
);
}
@@ -2660,7 +2744,7 @@ export class UrlbarInput {
@@ -2658,9 +2744,10 @@ export class UrlbarInput {
return;
}
+ this.window.gZenVerticalTabsManager.recalculateURLBarHeight();
this.textbox.parentNode.style.setProperty(
"--urlbar-container-height",
- px(getBoundsWithoutFlushing(this.textbox.parentNode).height)
@@ -168,7 +173,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
);
this.textbox.style.setProperty(
"--urlbar-height",
@@ -3093,6 +3177,7 @@ export class UrlbarInput {
@@ -3093,6 +3180,7 @@ export class UrlbarInput {
}
_toggleActionOverride(event) {
@@ -176,7 +181,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
if (
event.keyCode == KeyEvent.DOM_VK_SHIFT ||
event.keyCode == KeyEvent.DOM_VK_ALT ||
@@ -3197,7 +3282,7 @@ export class UrlbarInput {
@@ -3197,7 +3285,7 @@ export class UrlbarInput {
return val;
}
let trimmedValue = lazy.UrlbarPrefs.get("trimURLs")
@@ -185,7 +190,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
: val;
// Only trim value if the directionality doesn't change to RTL and we're not
// showing a strikeout https protocol.
@@ -3501,6 +3586,7 @@ export class UrlbarInput {
@@ -3501,6 +3589,7 @@ export class UrlbarInput {
resultDetails = null,
browser = this.window.gBrowser.selectedBrowser
) {
@@ -193,7 +198,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
if (this.isAddressbar) {
this.#prepareAddressbarLoad(
url,
@@ -3608,6 +3694,10 @@ export class UrlbarInput {
@@ -3608,6 +3697,10 @@ export class UrlbarInput {
}
reuseEmpty = true;
}
@@ -204,7 +209,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
if (
where == "tab" &&
reuseEmpty &&
@@ -3615,6 +3705,9 @@ export class UrlbarInput {
@@ -3615,6 +3708,9 @@ export class UrlbarInput {
) {
where = "current";
}
@@ -214,7 +219,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
return where;
}
@@ -3872,6 +3965,7 @@ export class UrlbarInput {
@@ -3872,6 +3968,7 @@ export class UrlbarInput {
this.setResultForCurrentValue(null);
this.handleCommand();
this.controller.clearLastQueryContextCache();
@@ -222,7 +227,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
this._suppressStartQuery = false;
});
@@ -3879,7 +3973,6 @@ export class UrlbarInput {
@@ -3879,7 +3976,6 @@ export class UrlbarInput {
contextMenu.addEventListener("popupshowing", () => {
// Close the results pane when the input field contextual menu is open,
// because paste and go doesn't want a result selection.
@@ -230,7 +235,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
let controller =
this.document.commandDispatcher.getControllerForCommand("cmd_paste");
@@ -3991,7 +4084,11 @@ export class UrlbarInput {
@@ -3991,7 +4087,11 @@ export class UrlbarInput {
if (!engineName && !source && !this.hasAttribute("searchmode")) {
return;
}
@@ -243,7 +248,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
if (this._searchModeIndicatorTitle) {
this._searchModeIndicatorTitle.textContent = "";
this._searchModeIndicatorTitle.removeAttribute("data-l10n-id");
@@ -4302,6 +4399,7 @@ export class UrlbarInput {
@@ -4302,6 +4402,7 @@ export class UrlbarInput {
this.document.l10n.setAttributes(
this.inputField,
@@ -251,7 +256,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
l10nId,
l10nId == "urlbar-placeholder-with-name" ? { name } : undefined
);
@@ -4413,6 +4511,11 @@ export class UrlbarInput {
@@ -4413,6 +4514,11 @@ export class UrlbarInput {
}
_on_click(event) {
@@ -263,7 +268,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
if (
event.target == this.inputField ||
event.target == this._inputContainer
@@ -4485,7 +4588,7 @@ export class UrlbarInput {
@@ -4485,7 +4591,7 @@ export class UrlbarInput {
}
}
@@ -272,7 +277,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
this.view.autoOpen({ event });
} else {
if (this._untrimOnFocusAfterKeydown) {
@@ -4525,9 +4628,16 @@ export class UrlbarInput {
@@ -4525,9 +4631,16 @@ export class UrlbarInput {
}
_on_mousedown(event) {
@@ -290,7 +295,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
if (
event.target != this.inputField &&
@@ -4538,6 +4648,10 @@ export class UrlbarInput {
@@ -4538,6 +4651,10 @@ export class UrlbarInput {
this.focusedViaMousedown = !this.focused;
this._preventClickSelectsAll = this.focused;
@@ -301,7 +306,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
// Keep the focus status, since the attribute may be changed
// upon calling this.focus().
@@ -4573,7 +4687,7 @@ export class UrlbarInput {
@@ -4573,7 +4690,7 @@ export class UrlbarInput {
}
// Don't close the view when clicking on a tab; we may want to keep the
// view open on tab switch, and the TabSelect event arrived earlier.
@@ -310,7 +315,7 @@ index afc7a6c6ddbf4cf5a5b27c0bd60577b833c63093..e31ad41ab28b2be67c25c2efc75e9dd1
break;
}
@@ -4890,7 +5004,7 @@ export class UrlbarInput {
@@ -4890,7 +5007,7 @@ export class UrlbarInput {
// When we are in actions search mode we can show more results so
// increase the limit.
let maxResults =

18
src/toolkit/content/widgets/tabbox-js.patch
View File

@@ -1,5 +1,5 @@
diff --git a/toolkit/content/widgets/tabbox.js b/toolkit/content/widgets/tabbox.js
index 70afbfc87d543971e6f8a0661a44b682920a7bc4..2f767296db8043318fab2aeb39bfc5eee090b258 100644
index 70afbfc87d543971e6f8a0661a44b682920a7bc4..2035222f4680e2eaa27b3072a12a9163b914adec 100644
--- a/toolkit/content/widgets/tabbox.js
+++ b/toolkit/content/widgets/tabbox.js
@@ -213,7 +213,7 @@
@@ -20,7 +20,15 @@ index 70afbfc87d543971e6f8a0661a44b682920a7bc4..2f767296db8043318fab2aeb39bfc5ee
if (otherTab != tab && otherTab.selected) {
otherTab._selected = false;
}
@@ -823,7 +823,7 @@
@@ -646,6 +646,7 @@
* @param {MozTab|null} [val]
*/
set selectedItem(val) {
+ val = window.gZenGlanceManager?.getTabOrGlanceChild(val) || val;
if (val && !val.selected) {
// The selectedIndex setter ignores invalid values
// such as -1 if |val| isn't one of our child nodes.
@@ -823,7 +824,7 @@
if (tab == startTab) {
return null;
}
@@ -29,7 +37,11 @@ index 70afbfc87d543971e6f8a0661a44b682920a7bc4..2f767296db8043318fab2aeb39bfc5ee
return tab;
}
}
@@ -888,7 +888,7 @@
@@ -885,10 +886,11 @@
* @param {boolean} [aWrap]
*/
advanceSelectedTab(aDir, aWrap) {
+ if (window?.gZenGlanceManager?._animating) return;
let { ariaFocusedItem } = this;
let startTab = ariaFocusedItem;
if (!ariaFocusedItem || !this.allTabs.includes(ariaFocusedItem)) {

4
src/zen/common/ZenCustomizableUI.sys.mjs
View File

@@ -2,6 +2,8 @@
// 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/.
import { AppConstants } from 'resource://gre/modules/AppConstants.sys.mjs';
export var ZenCustomizableUI = new (class {
constructor() {}
@@ -37,7 +39,7 @@ export var ZenCustomizableUI = new (class {
}
#addSidebarButtons(window) {
const kDefaultSidebarWidth = '230px';
const kDefaultSidebarWidth = AppConstants.platform === 'macosx' ? '230px' : '186px';
const toolbox = window.gNavToolbox;
// Set a splitter to navigator-toolbox

14
src/zen/common/ZenUIManager.mjs
View File

@@ -274,6 +274,18 @@ var gZenUIManager = {
// Section: URL bar
onUrlbarOpen() {
gURLBar.setAttribute('had-proxystate', gURLBar.getAttribute('pageproxystate'));
gURLBar.setPageProxyState('invalid', false);
},
onUrlbarClose() {
if (gURLBar.hasAttribute('had-proxystate')) {
gURLBar.setURI();
gURLBar.removeAttribute('had-proxystate');
}
},
onUrlbarSearchModeChanged(event) {
const { searchMode } = event.detail;
const input = gURLBar.textbox;
@@ -919,7 +931,7 @@ var gZenVerticalTabsManager = {
gURLBar.textbox.removeAttribute('--urlbar-height');
let height;
if (!this._hasSetSingleToolbar) {
height = 32;
height = AppConstants.platform == 'macosx' ? 34 : 32;
} else if (gURLBar.getAttribute('breakout-extend') !== 'true') {
height = 40;
}

8
src/zen/common/styles/zen-browser-ui.css
View File

@@ -26,10 +26,6 @@
}
}
:root:not([zen-single-toolbar='true']) #zen-navigator-toolbox #zen-sidebar-top-buttons {
--zen-toolbar-height: 42px;
}
:root[zen-before-loaded='true'] #browser > *:not(#zen-toast-container),
:root[zen-before-loaded='true'] #urlbar {
opacity: 0 !important;
@@ -140,9 +136,9 @@
z-index: 2;
}
#nav-bar {
/* For some reason, Firefox adds a really small border to the top of the nav-bar */
:root[zen-single-toolbar='true'] #nav-bar {
border-top: none !important;
--zen-toolbar-height: 37px;
}
#zen-main-app-wrapper {

22
src/zen/common/styles/zen-omnibox.css
View File

@@ -39,6 +39,11 @@
:root[zen-single-toolbar='true'] &[breakout-extend='true'],
&[zen-floating-urlbar='true'] {
--urlbar-container-padding: 3px;
--urlbar-margin-inline: 11px;
&:not([zen-floating-urlbar='true']) {
--urlbar-container-height: 52px !important;
}
}
}
@@ -174,7 +179,7 @@
}
:root[zen-single-toolbar='true'],
#urlbar:is([breakout-extend='true'], [pageproxystate='invalid']) {
#urlbar[pageproxystate='invalid'] {
#zen-copy-url-button[disabled] {
display: none !important;
}
@@ -706,6 +711,21 @@
}
}
:root:not([zen-single-toolbar='true'])
#urlbar[breakout-extend='true']:not([zen-floating-urlbar='true']) {
& .urlbar-background {
border-radius: 10px !important;
}
#urlbar-results {
margin-block: calc(var(--urlbarView-results-padding) - 2px);
}
#identity-box {
margin-inline-end: 0px;
}
}
/* Hide the results body when there are no results, to avoid showing an empty box */
.urlbarView[noresults] > .urlbarView-body-outer > .urlbarView-body-inner,
#urlbar-search-mode-indicator-close {

3
src/zen/common/styles/zen-popup.css
View File

@@ -393,8 +393,9 @@ menuseparator {
border-top: 2px solid light-dark(transparent, rgba(255, 255, 255, 0.1));
color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8)) !important;
box-shadow: 0 0 1px 1px rgba(0, 0, 0, 0.05);
background: light-dark(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.1)) !important;
outline: 0.5px solid light-dark(rgba(0, 0, 0, 0.3), rgba(255, 255, 255, 0.02));
outline: 0.5px solid light-dark(transparent, rgba(255, 255, 255, 0.02));
outline-offset: -0.5px;
:root[zen-right-side='true'] & {

4
src/zen/common/styles/zen-theme.css
View File

@@ -153,6 +153,10 @@
--tabstrip-inner-border: transparent;
--zen-toolbar-height: 38px;
@media (-moz-platform: macos) {
--zen-toolbar-height: 42px;
}
--zen-toolbar-button-inner-padding: 6px;
--toolbarbutton-outer-padding: 4px;
--zen-toolbar-height-with-bookmarks: var(--zen-toolbar-height);

55
src/zen/glance/ZenGlanceManager.mjs
View File

@@ -774,7 +774,7 @@
(this._animating && !onTabClose) ||
!this.#currentBrowser ||
(this.animatingOpen && !onTabClose) ||
this._duringOpening
this.#duringOpening
);
}
@@ -1055,7 +1055,7 @@
this.#currentParentTab.removeAttribute('glance-id');
this.#glances.delete(this.#currentGlanceID);
this.#currentGlanceID = setNewID;
this._duringOpening = false;
this.#duringOpening = false;
}
/**
@@ -1067,8 +1067,11 @@
}
this.#duringOpening = true;
this.#configureGlanceElements();
// IMPORTANT: #setGlanceStates() must be called before #configureGlanceElements()
// to ensure that the glance state is fully set up before configuring the DOM elements.
// This order is required to avoid timing/state issues. Do not reorder without understanding the dependencies.
this.#setGlanceStates();
this.#configureGlanceElements();
this.#duringOpening = false;
}
@@ -1184,10 +1187,17 @@
/**
* Open glance on location change if not animating
* @param {Tab} prevTab - The previous tab
*/
onLocationChangeOpenGlance() {
#onLocationChangeOpenGlance(prevTab) {
if (!this.animatingOpen) {
this.quickOpenGlance();
if (prevTab && prevTab.linkedBrowser) {
prevTab.linkedBrowser.docShellIsActive = false;
prevTab.linkedBrowser
.closest('.browserSidebarContainer')
.classList.remove('deck-selected');
}
}
}
@@ -1198,6 +1208,7 @@
*/
onLocationChange(event) {
const tab = event.target;
const prevTab = event.detail.previousTab;
if (this.animatingFullOpen || this.closingGlance) {
return;
@@ -1215,30 +1226,11 @@
}
this.#currentGlanceID = tab.getAttribute('glance-id');
if (gBrowser.selectedTab === this.#currentParentTab && this.#currentBrowser) {
this.#handleParentTabSelection(event);
} else if (gBrowser.selectedTab === this.#currentTab) {
setTimeout(this.onLocationChangeOpenGlance.bind(this), 0);
if (gBrowser.selectedTab === this.#currentTab) {
this.#onLocationChangeOpenGlance(prevTab);
return;
}
}
/**
* Handle parent tab selection
* @param {Event} event - The location change event
*/
#handleParentTabSelection(event) {
const curTab = this.#currentTab;
const prevTab = event.detail.previousTab;
setTimeout(() => {
gBrowser.selectedTab = curTab;
if (prevTab?.linkedBrowser) {
prevTab.linkedBrowser
.closest('.browserSidebarContainer')
.classList.remove('deck-selected');
}
}, 0);
this.#currentGlanceID = null;
}
/**
@@ -1607,6 +1599,15 @@
return tab;
}
/**
* Get the tab or its glance child
* @param {Tab} tab - The tab to check
* @returns {Tab} The tab or its child
*/
getTabOrGlanceChild(tab) {
return tab?.glanceTab || tab;
}
/**
* Check if deck should remain selected
* @param {Element} currentPanel - Current panel

1
src/zen/tabs/ZenPinnedTabManager.mjs
View File

@@ -868,6 +868,7 @@
}
}, 3000);
});
return;
}
const isSpltView = tab.group?.hasAttribute('split-view-group');
const group = isSpltView ? tab.group.group : tab.group;

2
src/zen/workspaces/zen-workspaces.css
View File

@@ -236,7 +236,7 @@
visibility: collapse;
transition: opacity 0.1s;
order: 5;
--toolbarbutton-inner-padding: 6px;
--toolbarbutton-inner-padding: 6px !important;
& image {
border-radius: max(calc(var(--border-radius-medium) - 4px), 4px) !important;