AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

roll in fixes from android when we have to compress sections of "stretchy"

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@2345 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2011-09-28 12:33:41 +00:00
parent f8897e8d5b
commit ade907bf98
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/utils/SkNinePatch.cpp
View File

@ -55,10 +55,18 @@ static void fillRow(SkPoint verts[], SkPoint texs[],
texs->set(0, ty); texs++;
for (int x = 0; x < numXDivs; x++) {
SkScalar tx = SkIntToScalar(xDivs[x]);
if (x & 1) {
vx += stretchX;
if (stretchX >= 0) {
if (x & 1) {
vx += stretchX;
} else {
vx += tx;
}
} else {
vx += tx;
if (x & 1) {
; // do nothing
} else {
vx += SkScalarMul(tx, -stretchX);
}
}
verts->set(vx, vy); verts++;
texs->set(tx, ty); texs++;
@ -110,8 +118,6 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
const int numYStretch = (numYDivs + 1) >> 1;
if (numXStretch < 1 && numYStretch < 1) {
BITMAP_RECT:
// SkDebugf("------ drawasamesh revert to bitmaprect\n");
canvas->drawBitmapRect(bitmap, NULL, bounds, paint);
return;
}
@ -136,7 +142,8 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
int fixed = bitmap.width() - stretchSize;
stretchX = (bounds.width() - SkIntToScalar(fixed)) / numXStretch;
if (stretchX < 0) {
goto BITMAP_RECT;
// reuse stretchX, but keep it negative as a signal
stretchX = -bitmap.width() / fixed;
}
}
@ -148,7 +155,8 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
int fixed = bitmap.height() - stretchSize;
stretchY = (bounds.height() - SkIntToScalar(fixed)) / numYStretch;
if (stretchY < 0) {
goto BITMAP_RECT;
// reuse stretchY, but keep it negative as a signal
stretchY = -bitmap.height() / fixed;
}
}
@ -191,10 +199,18 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds,
texs += numXDivs + 2;
for (int y = 0; y < numYDivs; y++) {
const SkScalar ty = SkIntToScalar(yDivs[y]);
if (y & 1) {
vy += stretchY;
} else {
vy += ty;
if (stretchY >= 0) {
if (y & 1) {
vy += stretchY;
} else {
vy += ty;
}
} else { // shrink fixed sections, and collaps stretchy sections
if (y & 1) {
;// do nothing
} else {
vy += SkScalarMul(ty, -stretchY);
}
}
fillRow(verts, texs, vy, ty, bounds, xDivs, numXDivs,
stretchX, bitmap.width());