mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Common bug fixes

Browse Source
This commit is contained in:
mr. m
2025-02-25 17:46:20 +01:00
parent 493f299cce
commit cc2262dbaf
4 changed files with 48 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/browser/base/content/zen-styles/zen-compact-mode.css
View File

@@ -95,6 +95,7 @@
position: relative;
background: var(--zen-dialog-background);
border: 1px solid var(--zen-colors-border-contrast);
width: calc(100% - var(--zen-toolbox-padding));
:root[zen-single-toolbar='true'] {
padding-top: 0 !important;

4
src/browser/components/tabbrowser/content/tab-js.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
index d41c486c02a6f09dcff5741a59ad8b617294c481..1c150fd8863335ee356601f7872c1fdc2086dcab 100644
index d41c486c02a6f09dcff5741a59ad8b617294c481..8e902dcb3792c75238ac13a8bf9199b34451aa51 100644
--- a/browser/components/tabbrowser/content/tab.js
+++ b/browser/components/tabbrowser/content/tab.js
@@ -16,6 +16,7 @@
@@ -84,7 +84,7 @@ index d41c486c02a6f09dcff5741a59ad8b617294c481..1c150fd8863335ee356601f7872c1fdc
animate: true,
triggeringEvent: event,
});
+ } else if (this.hasAttribute('zen-essential')) {
+ } else if (this.hasAttribute('zen-essential') && !event.target.classList.contains("tab-icon-overlay")) {
+ gZenPinnedTabManager._onTabResetPinButton(event, this, 'reset');
}
}

102
src/browser/components/tabbrowser/content/tabbrowser-js.patch
View File

@@ -1,8 +1,8 @@
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b62353f766 100644
index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0576f9489 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -406,11 +406,50 @@
@@ -406,11 +406,37 @@
return this.tabContainer.visibleTabs;
}
@@ -19,19 +19,6 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
+ return i;
+ }
+
+ get _numVisiblePinTabsWithoutGlance() {
+ let i = 0;
+ for (let tab of this.tabs) {
+ if (!tab.pinned) {
+ break;
+ }
+ if (!tab.hidden && !tab.hasAttribute("zen-glance-tab")) {
+ i++;
+ }
+ }
+ return i;
+ }
+
+ get _numZenEssentials() {
+ let i = 0;
+ for (let tab of this.tabs) {
@@ -55,7 +42,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
}
return i;
}
@@ -807,7 +846,7 @@
@@ -807,7 +833,7 @@
this.showTab(aTab);
if (this.tabContainer.verticalMode) {
this._handleTabMove(aTab, () =>
@@ -64,7 +51,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
);
} else {
this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
@@ -828,7 +867,7 @@
@@ -828,7 +854,7 @@
// the moving of a tab from the vertical pinned tabs container
// and back into arrowscrollbox.
aTab.removeAttribute("pinned");
@@ -73,7 +60,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
});
} else {
this.moveTabTo(aTab, this.pinnedTabCount - 1, {
@@ -1055,6 +1094,8 @@
@@ -1055,6 +1081,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -82,7 +69,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (
aIconURL &&
!aLoadingPrincipal &&
@@ -1065,6 +1106,9 @@
@@ -1065,6 +1093,9 @@
);
return;
}
@@ -92,7 +79,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
@@ -1310,6 +1354,7 @@
@@ -1310,6 +1341,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@@ -100,7 +87,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
@@ -1462,6 +1507,9 @@
@@ -1462,6 +1494,9 @@
}
let activeEl = document.activeElement;
@@ -110,7 +97,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
// If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) {
newTab.focus();
@@ -1785,7 +1833,7 @@
@@ -1785,7 +1820,7 @@
}
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -119,7 +106,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
return false;
}
@@ -1888,7 +1936,7 @@
@@ -1888,7 +1923,7 @@
newIndex = this.selectedTab._tPos + 1;
}
@@ -128,7 +115,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
let browser;
if (targetTab) {
browser = this.getBrowserForTab(targetTab);
@@ -2222,7 +2270,8 @@
@@ -2222,7 +2257,8 @@
b.setAttribute("name", name);
}
@@ -138,7 +125,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
b.setAttribute("transparent", "true");
}
@@ -2387,7 +2436,7 @@
@@ -2387,7 +2423,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@@ -147,7 +134,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
@@ -2446,8 +2495,8 @@
@@ -2446,8 +2482,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) {
@@ -158,7 +145,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
@@ -2679,6 +2728,12 @@
@@ -2679,6 +2715,12 @@
);
}
@@ -171,7 +158,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
@@ -2742,6 +2797,12 @@
@@ -2742,6 +2784,12 @@
noInitialLabel,
skipBackgroundNotify,
});
@@ -184,7 +171,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (insertTab) {
// insert the tab into the tab container in the correct position
this._insertTabAtIndex(t, {
@@ -2885,6 +2946,9 @@
@@ -2885,6 +2933,9 @@
}
}
@@ -194,7 +181,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
@@ -3403,6 +3467,24 @@
@@ -3403,6 +3454,24 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@@ -219,7 +206,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
@@ -3416,6 +3498,7 @@
@@ -3416,6 +3485,7 @@
restoreTabsLazily && !select && !tabData.pinned;
let url = "about:blank";
@@ -227,7 +214,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (tabData.entries?.length) {
let activeIndex = (tabData.index || tabData.entries.length) - 1;
// Ensure the index is in bounds.
@@ -3451,7 +3534,24 @@
@@ -3451,7 +3521,24 @@
skipLoad: true,
preferredRemoteType,
});
@@ -253,7 +240,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (select) {
tabToSelect = tab;
}
@@ -3464,8 +3564,8 @@
@@ -3464,8 +3551,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) {
@@ -264,7 +251,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
tab.toggleAttribute("pinned", true);
this.tabContainer._invalidateCachedTabs();
// Then ensure all the tab open/pinning information is sent.
@@ -3729,7 +3829,7 @@
@@ -3729,7 +3816,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.
@@ -273,7 +260,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (
!bulkOrderedOpen &&
((openerTab &&
@@ -3780,7 +3880,7 @@
@@ -3780,7 +3867,7 @@
}
/** @type {MozTabbrowserTab|undefined} */
@@ -282,7 +269,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
this.tabContainer._invalidateCachedTabs();
if (tabGroup) {
@@ -4095,6 +4195,9 @@
@@ -4095,6 +4182,9 @@
return;
}
@@ -292,7 +279,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
this.removeTabs(selectedTabs);
}
@@ -4427,6 +4530,7 @@
@@ -4427,6 +4517,7 @@
skipSessionStore,
} = {}
) {
@@ -300,7 +287,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.finish("browser.tabs.opening", window);
}
@@ -4443,6 +4547,12 @@
@@ -4443,6 +4534,12 @@
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
}
@@ -313,7 +300,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
@@ -4457,7 +4567,9 @@
@@ -4457,7 +4554,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -324,7 +311,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
@@ -4471,7 +4583,6 @@
@@ -4471,7 +4570,6 @@
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
return;
}
@@ -332,7 +319,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
let lockTabSizing =
!this.tabContainer.verticalMode &&
!aTab.pinned &&
@@ -4610,14 +4721,14 @@
@@ -4610,14 +4708,14 @@
!!this.tabsInCollapsedTabGroups.length;
if (
aTab.visible &&
@@ -349,7 +336,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
@@ -4641,6 +4752,7 @@
@@ -4641,6 +4739,7 @@
newTab = true;
}
@@ -357,7 +344,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
@@ -4681,9 +4793,7 @@
@@ -4681,9 +4780,7 @@
aTab._mouseleave();
if (newTab) {
@@ -368,7 +355,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
} else {
TabBarVisibility.update();
}
@@ -4812,6 +4922,8 @@
@@ -4812,6 +4909,8 @@
this.tabs[i]._tPos = i;
}
@@ -377,7 +364,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
@@ -5025,7 +5137,7 @@
@@ -5025,7 +5124,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -386,7 +373,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
}
// Try to find a remaining tab that comes after the given tab
@@ -5047,7 +5159,7 @@
@@ -5047,7 +5146,7 @@
}
if (tab) {
@@ -395,7 +382,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
}
// If no qualifying visible tab was found, see if there is a tab in
@@ -5465,10 +5577,10 @@
@@ -5465,10 +5564,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -408,19 +395,16 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
@@ -5706,9 +5818,9 @@
@@ -5706,7 +5805,7 @@
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
- aIndex = Math.min(aIndex, this.pinnedTabCount - 1);
+ aIndex = aTab.hasAttribute('zen-essential') ? Math.min(aIndex, this._numZenEssentials) : Math.min(aIndex, this._numVisiblePinTabs - 1);
+ aIndex = aTab.hasAttribute('zen-essential') ? Math.min(aIndex, this._numZenEssentials) : Math.min(aIndex, this.pinnedTabCount - 1);
} else {
- aIndex = Math.max(aIndex, this.pinnedTabCount);
+ aIndex = Math.max(aIndex, this._numVisiblePinTabsWithoutGlance);
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
if (aTab._tPos == aIndex) {
return;
@@ -5717,7 +5829,7 @@
@@ -5717,7 +5816,7 @@
this._lastRelatedTabMap = new WeakMap();
this._handleTabMove(aTab, () => {
@@ -429,7 +413,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (forceStandaloneTab && neighbor.group) {
neighbor = neighbor.group;
}
@@ -5802,7 +5914,7 @@
@@ -5802,7 +5901,7 @@
createLazyBrowser,
};
@@ -438,7 +422,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
@@ -7443,6 +7555,7 @@
@@ -7443,6 +7542,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -446,7 +430,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
gBrowser.syncThrobberAnimations(this.mTab);
@@ -8411,7 +8524,7 @@ var TabContextMenu = {
@@ -8411,7 +8511,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !multiselectionContext;
@@ -455,7 +439,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
@@ -8444,7 +8557,7 @@ var TabContextMenu = {
@@ -8444,7 +8544,7 @@ var TabContextMenu = {
let contextMoveTabToStart = document.getElementById("context_moveToStart");
let isFirstTab =
tabsToMove[0] == visibleTabs[0] ||
@@ -464,7 +448,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8dc6feb3d5d584214af4c351ae4c40b6
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
@@ -8677,6 +8790,7 @@ var TabContextMenu = {
@@ -8677,6 +8777,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {

4
surfer.json
View File

@@ -19,7 +19,7 @@
"brandShortName": "Zen",
"brandFullName": "Zen Browser",
"release": {
"displayVersion": "1.8.1b",
"displayVersion": "1.8.2b",
"github": {
"repo": "zen-browser/desktop"
},
@@ -39,7 +39,7 @@
"brandShortName": "Twilight",
"brandFullName": "Zen Twilight",
"release": {
"displayVersion": "1.8.1t",
"displayVersion": "1.8.2t",
"github": {
"repo": "zen-browser/desktop"
}