From 6717613b5e308243b2ba263105ca18cfd72a7bd6 Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Sat, 22 Mar 2025 12:25:59 +0100
Subject: 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.
---
 srcs/juloo.keyboard2/Keyboard2View.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'srcs/juloo.keyboard2/Keyboard2View.java')

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;
-- 
cgit v1.2.3