Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-08-01 14:33:38 +00:00
Code Issues Projects Releases Wiki Activity

fix button image rendering and handle layout without x/y (#812)

Browse source
This commit is contained in:
jberg 2019-07-16 18:47:26 -07:00 • committed by Jordan Eldredge
parent 333bebee07
commit ac31fb6801
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
experiments/modern/src/App.js
View file

@ -150,13 +150,20 @@ function Layer({ id, image, children, x, y }) {
console.warn("Unable to find image to render. Rendering null", image);
return null;
}
const params = {};
if (x !== undefined) {
params.left = Number(x);
}
if (y !== undefined) {
params.top = Number(y);
}
return (
<>
<img
data-node-type="Layer"
data-node-id={id}
src={img.imgUrl}
style={{ position: "absolute", top: Number(y), left: Number(x) }}
style={Object.assign({ position: "absolute" }, params)}
/>
{children}
</>
@ -166,7 +173,7 @@ function Layer({ id, image, children, x, y }) {
function Button({ id, image, action, x, y, downImage, tooltip, children }) {
const data = React.useContext(SkinContext);
const [down, setDown] = React.useState(false);
const imgId = down ? downImage : image;
const imgId = down && downImage ? downImage : image;
if (imgId == null) {
console.warn("Got a Button without a imgId. Rendering null", id);
return null;
@ -195,7 +202,7 @@ function Button({ id, image, action, x, y, downImage, tooltip, children }) {
top: Number(y),
left: Number(x),
backgroundPositionX: -Number(img.x),
backgroundPositionx: -Number(img.y),
backgroundPositionY: -Number(img.y),
width: Number(img.w),
height: Number(img.h),
backgroundImage: `url(${img.imgUrl})`,