mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-10-17 15:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixed double toolbar issue on twilight, b=no-bug, c=common, tabs, folders, tests

Browse Source
This commit is contained in:
Mr. M
2025-09-12 13:44:03 +02:00
parent dc78a44e9c
commit e9b4443a9e
6 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index 3204f253c23551650991d3385dd256d55892a012..78727727a0c623e0213177700124869b2163b89c 100644
index 3204f253c23551650991d3385dd256d55892a012..0285b0bcf1e5ba769011c82729e010eedf8dcc29 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -427,15 +427,64 @@
@@ -804,7 +804,15 @@ index 3204f253c23551650991d3385dd256d55892a012..78727727a0c623e0213177700124869b
window.focus();
aEvent.preventDefault();
break;
@@ -8199,6 +8376,7 @@
@@ -7264,7 +7441,6 @@
}
case "TabGroupCollapse":
aEvent.target.tabs.forEach(tab => {
- this.removeFromMultiSelectedTabs(tab);
});
break;
case "TabGroupCreateByUser":
@@ -8199,6 +8375,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -812,7 +820,7 @@ index 3204f253c23551650991d3385dd256d55892a012..78727727a0c623e0213177700124869b
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
@@ -9200,7 +9378,7 @@ var TabContextMenu = {
@@ -9200,7 +9377,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@@ -821,7 +829,7 @@ index 3204f253c23551650991d3385dd256d55892a012..78727727a0c623e0213177700124869b
// Build Ask Chat items
TabContextMenu.GenAI.buildTabMenu(
document.getElementById("context_askChat"),
@@ -9520,6 +9698,7 @@ var TabContextMenu = {
@@ -9520,6 +9697,7 @@ var TabContextMenu = {
)
);
} else {

2
src/zen/common/styles/zen-single-components.css
View File

@@ -38,7 +38,7 @@ body > #confetti {
}
/* Bookmarks */
#PersonalToolbar:not([collapsed='true']) {
#PersonalToolbar:not([collapsed]) {
min-height: 30px;
}

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

@@ -36,7 +36,7 @@
* - Bookmarks toolbar is visible OR
* - The container is explicitly marked to hide controls (e.g., on Linux with reversed controls)
*/
&:has(#PersonalToolbar[collapsed='false']) {
&:has(#PersonalToolbar:not([collapsed])) {
%include zen-tabs/vertical-tabs-topbar.inc.css
}
&[should-hide='true'] {

2
src/zen/tabs/zen-tabs/vertical-tabs-topbar.inc.css
View File

@@ -43,7 +43,7 @@ z-index: 1;
}
@media -moz-pref('zen.view.experimental-no-window-controls') {
&:has(#PersonalToolbar[collapsed='true']) {
&:has(#PersonalToolbar[collapsed]) {
max-height: 0 !important;
overflow: hidden;
opacity: 0 !important;

2
src/zen/tabs/zen-tabs/vertical-tabs.css
View File

@@ -498,7 +498,7 @@
padding-top: 0; /* Reset top padding */
/* Ensure Personal Toolbar has no left padding when expanded */
#PersonalToolbar:not([collapsed='true']) {
#PersonalToolbar:not([collapsed]) {
padding-left: 0 !important;
}

2
src/zen/tests/folders/browser_folder_multiselected.js
View File

@@ -19,7 +19,7 @@ add_task(async function test_Folder_Multiselected_Tabs() {
await collapseEvent;
ok(tab2.multiselected, 'Tab 2 should not be multiselected');
Assert.equal(gBrowser.multiSelectedTabsCount, 2, 'There should be 2 multiselected tabs');
Assert.equal(gBrowser.multiSelectedTabsCount, 3, 'There should be 3 multiselected tabs');
for (const t of [tab1, tab2]) {
BrowserTestUtils.removeTab(t);