From 78a461f7406a5ac76b686c646e8229fc8bb2a0d0 Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Mon, 30 Jan 2023 23:46:02 +0100 Subject: Modification step for the special layout Refactor, follow up of 90b7944. Add a modification step to the "special" layouts: numpad, greekmath, pin entry. Remove the apply_key0 function, which is not expressive enough. Add an enum instead of yet an other "switch_" function. --- srcs/juloo.keyboard2/KeyboardData.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'srcs/juloo.keyboard2/KeyboardData.java') diff --git a/srcs/juloo.keyboard2/KeyboardData.java b/srcs/juloo.keyboard2/KeyboardData.java index e3262bf..31112b5 100644 --- a/srcs/juloo.keyboard2/KeyboardData.java +++ b/srcs/juloo.keyboard2/KeyboardData.java @@ -458,16 +458,11 @@ class KeyboardData public Key apply(Key k) { - return new Key(apply_key0(k.key0), apply(k.key1), apply(k.key2), + return new Key(apply(k.key0), apply(k.key1), apply(k.key2), apply(k.key3), apply(k.key4), k.width, k.shift, k.edgekeys, k.slider, k.indication); } - protected Corner apply_key0(Corner c) - { - return apply(c); - } - protected Corner apply(Corner c) { if (c == null) -- cgit v1.2.3