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

am e9ec4d1a: Merge "Fix more keys keyboard display position" 

* commit 'e9ec4d1add497151c5a0cc4d3bd4fdc6303a906e':
  Fix more keys keyboard display position
main
Tadashi G. Takaoka 2013-11-19 21:49:41 -08:00 committed by Android Git Automerger
parent d711a147e3 e9ec4d1add
commit dbcf95a756
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/keyboard/MoreKeysKeyboard.java
View File

@ -223,7 +223,7 @@ public final class MoreKeysKeyboard extends Keyboard {
} }
public int getDefaultKeyCoordX() { public int getDefaultKeyCoordX() {
return mLeftKeys * mColumnWidth; return mLeftKeys * mColumnWidth + mLeftPadding;
} }
public int getX(final int n, final int row) { public int getX(final int n, final int row) {

8
java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java
View File

@ -81,11 +81,13 @@ public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel
mListener = listener; mListener = listener;
final View container = getContainerView(); final View container = getContainerView();
// The coordinates of panel's left-top corner in parentView's coordinate system. // The coordinates of panel's left-top corner in parentView's coordinate system.
final int x = pointX - getDefaultCoordX() - container.getPaddingLeft(); // We need to consider background drawable paddings.
final int y = pointY - container.getMeasuredHeight() + container.getPaddingBottom(); final int x = pointX - getDefaultCoordX() - container.getPaddingLeft() - getPaddingLeft();
final int y = pointY - container.getMeasuredHeight() + container.getPaddingBottom()
+ getPaddingBottom();
parentView.getLocationInWindow(mCoordinates); parentView.getLocationInWindow(mCoordinates);
// Ensure the horizontal position of the panel does not extend past the screen edges. // Ensure the horizontal position of the panel does not extend past the parentView edges.
final int maxX = parentView.getMeasuredWidth() - container.getMeasuredWidth(); final int maxX = parentView.getMeasuredWidth() - container.getMeasuredWidth();
final int panelX = Math.max(0, Math.min(maxX, x)) + CoordinateUtils.x(mCoordinates); final int panelX = Math.max(0, Math.min(maxX, x)) + CoordinateUtils.x(mCoordinates);
final int panelY = y + CoordinateUtils.y(mCoordinates); final int panelY = y + CoordinateUtils.y(mCoordinates);