diff --git a/srcs/juloo.keyboard2/KeyValue.java b/srcs/juloo.keyboard2/KeyValue.java index f15eb68..fe55b6d 100644 --- a/srcs/juloo.keyboard2/KeyValue.java +++ b/srcs/juloo.keyboard2/KeyValue.java @@ -278,10 +278,20 @@ final class KeyValue return keyeventKey(String.valueOf((char)symbol), code, flags | FLAG_KEY_FONT); } - private static KeyValue editingKey(String symbol, Editing action) + private static KeyValue editingKey(String symbol, Editing action, int flags) { return new KeyValue(symbol, Kind.Editing, action.ordinal(), - FLAG_SPECIAL | FLAG_SECONDARY | FLAG_SMALLER_FONT); + flags | FLAG_SPECIAL | FLAG_SECONDARY); + } + + private static KeyValue editingKey(String symbol, Editing action) + { + return editingKey(symbol, action, FLAG_SMALLER_FONT); + } + + private static KeyValue editingKey(int symbol, Editing action) + { + return editingKey(String.valueOf((char)symbol), action, FLAG_KEY_FONT); } /** A key that do nothing but has a unique ID. */ @@ -433,17 +443,17 @@ final class KeyValue case "zwj": return charKey("zwj", '\u200D', 0); // zero-width joiner (provides ligature) case "zwnj": return charKey("zwnj", '\u200C', 0); // zero-width non joiner (prevents unintended ligature) - case "copy": return editingKey("copy", Editing.COPY); - case "paste": return editingKey("paste", Editing.PASTE); - case "cut": return editingKey("cut", Editing.CUT); - case "selectAll": return editingKey("s. all", Editing.SELECT_ALL); - case "shareText": return editingKey("share", Editing.SHARE); - case "pasteAsPlainText": return editingKey("", Editing.PASTE_PLAIN); - case "undo": return editingKey("undo", Editing.UNDO); - case "redo": return editingKey("redo", Editing.REDO); - case "replaceText": return editingKey("repl.", Editing.REPLACE); - case "textAssist": return editingKey("assist", Editing.ASSIST); - case "autofill": return editingKey("auto.", Editing.AUTOFILL); + case "copy": return editingKey(0xE030, Editing.COPY); + case "paste": return editingKey(0xE032, Editing.PASTE); + case "cut": return editingKey(0xE031, Editing.CUT); + case "selectAll": return editingKey(0xE033, Editing.SELECT_ALL); + case "shareText": return editingKey(0xE034, Editing.SHARE); + case "pasteAsPlainText": return editingKey(0xE035, Editing.PASTE_PLAIN); + case "undo": return editingKey(0xE036, Editing.UNDO); + case "redo": return editingKey(0xE037, Editing.REDO); + case "replaceText": return editingKey("repl", Editing.REPLACE); + case "textAssist": return editingKey(0xE038, Editing.ASSIST); + case "autofill": return editingKey("auto", Editing.AUTOFILL); default: return makeStringKey(name); } } diff --git a/srcs/special_font/30.svg b/srcs/special_font/30.svg new file mode 100644 index 0000000..8e4d2a7 --- /dev/null +++ b/srcs/special_font/30.svg @@ -0,0 +1,2 @@ + +content-copy diff --git a/srcs/special_font/31.svg b/srcs/special_font/31.svg new file mode 100644 index 0000000..8af9fd7 --- /dev/null +++ b/srcs/special_font/31.svg @@ -0,0 +1,2 @@ + +content-cut diff --git a/srcs/special_font/32.svg b/srcs/special_font/32.svg new file mode 100644 index 0000000..442ee70 --- /dev/null +++ b/srcs/special_font/32.svg @@ -0,0 +1,2 @@ + +content-paste diff --git a/srcs/special_font/33.svg b/srcs/special_font/33.svg new file mode 100644 index 0000000..7a3a4ad --- /dev/null +++ b/srcs/special_font/33.svg @@ -0,0 +1,2 @@ + +select-all diff --git a/srcs/special_font/34.svg b/srcs/special_font/34.svg new file mode 100644 index 0000000..840ca28 --- /dev/null +++ b/srcs/special_font/34.svg @@ -0,0 +1,2 @@ + +share diff --git a/srcs/special_font/35.svg b/srcs/special_font/35.svg new file mode 100644 index 0000000..e23d49b --- /dev/null +++ b/srcs/special_font/35.svg @@ -0,0 +1,2 @@ + +clipboard-multiple-outline diff --git a/srcs/special_font/36.svg b/srcs/special_font/36.svg new file mode 100644 index 0000000..0f5c98f --- /dev/null +++ b/srcs/special_font/36.svg @@ -0,0 +1,2 @@ + +undo-variant diff --git a/srcs/special_font/37.svg b/srcs/special_font/37.svg new file mode 100644 index 0000000..ae7e564 --- /dev/null +++ b/srcs/special_font/37.svg @@ -0,0 +1,2 @@ + +redo-variant diff --git a/srcs/special_font/38.svg b/srcs/special_font/38.svg new file mode 100644 index 0000000..165cd01 --- /dev/null +++ b/srcs/special_font/38.svg @@ -0,0 +1,2 @@ + +assistant diff --git a/srcs/special_font/result.ttf b/srcs/special_font/result.ttf index 2724805..5217d4b 100644 Binary files a/srcs/special_font/result.ttf and b/srcs/special_font/result.ttf differ