Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-01-23 18:25:30 +00:00
Code Issues Projects Releases Wiki Activity

Use image size in GuiObject.getwidth/getheight (#949)

Browse source
This commit is contained in:
jberg 2019-11-02 14:07:14 -07:00 • committed by Jordan Eldredge
parent a1139ec371
commit 2f89be1e18
3 changed files with 74 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modern/src/initialize.js
View file

@ -42,26 +42,6 @@ async function prepareMakiImage(node, zip, file) {
};
}
function imageAttributesFromNode(node) {
if (!node.name) return [];
switch (node.name.toLowerCase()) {
case "layer":
case "animatedlayer": {
return ["image"];
}
case "layout": {
return ["background"];
}
case "button":
case "togglebutton": {
return ["image", "downImage"];
}
default: {
return [];
}
}
}
const noop = (node, parent) => new GuiObject(node, parent);
const parsers = {
@ -184,7 +164,7 @@ async function parseChildren(node, children, zip) {
}
async function nodeImageLookup(node, root, zip) {
const imageAttributes = imageAttributesFromNode(node);
const imageAttributes = Utils.imageAttributesFromNode(node);
if (!imageAttributes || imageAttributes.length === 0) {
return;
}

53
modern/src/runtime/GuiObject.ts
View file

@ -2,6 +2,7 @@ import MakiObject from "./MakiObject";
import {
findDescendantByTypeAndId,
findParentNodeOfType,
baseImageAttributeFromObject,
unimplementedWarning,
} from "../utils";
import { ModernStore, XmlNode } from "../types";
@ -140,29 +141,41 @@ class GuiObject extends MakiObject {
}
getheight(): number {
// TODO
// I don't know how it gets calculated exactly, but if a node has a minimum
// and maximum h, but no h, getwidth still returns a value, return min for now
// TODO: Need to return actual current width which can be based on underlying image
// CornerAmp has a calls like: obj.resize(newX, newY, obj.getwidth(), obj.getheight()),
// but the object has no width/height set, so it needs to return the width/height
// that potentially uses the image size like we do in the renderer.
// This is made more complicated because images depend on the current state and are
// potentially different attributes for different MakiObjects
return Number(this.attributes.h) || Number(this.attributes.minimum_h) || 0;
if (this.attributes.h !== undefined) {
return Number(this.attributes.h);
} else {
const baseImage = baseImageAttributeFromObject(this);
if (baseImage) {
// TODO: fix the type on this, we currently have better typing for this in
// AnimatedLayer where we convert to _typedAttributes, as we apply that new
// standard up to GuiObject/MakiObject we should be able to remove the ignore
// @ts-ignore
const image = this.attributes.js_assets[baseImage];
if (image && image.h !== undefined) {
return image.h;
}
}
}
return 0;
}
getwidth(): number {
// TODO
// I don't know how it gets calculated exactly, but if a node has a minimum
// and maximum w, but no w, getwidth still returns a value, return min for now
// TODO: Need to return actual current width which can be based on underlying image
// CornerAmp has a calls like: obj.resize(newX, newY, obj.getwidth(), obj.getheight()),
// but the object has no width/height set, so it needs to return the width/height
// that potentially uses the image size like we do in the renderer.
// This is made more complicated because images depend on the current state and are
// potentially different attributes for different MakiObjects
return Number(this.attributes.w) || Number(this.attributes.minimum_w) || 0;
if (this.attributes.w !== undefined) {
return Number(this.attributes.w);
} else {
const baseImage = baseImageAttributeFromObject(this);
if (baseImage) {
// TODO: fix the type on this, we currently have better typing for this in
// AnimatedLayer where we convert to _typedAttributes, as we apply that new
// standard up to GuiObject/MakiObject we should be able to remove the ignore
// @ts-ignore
const image = this.attributes.js_assets[baseImage];
if (image && image.w !== undefined) {
return image.w;
}
}
}
return 0;
}
resize(x: number, y: number, w: number, h: number): void {

40
modern/src/utils.ts
View file

@ -2,6 +2,7 @@ import JSZip from "jszip";
import { xml2js } from "xml-js";
import { XmlNode } from "./types";
import MakiObject from "./runtime/MakiObject";
import GuiObject from "./runtime/GuiObject";
let nextId = 0;
export function getId(): number {
@ -415,3 +416,42 @@ if (typeof document !== "undefined") {
export function getMousePosition() {
return mousePosition;
}
export function imageAttributesFromNode(node: XmlNode): Array<string> {
if (!node.name) return [];
switch (node.name.toLowerCase()) {
case "layer":
case "animatedlayer": {
return ["image"];
}
case "layout": {
return ["background"];
}
case "button":
case "togglebutton": {
return ["image", "downImage"];
}
default: {
return [];
}
}
}
export function baseImageAttributeFromObject(obj: GuiObject): string | null {
switch (obj.getclassname()) {
case "Layer":
case "AnimatedLayer": {
return "image";
}
case "Layout": {
return "background";
}
case "Button":
case "ToggleButton": {
return "image";
}
default: {
return null;
}
}
}