suzanne.soy/whalesong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pulling in emmanuel's changes to beside/align, but the bug still appears to manifest. aligning by top does not work

Browse Source
This commit is contained in:
Danny Yoo 2011-08-19 16:13:13 -04:00
parent fb435b9ce7
commit 01c653f2e0
1 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
image/private/kernel.js
View File

@ -427,30 +427,54 @@ var OverlayImage = function(img1, img2, placeX, placeY) {
// keep absolute X and Y values
// convert relative X,Y to absolute amounts
// we also handle "beside" and "above"
if (placeX == "right")
X = (c1x>c2x)? img2.getWidth()-(c1x+c2x) : img1.getWidth()-(c1x+c2x);
else if (placeX == "left")
X = (c1x>c2x)? img1.getWidth()-(c1x+c2x) : img2.getWidth()-(c1x+c2x);
if (placeX == "left")
X = img2.getWidth() - (c1x + c2x);
else if (placeX == "right")
X = img1.getWidth() - (c1x + c2x);
else if (placeX == "beside")
X = c1x+c2x;
else if (placeX == "middle" ||
placeX == "center")
X = 0;
else
X = placeX;
X = c1x + c2x;
else if (placeX == "middle" || placeX == "center")
X = 0;
else
X = placeX;
if (placeY == "bottom")
Y = (c1y>c2y)? img2.getHeight()-(c1y+c2y) : img1.getHeight()-(c1y+c2y);
else if (placeY == "top")
Y = (c1y>c2y)? img1.getHeight()-(c1y+c2y) : img2.getHeight()-(c1y+c2y);
else if (placeY == "above")
Y = c1y+c2y;
else if (placeY == "baseline")
Y = img1.getBaseline()-img2.getBaseline();
else if (placeY == "middle" || placeY == "center")
Y = 0;
if (placeY == "top")
Y = img2.getHeight() - (c1y + c2y);
else if (placeY == "bottom")
Y = img1.getHeight() - (c1y + c2y);
else if (placeY == "above" )
Y = c1y + c2y;
else if (placeY == "baseline")
Y= img1.getBaseline() - img2.getBaseline();
else if (placeY == "middle" || placeY == "center")
Y = 0;
else
Y = placeY;
Y = placeY;
// if (placeX == "right")
// X = (c1x>c2x)? img2.getWidth()-(c1x+c2x) : img1.getWidth()-(c1x+c2x);
// else if (placeX == "left")
// X = (c1x>c2x)? img1.getWidth()-(c1x+c2x) : img2.getWidth()-(c1x+c2x);
// else if (placeX == "beside")
// X = c1x+c2x;
// else if (placeX == "middle" ||
// placeX == "center")
// X = 0;
// else
// X = placeX;
// if (placeY == "bottom")
// Y = (c1y>c2y)? img2.getHeight()-(c1y+c2y) : img1.getHeight()-(c1y+c2y);
// else if (placeY == "top")
// Y = (c1y>c2y)? img1.getHeight()-(c1y+c2y) : img2.getHeight()-(c1y+c2y);
// else if (placeY == "above")
// Y = c1y+c2y;
// else if (placeY == "baseline")
// Y = img1.getBaseline()-img2.getBaseline();
// else if (placeY == "middle" || placeY == "center")
// Y = 0;
// else
// Y = placeY;
// correct offsets when dealing with Scenes instead of images