ZenBrowserMirrors/components
1
0
Fork 0
mirror of https://github.com/zen-browser/components.git synced 2025-07-07 21:29:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor ZenGradientGenerator class to use constructor instead of init method

Browse source
This commit is contained in:
mr. M 2024-10-26 22:19:50 +02:00
parent 9e7b399089
commit 89d29e664d
No known key found for this signature in database
GPG key ID: CBD57A2AEDBDA1FB
2 changed files with 31 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/ZenGradientGenerator.mjs
View file

@ -10,7 +10,8 @@
numberOfDots = 0;
init() {
constructor() {
super();
if (!Services.prefs.getBoolPref('zen.theme.gradient', true) || !ZenWorkspaces.shouldHaveWorkspaces) {
return;
}
@ -25,6 +26,8 @@
ZenWorkspaces.addChangeListeners(this.onWorkspaceChange.bind(this));
window.matchMedia('(prefers-color-scheme: dark)').addListener(this.onDarkModeChange.bind(this));
this._hasInitialized = true;
this.onDarkModeChange(null, true);
}
get isDarkMode() {
@ -364,14 +367,20 @@
async onWorkspaceChange(workspace, skipUpdate = false, theme = null) {
const uuid = workspace.uuid;
// Use theme from workspace object or passed theme
const workspaceTheme = theme || workspace.theme;
let workspaceTheme = theme || workspace.theme;
await this.foreachWindowAsActive(async (browser) => {
// Do not rebuild if the workspace is not the same as the current one
const windowWorkspace = await browser.ZenWorkspaces.getActiveWorkspace();
if (windowWorkspace.uuid !== uuid) {
if (!browser.gZenThemePicker._hasInitialized) {
return;
}
// Do not rebuild if the workspace is not the same as the current one
const windowWorkspace = await browser.ZenWorkspaces.getActiveWorkspace();
if (windowWorkspace.uuid !== uuid && theme !== null) {
return;
}
// get the theme from the window
workspaceTheme = theme || windowWorkspace.theme;
const appWrapper = browser.document.getElementById('zen-main-app-wrapper');
if (!skipUpdate) {
@ -383,11 +392,11 @@
browser.window.requestAnimationFrame(() => {
setTimeout(() => {
appWrapper.removeAttribute('animating');
}, 600);
}, 500);
});
}
browser.gZenThemePicker.customColorList.innerHTML = '';
browser.gZenThemePicker.resetCustomColorList();
if (!workspaceTheme || workspaceTheme.type !== 'gradient') {
browser.document.body.style.removeProperty('--zen-main-browser-background');
browser.gZenThemePicker.updateNoise(0);
@ -425,6 +434,10 @@
});
}
resetCustomColorList() {
this.customColorList.innerHTML = '';
}
removeCustomColor(event) {
const target = event.target.closest('.zen-theme-picker-custom-list-item');
const color = target.getAttribute('data-color');
@ -480,5 +493,5 @@
}
}
window.gZenThemePicker = new ZenThemePicker();
window.ZenThemePicker = ZenThemePicker;
}

14
src/ZenWorkspaces.mjs
View file

@ -151,8 +151,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
this._initializeWorkspaceCreationIcons();
this._initializeWorkspaceTabContextMenus();
window.addEventListener('TabBrowserInserted', this.onTabBrowserInserted.bind(this));
await SessionStore.promiseInitialized;
let workspaces = await this._workspaces();
gZenThemePicker.init();
if (workspaces.workspaces.length === 0) {
await this.createAndSaveWorkspace('Default Workspace', true);
} else {
@ -165,9 +165,13 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
activeWorkspace = workspaces.workspaces[0];
this.activeWorkspace = activeWorkspace.uuid;
}
await SessionStore.promiseInitialized;
await this.changeWorkspace(activeWorkspace, true);
}
try {
window.gZenThemePicker = new ZenThemePicker();
} catch (e) {
console.error('ZenWorkspaces: Error initializing theme picker', e);
}
}
}
@ -915,12 +919,12 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
document.getElementById('tabbrowser-tabs')._positionPinnedTabs();
await this._propagateWorkspaceData({clearCache: false});
this._inChangingWorkspace = false;
await this._propagateWorkspaceData({clearCache: onInit});
for (let listener of this._changeListeners ?? []) {
listener(window);
}
this._inChangingWorkspace = false;
}
async _updateWorkspacesChangeContextMenu() {