Skip to content

fix(progressWindow): icon do not show #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
northword wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(progressWindow): icon do not show #99

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/helpers/progressWindow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { BasicTool } from "../basic.js";
import { waitUtilAsync } from "../utils/wait.js";

/**
* Icon dict. Add your custom icons here.
Expand Down Expand Up @@ -102,7 +103,6 @@ export class ProgressWindowHelper {
line.setProgress(options.progress);
}
this.lines.push(line);
this.updateIcons();
return this;
}

Expand Down Expand Up @@ -149,7 +149,11 @@ export class ProgressWindowHelper {
if (this.closeTime && this.closeTime > 0) {
this.win.startCloseTimer(this.closeTime);
}
setTimeout(this.updateIcons.bind(this), 50);

// Update icon after window load
waitUtilAsync(() => Boolean(this.lines?.[0])).then(() => {
this.updateIcons();
});
return this;
}

Expand All @@ -169,11 +173,16 @@ export class ProgressWindowHelper {
private updateIcons() {
try {
this.lines.forEach((line) => {
const box = (line as any)._image as XUL.Box;
const icon = box.dataset.itemType;
if (icon && !box.style.backgroundImage.includes("progress_arcs")) {
box.style.backgroundImage = `url(${box.dataset.itemType})`;
}
// For each line, modify the icon after the image has loaded,
// otherwise it will be overwritten by setItemTypeAndIcon.
// https://github.com/zotero/zotero/blob/2c0bebdaf06a1eb93e654e6cc062ce7acb5b3e9c/chrome/content/zotero/xpcom/progressWindow.js#L353
waitUtilAsync(() => Boolean((line as any)._image)).then(() => {
const box = (line as any)._image as XUL.Box;
const icon = box.dataset.itemType;
if (icon && !box.style.backgroundImage.includes("progress_arcs")) {
box.style.backgroundImage = `url(${box.dataset.itemType})`;
}
});
});
} catch {
// Ignore
Expand Down