nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Calculate text width more conservatively"

main
Tadashi G. Takaoka 2011-07-01 06:35:10 -07:00 committed by Android (Google) Code Review
parent 4edc7d074b fe9b65afa8
commit 7f3e5979d7
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
java/src/com/android/inputmethod/latin/CandidateView.java
View File

@ -104,7 +104,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
private final CandidateViewLayoutParams mParams; private final CandidateViewLayoutParams mParams;
private static final int PUNCTUATIONS_IN_STRIP = 6; private static final int PUNCTUATIONS_IN_STRIP = 6;
private static final float MIN_TEXT_XSCALE = 0.8f; private static final float MIN_TEXT_XSCALE = 0.75f;
private final UiHandler mHandler = new UiHandler(this); private final UiHandler mHandler = new UiHandler(this);
@ -177,12 +177,12 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
public int mVariableWidthForWords; public int mVariableWidthForWords;
public float mScaleX; public float mScaleX;
public CandidateViewLayoutParams(Resources res, View divider, View control, public CandidateViewLayoutParams(Resources res, TextView word, View divider, View control,
int autoCorrectHighlight) { int autoCorrectHighlight) {
mPaint = new TextPaint(); mPaint = new TextPaint();
final float textSize = res.getDimension(R.dimen.candidate_text_size); final float textSize = res.getDimension(R.dimen.candidate_text_size);
mPaint.setTextSize(textSize); mPaint.setTextSize(textSize);
mPadding = res.getDimensionPixelSize(R.dimen.candidate_padding); mPadding = word.getCompoundPaddingLeft() + word.getCompoundPaddingRight();
divider.measure(WRAP_CONTENT, MATCH_PARENT); divider.measure(WRAP_CONTENT, MATCH_PARENT);
mDividerWidth = divider.getMeasuredWidth(); mDividerWidth = divider.getMeasuredWidth();
mDividerHeight = divider.getMeasuredHeight(); mDividerHeight = divider.getMeasuredHeight();
@ -224,11 +224,11 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
public void tryLayout() { public void tryLayout() {
final int maxCount = mCountInStrip; final int maxCount = mCountInStrip;
final int dividers = mDividerWidth * (maxCount - 1); final int dividers = mDividerWidth * (maxCount - 1);
mConstantWidthForPaddings = dividers + mPadding * maxCount * 2; mConstantWidthForPaddings = dividers + mPadding * maxCount;
mAvailableWidthForWords = mMaxWidth - mConstantWidthForPaddings; mAvailableWidthForWords = mMaxWidth - mConstantWidthForPaddings;
mPaint.setTextScaleX(mScaleX); mPaint.setTextScaleX(mScaleX);
final int maxFixedWidthForWord = (mMaxWidth - dividers) / maxCount - mPadding * 2; final int maxFixedWidthForWord = (mMaxWidth - dividers) / maxCount - mPadding;
mCanUseFixedWidthColumns = true; mCanUseFixedWidthColumns = true;
mVariableWidthForWords = 0; mVariableWidthForWords = 0;
for (int i = 0; i < maxCount; i++) { for (int i = 0; i < maxCount; i++) {
@ -349,8 +349,8 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
}); });
mCandidatesPaneControl.measure(WRAP_CONTENT, WRAP_CONTENT); mCandidatesPaneControl.measure(WRAP_CONTENT, WRAP_CONTENT);
mParams = new CandidateViewLayoutParams( mParams = new CandidateViewLayoutParams(res,
res, mDividers.get(0), mCandidatesPaneControl, mAutoCorrectHighlight); mWords.get(0), mDividers.get(0), mCandidatesPaneControl, mAutoCorrectHighlight);
} }
/** /**
@ -495,7 +495,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
if (params.mCanUseFixedWidthColumns) { if (params.mCanUseFixedWidthColumns) {
setLayoutWeight(word, 1.0f, mCandidateStripHeight); setLayoutWeight(word, 1.0f, mCandidateStripHeight);
} else { } else {
final int width = getTextWidth(text, paint) + params.mPadding * 2; final int width = getTextWidth(text, paint) + params.mPadding;
setLayoutWeight(word, width, mCandidateStripHeight); setLayoutWeight(word, width, mCandidateStripHeight);
} }
if (info != null) { if (info != null) {
@ -509,7 +509,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
} else { } else {
paint.setTextScaleX(1.0f); paint.setTextScaleX(1.0f);
final int textWidth = getTextWidth(styled, paint); final int textWidth = getTextWidth(styled, paint);
int available = paneWidth - x - params.mPadding * 2; int available = paneWidth - x - params.mPadding;
if (textWidth >= available) { if (textWidth >= available) {
// Needs new row, centering previous row. // Needs new row, centering previous row.
centeringCandidates(centeringFrom, lastView, x, paneWidth); centeringCandidates(centeringFrom, lastView, x, paneWidth);
@ -525,7 +525,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
params.mDividerWidth, params.mDividerHeight); params.mDividerWidth, params.mDividerHeight);
x += params.mDividerWidth; x += params.mDividerWidth;
} }
available = paneWidth - x - params.mPadding * 2; available = paneWidth - x - params.mPadding;
text = getEllipsizedText(styled, available, paint); text = getEllipsizedText(styled, available, paint);
scaleX = paint.getTextScaleX(); scaleX = paint.getTextScaleX();
word.setText(text); word.setText(text);
@ -606,15 +606,17 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
private static int getTextWidth(CharSequence text, TextPaint paint) { private static int getTextWidth(CharSequence text, TextPaint paint) {
if (TextUtils.isEmpty(text)) return 0; if (TextUtils.isEmpty(text)) return 0;
final Typeface savedTypeface = paint.getTypeface();
paint.setTypeface(getTextTypeface(text)); paint.setTypeface(getTextTypeface(text));
final int len = text.length(); final int len = text.length();
final float[] widths = new float[len]; final float[] widths = new float[len];
final int count = paint.getTextWidths(text, 0, len, widths); final int count = paint.getTextWidths(text, 0, len, widths);
float width = 0; int width = 0;
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
width += widths[i]; width += Math.round(widths[i] + 0.5f);
} }
return (int)Math.round(width + 0.5); paint.setTypeface(savedTypeface);
return width;
} }
private static Typeface getTextTypeface(CharSequence text) { private static Typeface getTextTypeface(CharSequence text) {