refactor: streamline preference handling and update event management in ZenUIManager

This commit is contained in:
mr. M
2024-12-03 20:28:41 +01:00
parent 139ab630e0
commit 97c18ef67c
5 changed files with 75 additions and 30 deletions

View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
index 989e69245aeb1185125752db6b9c58e462d554e4..3eef114cc711505c647e21e35a063fb7bc9a0477 100644
index 45d0e0e4872eeabf87862dbadfee1dc211ed7bed..5a0825ff92c115bf30046a01cff17f189005d5ef 100644
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
@@ -19,7 +19,7 @@ index 989e69245aeb1185125752db6b9c58e462d554e4..3eef114cc711505c647e21e35a063fb7
const kSpecialWidgetPfx = "customizableui-special-";
@@ -323,13 +324,14 @@ var CustomizableUIInternal = {
@@ -307,13 +308,14 @@ var CustomizableUIInternal = {
"spring",
"urlbar-container",
"spring",
@@ -37,7 +37,7 @@ index 989e69245aeb1185125752db6b9c58e462d554e4..3eef114cc711505c647e21e35a063fb7
this.registerArea(
CustomizableUI.AREA_NAVBAR,
{
@@ -338,7 +340,7 @@ var CustomizableUIInternal = {
@@ -322,7 +324,7 @@ var CustomizableUIInternal = {
defaultPlacements: navbarPlacements,
verticalTabsDefaultPlacements: [
"firefox-view-button",
@@ -46,7 +46,7 @@ index 989e69245aeb1185125752db6b9c58e462d554e4..3eef114cc711505c647e21e35a063fb7
"alltabs-button",
],
defaultCollapsed: false,
@@ -363,10 +365,10 @@ var CustomizableUIInternal = {
@@ -347,10 +349,10 @@ var CustomizableUIInternal = {
{
type: CustomizableUI.TYPE_TOOLBAR,
defaultPlacements: [
@@ -60,7 +60,7 @@ index 989e69245aeb1185125752db6b9c58e462d554e4..3eef114cc711505c647e21e35a063fb7
],
verticalTabsDefaultPlacements: [],
defaultCollapsed: null,
@@ -429,6 +431,7 @@ var CustomizableUIInternal = {
@@ -413,6 +415,7 @@ var CustomizableUIInternal = {
CustomizableUI.AREA_NAVBAR,
CustomizableUI.AREA_BOOKMARKS,
CustomizableUI.AREA_TABSTRIP,
@@ -68,7 +68,7 @@ index 989e69245aeb1185125752db6b9c58e462d554e4..3eef114cc711505c647e21e35a063fb7
]);
if (AppConstants.platform != "macosx") {
toolbars.add(CustomizableUI.AREA_MENUBAR);
@@ -1144,6 +1147,9 @@ var CustomizableUIInternal = {
@@ -1128,6 +1131,9 @@ var CustomizableUIInternal = {
placements = gPlacements.get(area);
}
@@ -78,15 +78,7 @@ index 989e69245aeb1185125752db6b9c58e462d554e4..3eef114cc711505c647e21e35a063fb7
// For toolbars that need it, mark as dirty.
let defaultPlacements = areaProperties.get("defaultPlacements");
if (
@@ -3603,6 +3609,7 @@ var CustomizableUIInternal = {
if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
let defaultCollapsed = area.get("defaultCollapsed");
let win = areaNode.ownerGlobal;
+ win.gZenVerticalTabsManager._updateEvent();
if (defaultCollapsed !== null) {
win.setToolbarVisibility(
areaNode,
@@ -4558,6 +4565,7 @@ export var CustomizableUI = {
@@ -4572,6 +4578,7 @@ export var CustomizableUI = {
unregisterArea(aName, aDestroyPlacements) {
CustomizableUIInternal.unregisterArea(aName, aDestroyPlacements);
},