--- extension.js 2022-10-18 17:37:58.000000000 +0200
+++ extension_updated.js 2023-04-03 20:07:23.217332802 +0200
@@ -207,110 +207,43 @@
function override_getDefaultKeysForRow(row, numRows, level) {
let defaultKeysPreMod = [
[
- [{ label: "Esc", width: 1, keyval: Clutter.KEY_Escape }],
- [{ label: "↹", width: 1.5, keyval: Clutter.KEY_Tab }],
- [
- {
- label: "⇑",
- width: 1.5,
- level: 1,
- extraClassName: "shift-key-lowercase",
- },
- ],
- [
- {
- label: "Ctrl",
- width: 1,
- keyval: Clutter.KEY_Control_L,
- extraClassName: "control-key",
- },
- {
- label: "◆",
- width: 1,
- keyval: Clutter.KEY_Super_L,
- extraClassName: "super-key",
- },
- {
- label: "Alt",
- width: 1,
- keyval: Clutter.KEY_Alt_L,
- extraClassName: "alt-key",
- },
+ [{ label: "Esc", width: 1, keyval: Clutter.KEY_Escape, extraClassName: "medium-text" }],
+ [{ label: "Tab ↹", width: 1.5, keyval: Clutter.KEY_Tab, extraClassName: "medium-text" }],
+ [{label: "⇧ Shift", width: 2, level: 1, extraClassName: "shift-key-lowercase medium-text" }],
+ [
+ { label: "Ctrl", width: 1, keyval: Clutter.KEY_Control_L, extraClassName: "control-key medium-text" },
+ { label: "?123", width: 1, level: 2, extraClassName: "rounded-key medium-text" },
+ { label: "Alt", width: 1, keyval: Clutter.KEY_Alt_L, extraClassName: "alt-key medium-text" },
],
],
[
- [{ label: "Esc", width: 1, keyval: Clutter.KEY_Escape }],
- [{ label: "↹", width: 1.5, keyval: Clutter.KEY_Tab }],
- [{ label: "⇑", width: 1.5, level: 0, extraClassName: "shift-key-uppercase" }],
- [
- {
- label: "Ctrl",
- width: 1,
- keyval: Clutter.KEY_Control_L,
- extraClassName: "control-key",
- },
- {
- label: "◆",
- width: 1,
- keyval: Clutter.KEY_Super_L,
- extraClassName: "super-key",
- },
- {
- label: "Alt",
- width: 1,
- keyval: Clutter.KEY_Alt_L,
- extraClassName: "alt-key",
- },
+ [{ label: "Esc", width: 1, keyval: Clutter.KEY_Escape, extraClassName: "medium-text" }],
+ [{ label: "Tab ↹", width: 1.5, keyval: Clutter.KEY_Tab, extraClassName: "medium-text" }],
+ [{label: "⇧ Shift", width: 2, level: 0, extraClassName: "shift-key-uppercase medium-text" }],
+ [
+ { label: "Ctrl", width: 1, keyval: Clutter.KEY_Control_L, extraClassName: "control-key medium-text" },
+ { label: "❖", width: 1, keyval: Clutter.KEY_Super_L, extraClassName: "super-key" },
+ { label: "Alt", width: 1, keyval: Clutter.KEY_Alt_L, extraClassName: "alt-key medium-text" },
],
],
[
- [{ label: "Esc", width: 1, keyval: Clutter.KEY_Escape }],
- [{ label: "↹", width: 1.5, keyval: Clutter.KEY_Tab }],
- [{ label: "=/<F", width: 1.5, level: 3 }],
- [
- {
- label: "Ctrl",
- width: 1,
- keyval: Clutter.KEY_Control_L,
- extraClassName: "control-key",
- },
- {
- label: "◆",
- width: 1,
- keyval: Clutter.KEY_Super_L,
- extraClassName: "super-key",
- },
- {
- label: "Alt",
- width: 1,
- keyval: Clutter.KEY_Alt_L,
- extraClassName: "alt-key",
- },
+ [{ label: "Esc", width: 1, keyval: Clutter.KEY_Escape, extraClassName: "medium-text" }],
+ [{ label: "Tab ↹", width: 1.5, keyval: Clutter.KEY_Tab, extraClassName: "medium-text" }],
+ [{ label: "=/<F", width: 2, level: 3, extraClassName: "medium-text" }],
+ [
+ { label: "Ctrl", width: 1, keyval: Clutter.KEY_Control_L, extraClassName: "control-key medium-text" },
+ { label: "ABC", width: 1, level: 0, extraClassName: "rounded-key highlighted medium-text" },
+ { label: "Alt", width: 1, keyval: Clutter.KEY_Alt_L, extraClassName: "alt-key medium-text" },
],
],
[
- [{ label: "Esc", width: 1, keyval: Clutter.KEY_Escape }],
- [{ label: "↹", width: 1.5, keyval: Clutter.KEY_Tab }],
- [{ label: "?123", width: 1.5, level: 2 }],
- [
- {
- label: "Ctrl",
- width: 1,
- keyval: Clutter.KEY_Control_L,
- extraClassName: "control-key",
- },
- {
- label: "◆",
- width: 1,
- keyval: Clutter.KEY_Super_L,
- extraClassName: "super-key",
- },
- {
- label: "Alt",
- width: 1,
- keyval: Clutter.KEY_Alt_L,
- extraClassName: "alt-key",
- },
+ [{ label: "Esc", width: 1, keyval: Clutter.KEY_Escape, extraClassName: "medium-text" }],
+ [{ label: "Tab ↹", width: 1.5, keyval: Clutter.KEY_Tab, extraClassName: "medium-text" }],
+ [{ label: "=/<F", width: 2, level: 2, extraClassName: "highlighted medium-text" }],
+ [
+ { label: "Ctrl", width: 1, keyval: Clutter.KEY_Control_L, extraClassName: "control-key medium-text" },
+ { label: "ABC", width: 1, level: 0, extraClassName: "rounded-key highlighted medium-text" },
+ { label: "Alt", width: 1, keyval: Clutter.KEY_Alt_L, extraClassName: "alt-key medium-text" },
],
],
];
@@ -318,149 +251,101 @@
let defaultKeysPostMod = [
[
[
- { label: "⌫", width: 1.5, keyval: Clutter.KEY_BackSpace },
- { label: "⌦", width: 1, keyval: Clutter.KEY_Delete },
- { label: "⇊", width: 1, action: "hide", extraClassName: "hide-key" },
- ],
- [
- {
- label: "⏎",
- width: 2,
- keyval: Clutter.KEY_Return,
- extraClassName: "enter-key",
- },
- {
- label: "🗺",
- width: 1.5,
- action: "languageMenu",
- extraClassName: "layout-key",
- },
- ],
- [
- {
- label: "⇑",
- width: 3,
- level: 1,
- right: true,
- extraClassName: "shift-key-lowercase",
- },
- { label: "?123", width: 1.5, level: 2 },
- ],
- [
- { label: "←", width: 1, keyval: Clutter.KEY_Left },
- { label: "↑", width: 1, keyval: Clutter.KEY_Up },
- { label: "↓", width: 1, keyval: Clutter.KEY_Down },
- { label: "→", width: 1, keyval: Clutter.KEY_Right },
+ { label: "⌫", width: 1, keyval: Clutter.KEY_BackSpace, extraClassName: "medium-text" },
+ { label: "Delete", width: 1, keyval: Clutter.KEY_Delete, extraClassName: "small-text" },
+ { label: "🖮\n▿", width: 1, action: "hide", extraClassName: "hide-key" },
+ ],
+ [
+ { label: "⏎", width: 1.5, keyval: Clutter.KEY_Return, extraClassName: "enter-key big-text" },
+ { label: "Home", width: 1, keyval: Clutter.KEY_Home, extraClassName: "small-text" },
+ { label: "PgUp", width: 1, keyval: Clutter.KEY_Page_Up, extraClassName: "small-text" },
+ ],
+ [
+ { label: "⇧ Shift", width: 2, level: 1, right: true, extraClassName: "shift-key-lowercase medium-text" },
+ { label: "🠉", width: 1, keyval: Clutter.KEY_Up, extraClassName: "small-text" },
+ { label: "End", width: 1, keyval: Clutter.KEY_End, extraClassName: "small-text" },
+ { label: "PgDown", width: 1, keyval: Clutter.KEY_Page_Down, extraClassName: "small-text" },
+ ],
+ [
+ // { label: "❖", width: 1, keyval: Clutter.KEY_Super_L, extraClassName: "super-key" },
+ // { label: "🖮\n⌄", width: 0.5, action: "hide", extraClassName: "hide-key" },
+ { label: "🠈", width: 1, keyval: Clutter.KEY_Left, extraClassName: "small-text" },
+ { label: "🠋", width: 1, keyval: Clutter.KEY_Down, extraClassName: "small-text" },
+ { label: "🠊", width: 1, keyval: Clutter.KEY_Right, extraClassName: "small-text" },
+ { label: "🌐", width: 1, action: "languageMenu", extraClassName: "layout-key medium-text" },
],
],
[
[
- { label: "⌫", width: 1.5, keyval: Clutter.KEY_BackSpace },
- { label: "⌦", width: 1, keyval: Clutter.KEY_Delete },
- { label: "⇊", width: 1, action: "hide", extraClassName: "hide-key" },
- ],
- [
- {
- label: "⏎",
- width: 2,
- keyval: Clutter.KEY_Return,
- extraClassName: "enter-key",
- },
- {
- label: "🗺",
- width: 1.5,
- action: "languageMenu",
- extraClassName: "layout-key",
- },
- ],
- [
- {
- label: "⇑",
- width: 3,
- level: 0,
- right: true,
- extraClassName: "shift-key-uppercase",
- },
- { label: "?123", width: 1.5, level: 2 },
- ],
- [
- { label: "←", width: 1, keyval: Clutter.KEY_Left },
- { label: "↑", width: 1, keyval: Clutter.KEY_Up },
- { label: "↓", width: 1, keyval: Clutter.KEY_Down },
- { label: "→", width: 1, keyval: Clutter.KEY_Right },
+ { label: "⌫", width: 1, keyval: Clutter.KEY_BackSpace, extraClassName: "medium-text" },
+ { label: "Insert", width: 1, keyval: Clutter.KEY_Insert, extraClassName: "small-text" },
+ { label: "🖮\n▿", width: 1, action: "hide", extraClassName: "hide-key" },
+ ],
+ [
+ { label: "⏎", width: 1.5, keyval: Clutter.KEY_Return, extraClassName: "enter-key big-text" },
+ { label: "Home", width: 1, keyval: Clutter.KEY_Home, extraClassName: "small-text" },
+ { label: "PgUp", width: 1, keyval: Clutter.KEY_Page_Up, extraClassName: "small-text" },
+ ],
+ [
+ { label: "⇧ Shift", width: 2, level: 0, right: true, extraClassName: "shift-key-uppercase medium-text" },
+ { label: "🠉", width: 1, keyval: Clutter.KEY_Up, extraClassName: "small-text" },
+ { label: "End", width: 1, keyval: Clutter.KEY_End, extraClassName: "small-text" },
+ { label: "PgDown", width: 1, keyval: Clutter.KEY_Page_Down, extraClassName: "small-text" },
+ ],
+ [
+ { label: "🠈", width: 1, keyval: Clutter.KEY_Left, extraClassName: "small-text" },
+ { label: "🠋", width: 1, keyval: Clutter.KEY_Down, extraClassName: "small-text" },
+ { label: "🠊", width: 1, keyval: Clutter.KEY_Right, extraClassName: "small-text" },
+ { label: "🌐", width: 1, action: "languageMenu", extraClassName: "layout-key medium-text" },
],
],
[
[
- { label: "⌫", width: 1.5, keyval: Clutter.KEY_BackSpace },
- { label: "⌦", width: 1, keyval: Clutter.KEY_Delete },
- { label: "⇊", width: 1, action: "hide", extraClassName: "hide-key" },
- ],
- [
- {
- label: "⏎",
- width: 2,
- keyval: Clutter.KEY_Return,
- },
- {
- label: "🗺",
- width: 1.5,
- action: "languageMenu",
- extraClassName: "layout-key",
- },
- ],
- [
- { label: "=/<F", width: 3, level: 3, right: true },
- { label: "ABC", width: 1.5, level: 0 },
- ],
- [
- { label: "←", width: 1, keyval: Clutter.KEY_Left },
- { label: "↑", width: 1, keyval: Clutter.KEY_Up },
- { label: "↓", width: 1, keyval: Clutter.KEY_Down },
- { label: "→", width: 1, keyval: Clutter.KEY_Right },
+ { label: "⌫", width: 1, keyval: Clutter.KEY_BackSpace, extraClassName: "medium-text" },
+ { label: "Delete", width: 1, keyval: Clutter.KEY_Delete, extraClassName: "small-text" },
+ { label: "🖮\n▿", width: 1, action: "hide", extraClassName: "hide-key" },
+ ],
+ [
+ { label: "⏎", width: 1.5, keyval: Clutter.KEY_Return, extraClassName: "enter-key big-text" },
+ { label: "Home", width: 1, keyval: Clutter.KEY_Home, extraClassName: "small-text" },
+ { label: "PgUp", width: 1, keyval: Clutter.KEY_Page_Up, extraClassName: "small-text" },
+ ],
+ [
+ { label: "=/<F", width: 2, level: 3, right: true, extraClassName: "medium-text" },
+ { label: "🠉", width: 1, keyval: Clutter.KEY_Up, extraClassName: "small-text" },
+ { label: "End", width: 1, keyval: Clutter.KEY_End, extraClassName: "small-text" },
+ { label: "PgDown", width: 1, keyval: Clutter.KEY_Page_Down, extraClassName: "small-text" },
+ ],
+ [
+ { label: "🠈", width: 1, keyval: Clutter.KEY_Left, extraClassName: "small-text" },
+ { label: "🠋", width: 1, keyval: Clutter.KEY_Down, extraClassName: "small-text" },
+ { label: "🠊", width: 1, keyval: Clutter.KEY_Right, extraClassName: "small-text" },
+ { label: "🌐", width: 1, action: "languageMenu", extraClassName: "layout-key medium-text" },
],
],
[
[
- { label: "F1", width: 1, keyval: Clutter.KEY_F1 },
- { label: "F2", width: 1, keyval: Clutter.KEY_F2 },
- { label: "F3", width: 1, keyval: Clutter.KEY_F3 },
- { label: "⌫", width: 1.5, keyval: Clutter.KEY_BackSpace },
- { label: "⌦", width: 1, keyval: Clutter.KEY_Delete },
- { label: "⇊", width: 1, action: "hide", extraClassName: "hide-key" },
- ],
- [
- { label: "F4", width: 1, keyval: Clutter.KEY_F4 },
- { label: "F5", width: 1, keyval: Clutter.KEY_F5 },
- { label: "F6", width: 1, keyval: Clutter.KEY_F6 },
- {
- label: "⏎",
- width: 2,
- keyval: Clutter.KEY_Return,
- extraClassName: "enter-key",
- },
- {
- label: "🗺",
- width: 1.5,
- action: "languageMenu",
- extraClassName: "layout-key",
- },
- ],
- [
- { label: "F7", width: 1, keyval: Clutter.KEY_F7 },
- { label: "F8", width: 1, keyval: Clutter.KEY_F8 },
- { label: "F9", width: 1, keyval: Clutter.KEY_F9 },
- { label: "?123", width: 3, level: 2, right: true },
- { label: "ABC", width: 1.5, level: 0 },
- ],
- [
- { label: "F10", width: 1, keyval: Clutter.KEY_F10 },
- { label: "F11", width: 1, keyval: Clutter.KEY_F11 },
- { label: "F12", width: 1, keyval: Clutter.KEY_F12 },
- { label: "←", width: 1, keyval: Clutter.KEY_Left },
- { label: "↑", width: 1, keyval: Clutter.KEY_Up },
- { label: "↓", width: 1, keyval: Clutter.KEY_Down },
- { label: "→", width: 1, keyval: Clutter.KEY_Right },
+ { label: "F1", width: 1, keyval: Clutter.KEY_F1, extraClassName: "small-text" },
+ { label: "F2", width: 1, keyval: Clutter.KEY_F2, extraClassName: "small-text" },
+ { label: "F3", width: 1, keyval: Clutter.KEY_F3, extraClassName: "small-text" },
+ ],
+ [
+ { label: "", width: 0.5, extraClassName: "spacer" },
+ { label: "F4", width: 1, keyval: Clutter.KEY_F4, extraClassName: "small-text" },
+ { label: "F5", width: 1, keyval: Clutter.KEY_F5, extraClassName: "small-text" },
+ { label: "F6", width: 1, keyval: Clutter.KEY_F6, extraClassName: "small-text" },
+ ],
+ [
+ { label: "=/<F", width: 2, level: 2, right: true, extraClassName: "highlighted medium-text" },
+ { label: "F7", width: 1, keyval: Clutter.KEY_F7, extraClassName: "small-text" },
+ { label: "F8", width: 1, keyval: Clutter.KEY_F8, extraClassName: "small-text" },
+ { label: "F9", width: 1, keyval: Clutter.KEY_F9, extraClassName: "small-text" },
+ ],
+ [
+ { label: "🖮\n▿", width: 1, action: "hide", extraClassName: "hide-key" },
+ { label: "F10", width: 1, keyval: Clutter.KEY_F10, extraClassName: "small-text" },
+ { label: "F11", width: 1, keyval: Clutter.KEY_F11, extraClassName: "small-text" },
+ { label: "F12", width: 1, keyval: Clutter.KEY_F12, extraClassName: "small-text" },
],
],
];
@@ -620,8 +505,8 @@
extraButton.setWidth(2);
} else if (keyval == Clutter.KEY_Return && numKeys > 9) {
extraButton.setWidth(1.5);
- } else if (!this._emojiKeyVisible && (action == 'hide' || action == 'languageMenu')) {
- extraButton.setWidth(1.5);
+ // } else if (!this._emojiKeyVisible && (action == 'hide' || action == 'languageMenu')) {
+ // extraButton.setWidth(0.5);
}
layout.appendKey(extraButton, extraButton.keyButton.keyWidth);