diff options
| author | dzaima | 2026-02-26 00:57:39 +0200 |
|---|---|---|
| committer | GitHub | 2026-02-25 23:57:39 +0100 |
| commit | 6a19f7ccd34be0a1e26e64c081de755287460347 (patch) | |
| tree | 76e07c12699d66f997cb4e607cb3560f4dd65c94 /srcs/juloo.keyboard2 | |
| parent | 164c8732c0e0ee26f19fcccecb1105e05197a783 (diff) | |
| download | unexpected-keyboard-6a19f7ccd34be0a1e26e64c081de755287460347.tar.gz unexpected-keyboard-6a19f7ccd34be0a1e26e64c081de755287460347.zip | |
Separate colors for pressed vs activated labels (#1193)
Diffstat (limited to 'srcs/juloo.keyboard2')
| -rw-r--r-- | srcs/juloo.keyboard2/Keyboard2View.java | 3 | ||||
| -rw-r--r-- | srcs/juloo.keyboard2/Theme.java | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/srcs/juloo.keyboard2/Keyboard2View.java b/srcs/juloo.keyboard2/Keyboard2View.java index d93c8bb..5d6e0fa 100644 --- a/srcs/juloo.keyboard2/Keyboard2View.java +++ b/srcs/juloo.keyboard2/Keyboard2View.java @@ -413,8 +413,9 @@ public class Keyboard2View extends View { if ((flags & Pointers.FLAG_P_LOCKED) != 0) return _theme.lockedColor; + return _theme.activatedColor; } - return _theme.activatedColor; + return _theme.pressedColor; } if (k.hasFlagsAny(KeyValue.FLAG_SECONDARY | KeyValue.FLAG_GREYED)) { diff --git a/srcs/juloo.keyboard2/Theme.java b/srcs/juloo.keyboard2/Theme.java index f291f36..6824e57 100644 --- a/srcs/juloo.keyboard2/Theme.java +++ b/srcs/juloo.keyboard2/Theme.java @@ -16,6 +16,7 @@ public class Theme // Label colors public final int lockedColor; public final int activatedColor; + public final int pressedColor; public final int labelColor; public final int subLabelColor; public final int secondaryLabelColor; @@ -44,6 +45,7 @@ public class Theme isLightNavBar = s.getBoolean(R.styleable.keyboard_windowLightNavigationBar, false); labelColor = s.getColor(R.styleable.keyboard_colorLabel, 0); activatedColor = s.getColor(R.styleable.keyboard_colorLabelActivated, 0); + pressedColor = s.getColor(R.styleable.keyboard_colorLabelPressed, labelColor); lockedColor = s.getColor(R.styleable.keyboard_colorLabelLocked, 0); subLabelColor = s.getColor(R.styleable.keyboard_colorSubLabel, 0); secondaryLabelColor = adjustLight(labelColor, |