ZenBrowserMirrors/zen-desktop
1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-10 05:35:29 +02:00
Code Releases Wiki Activity

Merge branch 'dev' into firefox-139

Browse source
This commit is contained in:
mr. m 2025-05-22 12:10:30 +02:00 • committed by GitHub
commit 22d4b22c53
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 106 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/browser/components/tabbrowser/content/tabs-js.patch
View file

@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bffdf463489 100644
index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..b413b4bc9d86726b0f8936a3422636ed3ca882e1 100644
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
@@ -83,7 +83,7 @@
@ -136,7 +136,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
}
get verticalMode() {
@@ -1606,29 +1636,53 @@
@@ -1606,29 +1636,55 @@
if (this.#allTabs) {
return this.#allTabs;
}
@ -173,19 +173,21 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
...children,
];
+ const lastPinnedTabIdx = pinnedTabs.length - 1;
+ for (let i = 0; i < allTabs.length; i++) {
+ let i = 0;
+ for (const tab of allTabs) {
+ // add glance tabs (tabs inside tabs) to the list
+ const glanceTab = allTabs[i].glanceTab;
+ const glanceTab = tab.glanceTab;
+ if (glanceTab) {
+ // insert right after the parent tab. note: it must be inserted before
+ // the last pinned tab so it can be inserted in the correct order
+ allTabs.splice(Math.max(i + 1, lastPinnedTabIdx), 0, glanceTab);
+ i++;
+ } else if (allTabs[i].classList.contains("vertical-pinned-tabs-container-separator")) {
+ } else if (tab.classList.contains("vertical-pinned-tabs-container-separator")) {
+ // remove the separator from the list
+ allTabs.splice(i, 1);
+ i--;
+ }
+ i++;
+ }
+ this.#allTabs = allTabs;
return this.#allTabs;
@ -198,7 +200,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
}
/**
@@ -1648,7 +1702,7 @@
@@ -1648,7 +1704,7 @@
*/
get visibleTabs() {
if (!this.#visibleTabs) {
@ -207,7 +209,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
}
return this.#visibleTabs;
}
@@ -1683,36 +1737,40 @@
@@ -1683,36 +1739,40 @@
}
let elementIndex = 0;
@ -261,7 +263,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
return this.#focusableItems;
}
@@ -1720,6 +1778,7 @@
@@ -1720,6 +1780,7 @@
_invalidateCachedTabs() {
this.#allTabs = null;
this._invalidateCachedVisibleTabs();
@ -269,7 +271,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
}
_invalidateCachedVisibleTabs() {
@@ -1734,8 +1793,8 @@
@@ -1734,8 +1795,8 @@
#isContainerVerticalPinnedGrid(tab) {
return (
this.verticalMode &&
@ -280,7 +282,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
!this.expandOnHover
);
}
@@ -1751,7 +1810,7 @@
@@ -1751,7 +1812,7 @@
if (node == null) {
// We have a container for non-tab elements at the end of the scrollbox.
@ -289,7 +291,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
}
node.before(tab);
@@ -1846,7 +1905,7 @@
@@ -1846,7 +1907,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.
@ -298,7 +300,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
const newTab2 = this.newTabButton;
const newTabVertical = document.getElementById(
"vertical-tabs-newtab-button"
@@ -1941,10 +2000,12 @@
@@ -1941,10 +2002,12 @@
_handleTabSelect(aInstant) {
let selectedTab = this.selectedItem;
@ -311,7 +313,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
selectedTab._notselectedsinceload = false;
}
@@ -2085,16 +2146,15 @@
@@ -2085,16 +2148,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 +336,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
}
}
@@ -2102,9 +2162,7 @@
@@ -2102,9 +2164,7 @@
}
_resetVerticalPinnedTabs() {
@ -345,7 +347,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
if (!verticalTabsContainer.children.length) {
return;
@@ -2117,7 +2175,7 @@
@@ -2117,7 +2177,7 @@
}
_positionPinnedTabs() {
@ -354,7 +356,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
let numPinned = gBrowser.pinnedTabCount;
let absPositionHorizontalTabs =
this.overflowing && tabs.length > numPinned && numPinned > 0;
@@ -2127,7 +2185,7 @@
@@ -2127,7 +2187,7 @@
if (this.verticalMode) {
this._updateVerticalPinnedTabs();
@ -363,7 +365,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
let layoutData = this._pinnedTabsLayoutCache;
let uiDensity = document.documentElement.getAttribute("uidensity");
if (!layoutData || layoutData.uiDensity != uiDensity) {
@@ -2191,7 +2249,7 @@
@@ -2191,7 +2251,7 @@
return;
}
@ -372,7 +374,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
let directionX = screenX > dragData.animLastScreenX;
let directionY = screenY > dragData.animLastScreenY;
@@ -2199,7 +2257,7 @@
@@ -2199,7 +2259,7 @@
dragData.animLastScreenX = screenX;
let { width: tabWidth, height: tabHeight } =
@ -381,7 +383,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
let shiftSizeX = tabWidth * movingTabs.length;
let shiftSizeY = tabHeight;
dragData.tabWidth = tabWidth;
@@ -2262,7 +2320,7 @@
@@ -2262,7 +2322,7 @@
// * We're doing a binary search in order to reduce the amount of
// tabs we need to check.
@ -390,7 +392,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
let firstTabCenterX = firstMovingTabScreenX + translateX + tabWidth / 2;
let lastTabCenterX = lastMovingTabScreenX + translateX + tabWidth / 2;
let tabCenterX = directionX ? lastTabCenterX : firstTabCenterX;
@@ -2374,12 +2432,16 @@
@@ -2374,12 +2434,16 @@
this.#clearDragOverCreateGroupTimer();
@ -412,7 +414,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
if (this.#rtlMode) {
tabs.reverse();
@@ -2393,7 +2455,7 @@
@@ -2393,7 +2457,7 @@
let size = this.verticalMode ? "height" : "width";
let translateAxis = this.verticalMode ? "translateY" : "translateX";
let scrollDirection = this.verticalMode ? "scrollTop" : "scrollLeft";
@ -421,7 +423,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
let translateX = event.screenX - dragData.screenX;
let translateY = event.screenY - dragData.screenY;
@@ -2407,12 +2469,21 @@
@@ -2407,12 +2471,21 @@
let lastTab = tabs.at(-1);
let lastMovingTab = movingTabs.at(-1);
let firstMovingTab = movingTabs[0];
@ -444,7 +446,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
translate +=
this.arrowScrollbox.scrollbox[scrollDirection] - dragData.scrollPos;
} else if (isPinned && this.verticalMode) {
@@ -2431,12 +2502,15 @@
@@ -2431,12 +2504,15 @@
// Shift the `.tab-group-label-container` to shift the label element.
item = item.parentElement;
}
@ -461,7 +463,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
/**
* When the `draggedTab` is just starting to move, the `draggedTab` is in
@@ -2568,6 +2642,9 @@
@@ -2568,6 +2644,9 @@
break;
}
let element = tabs[mid];
@ -471,7 +473,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
let elementForSize = isTabGroupLabel(element)
? element.parentElement
: element;
@@ -2588,7 +2665,11 @@
@@ -2588,7 +2667,11 @@
let dropElement = getOverlappedElement();
if (!dropElement) {
@ -484,7 +486,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
}
let newDropElementIndex = dropElement
? dropElement.elementIndex
@@ -2598,7 +2679,7 @@
@@ -2598,7 +2681,7 @@
let shouldCreateGroupOnDrop;
let dropBefore;
if (dropElement) {
@ -493,7 +495,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
? dropElement.parentElement
: dropElement;
@@ -2660,12 +2741,12 @@
@@ -2660,12 +2743,12 @@
}
}
@ -508,7 +510,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
dropElement != draggedTab &&
isTab(dropElement) &&
!dropElement?.group &&
@@ -2735,7 +2816,7 @@
@@ -2735,7 +2818,7 @@
// Shift background tabs to leave a gap where the dragged tab
// would currently be dropped.
for (let item of tabs) {
@ -517,7 +519,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
continue;
}
@@ -2744,6 +2825,9 @@
@@ -2744,6 +2827,9 @@
if (isTabGroupLabel(item)) {
// Shift the `.tab-group-label-container` to shift the label element.
item = item.parentElement;
@ -527,7 +529,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
}
item.style.transform = transform;
}
@@ -2796,8 +2880,9 @@
@@ -2796,8 +2882,9 @@
);
}
@ -539,7 +541,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
return;
}
@@ -2809,6 +2894,12 @@
@@ -2809,6 +2896,12 @@
item = item.parentElement;
}
item.style.transform = "";
@ -552,7 +554,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
item.removeAttribute("dragover-createGroup");
}
this.removeAttribute("movingtab-createGroup");
@@ -2855,7 +2946,7 @@
@@ -2855,7 +2948,7 @@
let postTransitionCleanup = () => {
movingTab._moveTogetherSelectedTabsData.animate = false;
};
@ -561,7 +563,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
postTransitionCleanup();
} else {
let onTransitionEnd = transitionendEvent => {
@@ -3028,7 +3119,7 @@
@@ -3028,7 +3121,7 @@
}
_notifyBackgroundTab(aTab) {
@ -570,7 +572,7 @@ index ef9c0389ec926e6bc01c0dc3b883beceaf1f7d43..e8d5dc64609522b440fb01990fb19bff
return;
}
@@ -3154,6 +3245,9 @@
@@ -3154,6 +3247,9 @@
return null;
}
}