abouttreesummaryrefslogcommitdiff
path: root/srcs/juloo.keyboard2/Keyboard2View.java
diff options
context:
space:
mode:
authorJules Aguillon2025-03-22 12:25:59 +0100
committerJules Aguillon2025-03-22 12:25:59 +0100
commit6717613b5e308243b2ba263105ca18cfd72a7bd6 (patch)
treea9fcc2e5a57fba7970a488bd00b19271da1f392b /srcs/juloo.keyboard2/Keyboard2View.java
parent35219a458afd8426061b6b451687f7b5bd653122 (diff)
downloadunexpected-keyboard-6717613b5e308243b2ba263105ca18cfd72a7bd6.tar.gz
unexpected-keyboard-6717613b5e308243b2ba263105ca18cfd72a7bd6.zip
Fix label brightness not being applied
This is due to Paint.setColor overriding any alpha value set with Paint.setAlpha. Bug was added in 653c598.
Diffstat (limited to 'srcs/juloo.keyboard2/Keyboard2View.java')
-rw-r--r--srcs/juloo.keyboard2/Keyboard2View.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java
index ab3e36b..0e1b258 100644
--- a/srcs/juloo.keyboard2/Keyboard2View.java
+++ b/srcs/juloo.keyboard2/Keyboard2View.java
@@ -441,8 +441,7 @@ public class Keyboard2View extends View
if (kv == null)
return;
float textSize = scaleTextSize(kv, _config.labelTextSize, keyH);
- Paint p = tc.label_paint(kv.hasFlagsAny(KeyValue.FLAG_KEY_FONT), textSize);
- p.setColor(labelColor(kv, isKeyDown, false));
+ Paint p = tc.label_paint(kv.hasFlagsAny(KeyValue.FLAG_KEY_FONT), labelColor(kv, isKeyDown, false), textSize);
canvas.drawText(kv.getString(), x, (keyH - p.ascent() - p.descent()) / 2f + y, p);
}
@@ -456,8 +455,7 @@ public class Keyboard2View extends View
if (kv == null)
return;
float textSize = scaleTextSize(kv, _config.sublabelTextSize, keyH);
- Paint p = tc.sublabel_paint(kv.hasFlagsAny(KeyValue.FLAG_KEY_FONT), textSize, a);
- p.setColor(labelColor(kv, isKeyDown, true));
+ Paint p = tc.sublabel_paint(kv.hasFlagsAny(KeyValue.FLAG_KEY_FONT), labelColor(kv, isKeyDown, true), textSize, a);
float subPadding = _config.keyPadding;
if (v == Vertical.CENTER)
y += (keyH - p.ascent() - p.descent()) / 2f;