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

am b8291fb4: Merge "Do not clip the popup key preview even if there is no left/right preview icons" 

* commit 'b8291fb46bbf852237416d94979d51b867c160f7':
  Do not clip the popup key preview even if there is no left/right preview icons
main
Tadashi G. Takaoka 2011-11-04 03:21:48 +00:00 committed by Android Git Automerger
parent 1921273e99 b8291fb46b
commit 17be905b0c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -906,12 +906,16 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy {
int previewX = keyDrawX - (previewWidth - keyDrawWidth) / 2 + params.mCoordinates[0]; int previewX = keyDrawX - (previewWidth - keyDrawWidth) / 2 + params.mCoordinates[0];
final int previewY = key.mY - previewHeight final int previewY = key.mY - previewHeight
+ params.mCoordinates[1] + params.mPreviewOffset; + params.mCoordinates[1] + params.mPreviewOffset;
if (previewX < 0 && params.mPreviewLeftBackground != null) { if (previewX < 0) {
previewText.setBackgroundDrawable(params.mPreviewLeftBackground);
previewX = 0; previewX = 0;
} else if (previewX + previewWidth > getWidth() && params.mPreviewRightBackground != null) { if (params.mPreviewLeftBackground != null) {
previewText.setBackgroundDrawable(params.mPreviewRightBackground); previewText.setBackgroundDrawable(params.mPreviewLeftBackground);
}
} else if (previewX > getWidth() - previewWidth) {
previewX = getWidth() - previewWidth; previewX = getWidth() - previewWidth;
if (params.mPreviewRightBackground != null) {
previewText.setBackgroundDrawable(params.mPreviewRightBackground);
}
} }
// Set the preview background state // Set the preview background state