Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-19 17:43:50 +00:00
Code Issues Projects Releases Wiki Activity

Initialize after initial render

Browse source
This commit is contained in:
Jordan Eldredge 2021-06-26 20:36:02 -07:00
parent c80abfe320
commit 7bd2eef644
2 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packages/webamp-modern-2/src/index.ts
View file

@ -20,10 +20,6 @@ async function main() {
await parser.parse();
for (const container of parser._containers) {
container.init({ containers: parser._containers });
}
let node = document.createElement("div");
for (const container of parser._containers) {
@ -33,6 +29,11 @@ async function main() {
document.body.appendChild(node);
console.log("RENDER");
for (const container of parser._containers) {
container.init({ containers: parser._containers });
}
console.log("INIT");
}
main();

38
packages/webamp-modern-2/src/skin/GuiObj.ts
View file

@ -12,7 +12,6 @@ export default class GuiObj extends XmlObj {
_y: number = 0;
_droptarget: string;
_visible: boolean = true;
_dirty: boolean = false;
_alpha: number = 255;
_ghost: boolean = false;
_tooltip: string = "";
@ -74,7 +73,7 @@ export default class GuiObj extends XmlObj {
*/
show() {
this._visible = true;
this._dirty = true;
this._renderVisibility();
}
/**
@ -82,7 +81,7 @@ export default class GuiObj extends XmlObj {
*/
hide() {
this._visible = false;
this._dirty = true;
this._renderVisibility();
}
/**
@ -113,7 +112,7 @@ export default class GuiObj extends XmlObj {
getheight() {
assert(this._height != null, "Expected GUIObj to have a height.");
// FIXME
return this._height || 100;
return this._height;
}
/**
@ -139,7 +138,7 @@ export default class GuiObj extends XmlObj {
this._y = y;
this._width = w;
this._height = h;
this._dirty = true;
this._renderDimensions();
}
/**
@ -213,18 +212,10 @@ export default class GuiObj extends XmlObj {
_renderAlpha() {
this._div.style.opacity = `${this._alpha / 255}`;
}
draw() {
this._div.setAttribute("data-id", this.getId());
_renderVisibility() {
this._div.style.display = this._visible ? "inline-block" : "none";
this._div.style.position = "absolute";
this._renderAlpha();
if (this._tooltip) {
this._div.setAttribute("title", this._tooltip);
}
if (this._ghost) {
this._div.style.pointerEvents = "none";
}
}
_renderDimensions() {
if (this._x) {
this._div.style.left = px(this._x);
}
@ -237,6 +228,21 @@ export default class GuiObj extends XmlObj {
if (this._height) {
this._div.style.height = px(this.getheight());
}
}
draw() {
this._div.setAttribute("data-id", this.getId());
this._renderVisibility();
this._div.style.position = "absolute";
this._renderAlpha();
if (this._tooltip) {
this._div.setAttribute("title", this._tooltip);
}
if (this._ghost) {
this._div.style.pointerEvents = "none";
}
this._renderDimensions();
this._div.addEventListener("mouseup", (e) => {
this.onLeftButtonUp(e.clientX, e.clientX);
});