abouttreesummaryrefslogcommitdiff
path: root/srcs/juloo.keyboard2/Keyboard2View.java
diff options
context:
space:
mode:
Diffstat (limited to 'srcs/juloo.keyboard2/Keyboard2View.java')
-rw-r--r--srcs/juloo.keyboard2/Keyboard2View.java28
1 files changed, 4 insertions, 24 deletions
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index a10dce6..6d59974 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -493,32 +493,12 @@ public class Keyboard2View extends View
private void drawIndication(Canvas canvas, KeyboardData.Key k, float x,
float y, float keyW, float keyH)
{
- boolean special_font = false;
- String indic;
- int indic_length;
- float text_size;
- if (k.indication != null)
- {
- indic = k.indication;
- indic_length = indic.length();
- text_size = keyH * _config.sublabelTextSize * _config.characterSize;
- }
- else if (k.anticircle != null)
- {
- indic = k.anticircle.getString();
- // 3 character limit like regular labels
- indic_length = Math.min(indic.length(), 3);
- special_font = k.anticircle.hasFlagsAny(KeyValue.FLAG_KEY_FONT);
- text_size = scaleTextSize(k.anticircle, _config.sublabelTextSize, keyH);
- }
- else
- {
+ if (k.indication == null || k.indication.equals(""))
return;
- }
- Paint p = _theme.indicationPaint(special_font);
+ Paint p = _theme.indicationPaint(false);
p.setColor(_theme.subLabelColor);
- p.setTextSize(text_size);
- canvas.drawText(indic, 0, indic_length,
+ p.setTextSize(keyH * _config.sublabelTextSize * _config.characterSize);
+ canvas.drawText(k.indication, 0, k.indication.length(),
x + keyW / 2f, (keyH - p.ascent() - p.descent()) * 4/5 + y, p);
}