Alt hint label: Do not show when shifted

Signed-off-by: Jean-Pierre Rasquin <[email protected]>
klausw · Jan 6, 2019 · ce7593e · ce7593e
1 parent 751f0f1
commit ce7593e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/src/main/java/org/pocketworkstation/pckeyboard/LatinKeyboardBaseView.java b/app/src/main/java/org/pocketworkstation/pckeyboard/LatinKeyboardBaseView.java
@@ -1045,7 +1045,7 @@ private void onBufferDraw(Canvas canvas) {
 
                 // Draw alternate hint label (if present) behind the main key
                 String altHint = key.getAltHintLabel(showHints7Bit(), showHintsAll());
-                if (!altHint.equals("")) {
+                if (!altHint.equals("") && !key.isShifted()) {
                     int hintTextSize = (int)(mKeyTextSize * 0.6 * mLabelScale);
                     paintHint.setTextSize(hintTextSize);
 
@@ -1062,7 +1062,8 @@ private void onBufferDraw(Canvas canvas) {
                 // Draw main key label
                 final int centerX = Math.round(
                         (key.width + padding.left - padding.right) / 2
-                        * (altHint.equals("") ? 1f : KEY_LABEL_ALTHINT_HORIZONTAL_ADJUSTMENT_FACTOR));
+                        * (!altHint.equals("") && !key.isShifted()
+                                ? KEY_LABEL_ALTHINT_HORIZONTAL_ADJUSTMENT_FACTOR : 1f));
                 final int centerY = (key.height + padding.top - padding.bottom) / 2;
                 final float baseline = centerY
                         + labelHeight * KEY_LABEL_VERTICAL_ADJUSTMENT_FACTOR;