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

feat: implement single toolbar functionality in Zen UI manager; enhance customizable UI integration and manage button attributes

Browse Source
This commit is contained in:
mr. M
2024-11-21 22:43:24 +01:00
parent 0fba5dc75c
commit 86c4ce6d9f
2 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/browser/base/content/ZenUIManager.mjs
View File

@@ -117,6 +117,21 @@ var gZenUIManager = {
var gZenVerticalTabsManager = {
init() {
const lazy = {};
ChromeUtils.defineESModuleGetters(lazy, {
AddonManager: "resource://gre/modules/AddonManager.sys.mjs",
AddonManagerPrivate: "resource://gre/modules/AddonManager.sys.mjs",
BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs",
CustomizableWidgets: "resource:///modules/CustomizableWidgets.sys.mjs",
ZenCustomizableUI: "chrome://browser/content/ZenCustomizableUI.sys.mjs",
HomePage: "resource:///modules/HomePage.sys.mjs",
PanelMultiView: "resource:///modules/PanelMultiView.sys.mjs",
PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
ShortcutUtils: "resource://gre/modules/ShortcutUtils.sys.mjs",
});
var updateEvent = this._updateEvent.bind(this);
Services.prefs.addObserver('zen.tabs.vertical.right-side', updateEvent);
Services.prefs.addObserver('zen.view.sidebar-expanded.max-width', updateEvent);
@@ -207,6 +222,7 @@ var gZenVerticalTabsManager = {
if (Services.prefs.getBoolPref('zen.view.use-single-toolbar')) {
const navBar = document.getElementById('nav-bar');
this._navbarParent = navBar.parentElement;
let elements = document.querySelectorAll('#nav-bar-customization-target > *:is(toolbarbutton, #stop-reload-button)');
elements = Array.from(elements);
// Add separator if it doesn't exist
@@ -214,6 +230,7 @@ var gZenVerticalTabsManager = {
buttonsTarget.append(this._topButtonsSeparatorElement);
}
for (const button of elements) {
button.setAttribute('zen-single-toolbar', 'true');
buttonsTarget.append(button);
}
buttonsTarget.prepend(document.getElementById('unified-extensions-button'));
@@ -234,6 +251,33 @@ var gZenVerticalTabsManager = {
titlebar.before(topButtons);
titlebar.before(navBar);
}
document.documentElement.setAttribute("zen-has-set-single-toolbar", true);
} else if (document.documentElement.hasAttribute("zen-has-set-single-toolbar")) {
// Do the opposite
const navBar = document.getElementById('nav-bar');
this._navbarParent.prepend(navBar);
const elements = document.querySelectorAll('#zen-sidebar-top-buttons-customization-target > *:is(toolbarbutton, #stop-reload-button)');
for (const button of elements) {
if (button.hasAttribute('zen-single-toolbar')) {
button.removeAttribute('zen-single-toolbar');
document.getElementById('nav-bar-customization-target').append(button);
}
}
document.documentElement.removeAttribute("zen-single-toolbar");
document.documentElement.removeAttribute("zen-has-set-single-toolbar");
navBar.appendChild(document.getElementById('PanelUI-button'));
if (this.isWindowsStyledButtons) {
const windowButtons = document.querySelector('#zen-appcontent-navbar-container > .titlebar-buttonbox-container');
if (windowButtons) {
document.getElementById('nav-bar').append(windowButtons);
}
} else {
const windowButtons = document.querySelector('#zen-appcontent-navbar-container > .titlebar-buttonbox-container');
if (windowButtons) {
document.getElementById('nav-bar').prepend(windowButtons);
}
}
CustomizableUI.zenInternalCU._rebuildRegisteredAreas();
}
// Always move the splitter next to the sidebar

10
src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
index 989e69245aeb1185125752db6b9c58e462d554e4..7f03aa20386ace32a340131a84c484865883905f 100644
index 989e69245aeb1185125752db6b9c58e462d554e4..3eef114cc711505c647e21e35a063fb7bc9a0477 100644
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -86,3 +86,11 @@ index 989e69245aeb1185125752db6b9c58e462d554e4..7f03aa20386ace32a340131a84c48486
if (defaultCollapsed !== null) {
win.setToolbarVisibility(
areaNode,
@@ -4558,6 +4565,7 @@ export var CustomizableUI = {
unregisterArea(aName, aDestroyPlacements) {
CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
},
+ get zenInternalCU() { return CustomizableUIInternal; },
/**
* Add a widget to an area.
* If the area to which you try to add is not known to CustomizableUI,