Skip to content

Commit 316ff45

Browse files
committed
feat: Remove titlebar option on context menu, b=(no-bug), c=tabs
1 parent e0ac9ba commit 316ff45

File tree

3 files changed

+47
-36
lines changed

3 files changed

+47
-36
lines changed

src/browser/app/profile/browser.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ pref('browser.toolbars.bookmarks.visibility', 'never');
1616
pref("browser.bookmarks.openInTabClosesMenu", false);
1717
pref("browser.menu.showViewImageInfo", true);
1818
pref("findbar.highlightAll", true);
19+
1920
pref("layout.word_select.eat_space_to_next_word", false);
2021

2122
// Better Windows theming

src/browser/components/tabbrowser/content/tabs-js.patch

Lines changed: 42 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
2-
index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c44f52556e 100644
2+
index 84d633471c89230b981d8a07babef4e0c76c0338..ac51c64014b805e2130ffe6698b439b5df1b6d78 100644
33
--- a/browser/components/tabbrowser/content/tabs.js
44
+++ b/browser/components/tabbrowser/content/tabs.js
55
@@ -83,7 +83,7 @@
@@ -85,16 +85,22 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
8585
if (draggedTab && dropEffect == "copy") {
8686
let duplicatedDraggedTab;
8787
let duplicatedTabs = [];
88-
@@ -1116,7 +1133,7 @@
88+
@@ -1116,10 +1133,11 @@
8989
}
9090
} else {
9191
let isPinned = draggedTab.pinned;
9292
- let numPinned = gBrowser.pinnedTabCount;
9393
+ let numPinned = gBrowser._numVisiblePinTabsWithoutCollapsed;
94+
+ let essential = draggedTab.hasAttribute("zen-essential");
9495
let tabs = this.ariaFocusableItems.slice(
95-
isPinned ? 0 : numPinned,
96-
isPinned ? numPinned : undefined
97-
@@ -1135,8 +1152,14 @@
96+
- isPinned ? 0 : numPinned,
97+
- isPinned ? numPinned : undefined
98+
+ isPinned ? (essential ? 0 : gBrowser._numZenEssentials) : numPinned,
99+
+ isPinned ? (essential ? gBrowser._numZenEssentials : numPinned) : undefined
100+
);
101+
let size = this.verticalMode ? "height" : "width";
102+
let screenAxis = this.verticalMode ? "screenY" : "screenX";
103+
@@ -1135,8 +1153,14 @@
98104
(lastMovingTabScreen + tabSize);
99105

100106
if (this.verticalMode) {
@@ -110,15 +116,15 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
110116
lastBound
111117
);
112118
} else {
113-
@@ -1337,6 +1360,7 @@
119+
@@ -1337,6 +1361,7 @@
114120

115121
let nextItem = this.ariaFocusableItems[newIndex];
116122
let tabGroup = isTab(nextItem) && nextItem.group;
117123
+ if (gZenViewSplitter.handleTabDrop(event, urls, replace, inBackground)) return;
118124
gBrowser.loadTabs(urls, {
119125
inBackground,
120126
replace,
121-
@@ -1369,6 +1393,17 @@
127+
@@ -1369,6 +1394,17 @@
122128

123129
this.finishMoveTogetherSelectedTabs(draggedTab);
124130
this.finishAnimateTabMove();
@@ -136,7 +142,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
136142
this.#expandGroupOnDrop(draggedTab);
137143

138144
if (
139-
@@ -1597,7 +1632,7 @@
145+
@@ -1597,7 +1633,7 @@
140146
}
141147

142148
get newTabButton() {
@@ -145,7 +151,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
145151
}
146152

147153
get verticalMode() {
148-
@@ -1621,29 +1656,54 @@
154+
@@ -1621,29 +1657,54 @@
149155
if (this.#allTabs) {
150156
return this.#allTabs;
151157
}
@@ -208,7 +214,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
208214
}
209215

210216
/**
211-
@@ -1698,23 +1758,18 @@
217+
@@ -1698,23 +1759,18 @@
212218
}
213219

214220
let elementIndex = 0;
@@ -236,7 +242,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
236242
let visibleTabsInGroup = child.tabs.filter(tab => tab.visible);
237243
visibleTabsInGroup.forEach(tab => {
238244
tab.elementIndex = elementIndex++;
239-
@@ -1724,10 +1779,7 @@
245+
@@ -1724,10 +1780,7 @@
240246
}
241247
}
242248

@@ -248,15 +254,15 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
248254

249255
return this.#focusableItems;
250256
}
251-
@@ -1735,6 +1787,7 @@
257+
@@ -1735,6 +1788,7 @@
252258
_invalidateCachedTabs() {
253259
this.#allTabs = null;
254260
this._invalidateCachedVisibleTabs();
255261
+ gZenWorkspaces._allStoredTabs = null;
256262
}
257263

258264
_invalidateCachedVisibleTabs() {
259-
@@ -1749,8 +1802,8 @@
265+
@@ -1749,8 +1803,8 @@
260266
#isContainerVerticalPinnedGrid(tab) {
261267
return (
262268
this.verticalMode &&
@@ -267,7 +273,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
267273
!this.expandOnHover
268274
);
269275
}
270-
@@ -1766,7 +1819,7 @@
276+
@@ -1766,7 +1820,7 @@
271277

272278
if (node == null) {
273279
// We have a container for non-tab elements at the end of the scrollbox.
@@ -276,7 +282,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
276282
}
277283

278284
node.before(tab);
279-
@@ -1861,7 +1914,7 @@
285+
@@ -1861,7 +1915,7 @@
280286
// There are separate "new tab" buttons for horizontal tabs toolbar, vertical tabs and
281287
// for when the tab strip is overflowed (which is shared by vertical and horizontal tabs);
282288
// Attach the long click popup to all of them.
@@ -285,7 +291,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
285291
const newTab2 = this.newTabButton;
286292
const newTabVertical = document.getElementById(
287293
"vertical-tabs-newtab-button"
288-
@@ -1956,10 +2009,12 @@
294+
@@ -1956,10 +2010,12 @@
289295

290296
_handleTabSelect(aInstant) {
291297
let selectedTab = this.selectedItem;
@@ -298,15 +304,15 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
298304
selectedTab._notselectedsinceload = false;
299305
}
300306

301-
@@ -2132,6 +2187,7 @@
307+
@@ -2132,6 +2188,7 @@
302308
}
303309

304310
_positionPinnedTabs() {
305311
+ if (true) return;
306312
let tabs = this.visibleTabs;
307313
let numPinned = gBrowser.pinnedTabCount;
308314
let absPositionHorizontalTabs =
309-
@@ -2206,7 +2262,7 @@
315+
@@ -2206,7 +2263,7 @@
310316
return;
311317
}
312318

@@ -315,7 +321,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
315321

316322
let directionX = screenX > dragData.animLastScreenX;
317323
let directionY = screenY > dragData.animLastScreenY;
318-
@@ -2215,6 +2271,8 @@
324+
@@ -2215,6 +2272,8 @@
319325

320326
let { width: tabWidth, height: tabHeight } =
321327
draggedTab.getBoundingClientRect();
@@ -324,7 +330,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
324330
let shiftSizeX = tabWidth * movingTabs.length;
325331
let shiftSizeY = tabHeight;
326332
dragData.tabWidth = tabWidth;
327-
@@ -2244,7 +2302,7 @@
333+
@@ -2244,7 +2303,7 @@
328334
let translateX = screenX - dragData.screenX;
329335
let translateY = screenY - dragData.screenY;
330336
translateY +=
@@ -333,7 +339,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
333339
let firstBoundX = firstTabInRow.screenX - firstMovingTabScreenX;
334340
let firstBoundY = firstTabInRow.screenY - firstMovingTabScreenY;
335341
let lastBoundX =
336-
@@ -2389,12 +2447,16 @@
342+
@@ -2389,12 +2448,16 @@
337343

338344
this.#clearDragOverCreateGroupTimer();
339345

@@ -354,7 +360,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
354360

355361
if (this.#rtlMode) {
356362
tabs.reverse();
357-
@@ -2408,7 +2470,7 @@
363+
@@ -2408,7 +2471,7 @@
358364
let size = this.verticalMode ? "height" : "width";
359365
let translateAxis = this.verticalMode ? "translateY" : "translateX";
360366
let scrollDirection = this.verticalMode ? "scrollTop" : "scrollLeft";
@@ -363,7 +369,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
363369
let translateX = event.screenX - dragData.screenX;
364370
let translateY = event.screenY - dragData.screenY;
365371

366-
@@ -2422,12 +2484,21 @@
372+
@@ -2422,12 +2485,21 @@
367373
let lastTab = tabs.at(-1);
368374
let lastMovingTab = movingTabs.at(-1);
369375
let firstMovingTab = movingTabs[0];
@@ -386,7 +392,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
386392
translate +=
387393
this.arrowScrollbox.scrollbox[scrollDirection] - dragData.scrollPos;
388394
} else if (isPinned && this.verticalMode) {
389-
@@ -2446,6 +2517,9 @@
395+
@@ -2446,6 +2518,9 @@
390396
// Shift the `.tab-group-label-container` to shift the label element.
391397
item = item.parentElement;
392398
}
@@ -396,7 +402,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
396402
item.style.transform = `${translateAxis}(${translate}px)`;
397403
}
398404

399-
@@ -2583,6 +2657,9 @@
405+
@@ -2583,6 +2658,9 @@
400406
break;
401407
}
402408
let element = tabs[mid];
@@ -406,7 +412,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
406412
let elementForSize = isTabGroupLabel(element)
407413
? element.parentElement
408414
: element;
409-
@@ -2605,6 +2682,10 @@
415+
@@ -2605,6 +2683,10 @@
410416
if (!dropElement) {
411417
dropElement = this.ariaFocusableItems[oldDropElementIndex];
412418
}
@@ -417,7 +423,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
417423
let newDropElementIndex = dropElement
418424
? dropElement.elementIndex
419425
: oldDropElementIndex;
420-
@@ -2613,7 +2694,7 @@
426+
@@ -2613,7 +2695,7 @@
421427
let shouldCreateGroupOnDrop;
422428
let dropBefore;
423429
if (dropElement) {
@@ -426,7 +432,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
426432
? dropElement.parentElement
427433
: dropElement;
428434

429-
@@ -2675,12 +2756,12 @@
435+
@@ -2675,12 +2757,12 @@
430436
}
431437
}
432438

@@ -441,7 +447,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
441447
dropElement != draggedTab &&
442448
isTab(dropElement) &&
443449
!dropElement?.group &&
444-
@@ -2720,7 +2801,7 @@
450+
@@ -2720,7 +2802,7 @@
445451
// Dropping right before the tab group.
446452
dropElement = dropElementGroup;
447453
colorCode = undefined;
@@ -450,7 +456,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
450456
// Dropping right after the collapsed tab group.
451457
dropElement = dropElementGroup;
452458
colorCode = undefined;
453-
@@ -2750,7 +2831,7 @@
459+
@@ -2750,7 +2832,7 @@
454460
// Shift background tabs to leave a gap where the dragged tab
455461
// would currently be dropped.
456462
for (let item of tabs) {
@@ -459,7 +465,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
459465
continue;
460466
}
461467

462-
@@ -2759,6 +2840,9 @@
468+
@@ -2759,6 +2841,9 @@
463469
if (isTabGroupLabel(item)) {
464470
// Shift the `.tab-group-label-container` to shift the label element.
465471
item = item.parentElement;
@@ -469,7 +475,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
469475
}
470476
item.style.transform = transform;
471477
}
472-
@@ -2811,8 +2895,9 @@
478+
@@ -2811,8 +2896,9 @@
473479
);
474480
}
475481

@@ -481,7 +487,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
481487
return;
482488
}
483489

484-
@@ -2824,6 +2909,12 @@
490+
@@ -2824,6 +2910,12 @@
485491
item = item.parentElement;
486492
}
487493
item.style.transform = "";
@@ -494,7 +500,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
494500
item.removeAttribute("dragover-createGroup");
495501
}
496502
this.removeAttribute("movingtab-createGroup");
497-
@@ -2870,7 +2961,7 @@
503+
@@ -2870,7 +2962,7 @@
498504
let postTransitionCleanup = () => {
499505
movingTab._moveTogetherSelectedTabsData.animate = false;
500506
};
@@ -503,7 +509,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
503509
postTransitionCleanup();
504510
} else {
505511
let onTransitionEnd = transitionendEvent => {
506-
@@ -3043,7 +3134,7 @@
512+
@@ -3043,7 +3135,7 @@
507513
}
508514

509515
_notifyBackgroundTab(aTab) {
@@ -512,7 +518,7 @@ index 84d633471c89230b981d8a07babef4e0c76c0338..7cef57d99eca61f49968a128378d71c4
512518
return;
513519
}
514520

515-
@@ -3169,6 +3260,9 @@
521+
@@ -3169,6 +3261,9 @@
516522
return null;
517523
}
518524
}

src/browser/themes/shared/zen-icons/icons.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,10 @@
303303
list-style-image: url('home.svg') !important;
304304
}
305305

306+
#toggle_toolbar-menubar {
307+
display: none;
308+
}
309+
306310
#library-button {
307311
list-style-image: url('library.svg') !important;
308312
}

0 commit comments

Comments
 (0)