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

am 0a57156c: Don\'t use KeyDrawParams as argument of Key#selectTextSize 

* commit '0a57156c07990b024b69100f1729997e61cb86c1':
  Don't use KeyDrawParams as argument of Key#selectTextSize
main
Tadashi G. Takaoka 2012-05-18 01:13:13 -07:00 committed by Android Git Automerger
parent 8906f91550 0a57156c07
commit b710ca158e
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
java/src/com/android/inputmethod/keyboard/Key.java
View File

@ -493,21 +493,21 @@ public class Key {
}
}
public int selectTextSize(KeyboardView.KeyDrawParams params) {
public int selectTextSize(int letterSize, int largeLetterSize, int labelSize,
int largeLabelSize, int hintLabelSize) {
switch (mLabelFlags & LABEL_FLAGS_FOLLOW_KEY_TEXT_RATIO_MASK) {
case LABEL_FLAGS_FOLLOW_KEY_LARGE_LETTER_RATIO:
return params.mKeyLargeLetterSize;
case LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO:
return params.mKeyLetterSize;
return letterSize;
case LABEL_FLAGS_FOLLOW_KEY_LARGE_LETTER_RATIO:
return largeLetterSize;
case LABEL_FLAGS_FOLLOW_KEY_LABEL_RATIO:
return params.mKeyLabelSize;
return labelSize;
case LABEL_FLAGS_FOLLOW_KEY_LARGE_LABEL_RATIO:
return params.mKeyLargeLabelSize;
return largeLabelSize;
case LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO:
return params.mKeyHintLabelSize;
return hintLabelSize;
default: // No follow key ratio flag specified.
return StringUtils.codePointCount(mLabel) == 1
? params.mKeyLetterSize : params.mKeyLabelSize;
return StringUtils.codePointCount(mLabel) == 1 ? letterSize : labelSize;
}
}

4
java/src/com/android/inputmethod/keyboard/KeyboardView.java
View File

@ -573,7 +573,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
final String label = key.mLabel;
// For characters, use large font. For labels like "Done", use smaller font.
paint.setTypeface(key.selectTypeface(params.mKeyTextStyle));
final int labelSize = key.selectTextSize(params);
final int labelSize = key.selectTextSize(params.mKeyLetterSize,
params.mKeyLargeLetterSize, params.mKeyLabelSize, params.mKeyLargeLabelSize,
params.mKeyHintLabelSize);
paint.setTextSize(labelSize);
final float labelCharHeight = getCharHeight(KEY_LABEL_REFERENCE_CHAR, paint);
final float labelCharWidth = getCharWidth(KEY_LABEL_REFERENCE_CHAR, paint);