Merge "LayoutLib: fix support for textScaleX."

Xavier Ducrohet · Android (Google) Code Review · commit a11630fc715d · 2011-10-04T19:40:23.000-07:00
diff --git a/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/Paint_Delegate.java
@@ -1166,7 +1166,7 @@ private void updateFontObject() {
                 if (mTextScaleX != 1.0 || mTextSkewX != 0) {
                     // TODO: support skew
                     info.mFont = info.mFont.deriveFont(new AffineTransform(
-                            mTextScaleX, mTextSkewX, 0, 0, 1, 0));
+                            mTextScaleX, mTextSkewX, 0, 1, 0, 0));
                 }
                 info.mMetrics = Toolkit.getDefaultToolkit().getFontMetrics(info.mFont);
 

Original file line number	Diff line number	Diff line change
`@@ -1166,7 +1166,7 @@ private void updateFontObject() {`
`1166`	`1166`	`if (mTextScaleX != 1.0 \|\| mTextSkewX != 0) {`
`1167`	`1167`	`// TODO: support skew`
`1168`	`1168`	`info.mFont = info.mFont.deriveFont(new AffineTransform(`
`1169`		`- mTextScaleX, mTextSkewX, 0, 0, 1, 0));`
	`1169`	`+ mTextScaleX, mTextSkewX, 0, 1, 0, 0));`
`1170`	`1170`	`}`
`1171`	`1171`	`info.mMetrics = Toolkit.getDefaultToolkit().getFontMetrics(info.mFont);`
`1172`	`1172`