drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Marquee text RTL improvements"

Browse Source
This commit is contained in:
Raph Levien
2014-04-03 15:50:28 +00:00
committed by Gerrit Code Review
parent 374db6c379 89bc413b8f
commit c420ce34ba
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/widget/TextView.java
View File

@ -5147,12 +5147,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
final int width = mRight - mLeft; final int width = mRight - mLeft;
final int padding = getCompoundPaddingLeft() + getCompoundPaddingRight(); final int padding = getCompoundPaddingLeft() + getCompoundPaddingRight();
final float dx = mLayout.getLineRight(0) - (width - padding); final float dx = mLayout.getLineRight(0) - (width - padding);
canvas.translate(isLayoutRtl ? -dx : +dx, 0.0f); canvas.translate(layout.getParagraphDirection(0) * dx, 0.0f);
} }
if (mMarquee != null && mMarquee.isRunning()) { if (mMarquee != null && mMarquee.isRunning()) {
final float dx = -mMarquee.getScroll(); final float dx = -mMarquee.getScroll();
canvas.translate(isLayoutRtl ? -dx : +dx, 0.0f); canvas.translate(layout.getParagraphDirection(0) * dx, 0.0f);
} }
} }
@ -5166,8 +5166,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
if (mMarquee != null && mMarquee.shouldDrawGhost()) { if (mMarquee != null && mMarquee.shouldDrawGhost()) {
final int dx = (int) mMarquee.getGhostOffset(); final float dx = mMarquee.getGhostOffset();
canvas.translate(isLayoutRtl ? -dx : dx, 0.0f); canvas.translate(layout.getParagraphDirection(0) * dx, 0.0f);
layout.draw(canvas, highlight, mHighlightPaint, cursorOffsetVertical); layout.draw(canvas, highlight, mHighlightPaint, cursorOffsetVertical);
} }