Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue where scale-animating text would jump temporarily a few pixels" into jb-dev

Browse Source
This commit is contained in:
Chet Haase
2012-05-07 13:20:00 -07:00
committed by Android (Google) Code Review
parent d8efe42496 d3efd6920e
commit 4bbcae7eb8
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/DisplayListRenderer.h
View File

@@ -255,7 +255,7 @@ public:
if (scaleY != mScaleY) {
mScaleY = scaleY;
mMatrixDirty = true;
if (ALMOST_EQUAL(mScaleX, 1) && ALMOST_EQUAL(mScaleY, 1)) {
if (mScaleX == 1.0f && mScaleY == 1.0f) {
mMatrixFlags &= ~SCALE;
} else {
mMatrixFlags |= SCALE;

11
libs/hwui/Matrix.cpp
View File

@@ -56,16 +56,13 @@ void Matrix4::loadIdentity() {
}
bool Matrix4::changesBounds() {
return !(ALMOST_EQUAL(data[0], 1.0f) && ALMOST_EQUAL(data[1], 0.0f) &&
ALMOST_EQUAL(data[2], 0.0f) && ALMOST_EQUAL(data[4], 0.0f) &&
ALMOST_EQUAL(data[5], 1.0f) && ALMOST_EQUAL(data[6], 0.0f) &&
ALMOST_EQUAL(data[8], 0.0f) && ALMOST_EQUAL(data[9], 0.0f) &&
ALMOST_EQUAL(data[10], 1.0f));
return !(data[0] == 1.0f && data[1] == 0.0f && data[2] == 0.0f && data[4] == 0.0f &&
data[5] == 1.0f && data[6] == 0.0f && data[8] == 0.0f && data[9] == 0.0f &&
data[10] == 1.0f);
}
bool Matrix4::isPureTranslate() {
return mSimpleMatrix &&
ALMOST_EQUAL(data[kScaleX], 1.0f) && ALMOST_EQUAL(data[kScaleY], 1.0f);
return mSimpleMatrix && data[kScaleX] == 1.0f && data[kScaleY] == 1.0f;
}
bool Matrix4::isSimple() {