add more keys to se kb layout, add basic us layout, update gdvk, cleanup

src/overlay_resources/keyboard/KeyBtn.tscn

@@ -4,6 +4,9 @@
 margin_right = 128.0
 margin_bottom = 128.0
 rect_min_size = Vector2( 128, 128 )
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="Label" type="Label" parent="."]
 anchor_right = 1.0

src/overlay_resources/keyboard/KeyRow.tscn

@@ -3,7 +3,6 @@
 [node name="KeyRow" type="HBoxContainer"]
 margin_right = 230.0
 margin_bottom = 128.0
-alignment = 1
 __meta__ = {
 "_edit_use_anchors_": false
 }

src/overlay_resources/keyboard/keyboard_overlay.gd

@@ -4,7 +4,7 @@ const OVERLAY_PROPERTIES = {
 	"has_touch": true,
 }
 
-export var key_size := 120
+export var key_size := 100
 export var key_row : PackedScene
 export var key_button : PackedScene
 export var row_container_path : NodePath

src/overlay_resources/keyboard/layouts/layout_se.json

@@ -56,12 +56,16 @@
 				},
 				{
 					"keycode": "F12",
-					"display": "F12"
+					"display": "F12",
+					"gap": 0.5
+				},
+				{
+					"keycode": "PRINT",
+					"display": "Print\nScrn"
 				}
 			]
 		},
 		{
-			"gap": 0,
 			"keys": [
 				{
 					"keycode": "ASCIIGRAVE",
@@ -107,13 +111,25 @@
 				},
 				{
 					"keycode": "BACKSPACE",
-					"display": "<-",
+					"display": "Backspace",
-					"width": 2
+					"width": 2,
+					"gap": 0.5
+				},
+				{
+					"keycode": "INSERT",
+					"display": "Ins"
+				},
+				{
+					"keycode": "HOME",
+					"display": "Home"
+				},
+				{
+					"keycode": "PAGE_UP",
+					"display": "Page\nUp"
 				}
 			]
 		},
 		{
-			"gap": 0,
 			"keys": [
 				{
 					"keycode": "TAB",
@@ -161,12 +177,24 @@
 				{
 					"keycode": "ENTER",
 					"display": "Enter",
-					"width": 1.5
+					"width": 1.5,
+					"gap": 0.5
+				},
+				{
+					"keycode": "DELETE",
+					"display": "Del"
+				},
+				{
+					"keycode": "END",
+					"display": "End"
+				},
+				{
+					"keycode": "PAGE_DOWN",
+					"display": "Page\nDown"
 				}
 			]
 		},
 		{
-			"gap": 0,
 			"keys": [
 				{
 					"keycode": "CAPSLOCK",
@@ -220,11 +248,10 @@
 			]
 		},
 		{
-			"gap": 0,
 			"keys": [
 				{
-					"keycode": "SHIFT",
+					"keycode": "SHIFT_L",
-					"display": "^",
+					"display": "Shift",
 					"toggle": true,
 					"width": 1.25
 				},
@@ -266,18 +293,22 @@
 					"display": "_\n-"
 				},
 				{
-					"keycode": "SHIFT",
+					"keycode": "SHIFT_R",
 					"display": "Shift",
 					"toggle": true,
-					"width": 2.75
+					"width": 2.75,
+					"gap": 1.5
+				},
+				{
+					"keycode": "UP",
+					"display": "^"
 				}
 			]
 		},
 		{
-			"gap": 0,
 			"keys": [
 				{
-					"keycode": "CONTROL",
+					"keycode": "CONTROL_L",
 					"display": "Ctrl",
 					"toggle": true,
 					"width": 1.5
@@ -300,8 +331,8 @@
 					"width": 5.75
 				},
 				{
-					"keycode": "ALT",
+					"keycode": "ALT_GR",
-					"display": "Alt",
+					"display": "Alt Gr",
 					"toggle": true,
 					"width": 1.25
 				},
@@ -317,10 +348,23 @@
 					"width": 1.5
 				},
 				{
-					"keycode": "CONTROL",
+					"keycode": "CONTROL_R",
 					"display": "Ctrl",
 					"toggle": true,
-					"width": 1.5
+					"width": 1.5,
+					"gap": 0.5
+				},
+				{
+					"keycode": "LEFT",
+					"display": "\n<"
+				},
+				{
+					"keycode": "DOWN",
+					"display": "\nv"
+				},
+				{
+					"keycode": "RIGHT",
+					"display": "\n>"
 				}
 			]
 		}

src/overlay_resources/keyboard/layouts/layout_us.json

@@ -0,0 +1,315 @@
+{
+	"rows": [
+		{
+			"gap": 0.5,
+			"keys": [
+				{
+					"keycode": "ESCAPE",
+					"display": "Esc",
+					"gap": 1
+				},
+				{
+					"keycode": "F1",
+					"display": "F1"
+				},
+				{
+					"keycode": "F2",
+					"display": "F2"
+				},
+				{
+					"keycode": "F3",
+					"display": "F3"
+				},
+				{
+					"keycode": "F4",
+					"display": "F4",
+					"gap": 0.5
+				},
+				{
+					"keycode": "F5",
+					"display": "F5"
+				},
+				{
+					"keycode": "F6",
+					"display": "F6"
+				},
+				{
+					"keycode": "F7",
+					"display": "F7"
+				},
+				{
+					"keycode": "F8",
+					"display": "F8",
+					"gap": 0.5
+				},
+				{
+					"keycode": "F9",
+					"display": "F9"
+				},
+				{
+					"keycode": "F10",
+					"display": "F10"
+				},
+				{
+					"keycode": "F11",
+					"display": "F11"
+				},
+				{
+					"keycode": "F12",
+					"display": "F12"
+				}
+			]
+		},
+		{
+			"keys": [
+				{
+					"keycode": "ASCIITILDE",
+					"display": "~ `"
+				},
+				{
+					"keycode": "1"
+				},
+				{
+					"keycode": "2"
+				},
+				{
+					"keycode": "3"
+				},
+				{
+					"keycode": "4"
+				},
+				{
+					"keycode": "5"
+				},
+				{
+					"keycode": "6"
+				},
+				{
+					"keycode": "7"
+				},
+				{
+					"keycode": "8"
+				},
+				{
+					"keycode": "9"
+				},
+				{
+					"keycode": "0"
+				},
+				{
+					"keycode": "MINUS",
+					"display": "-"
+				},
+				{
+					"keycode": "EQUAL",
+					"display": "="
+				},
+				{
+					"keycode": "BACKSPACE",
+					"display": "<-",
+					"width": 2
+				}
+			]
+		},
+		{
+			"keys": [
+				{
+					"keycode": "TAB",
+					"display": "->",
+					"width": 1.5
+				},
+				{
+					"keycode": "Q"
+				},
+				{
+					"keycode": "W"
+				},
+				{
+					"keycode": "E"
+				},
+				{
+					"keycode": "R"
+				},
+				{
+					"keycode": "T"
+				},
+				{
+					"keycode": "Y"
+				},
+				{
+					"keycode": "U"
+				},
+				{
+					"keycode": "I"
+				},
+				{
+					"keycode": "O"
+				},
+				{
+					"keycode": "P"
+				},
+				{
+					"keycode": "BRACKETLEFT",
+					"display": "["
+				},
+				{
+					"keycode": "BRACKETRIGHT",
+					"display": "]"
+				},
+				{
+					"keycode": "BACKSLASH",
+					"display": "\\",
+					"width": 1.5
+				}
+			]
+		},
+		{
+			"keys": [
+				{
+					"keycode": "CAPSLOCK",
+					"display": "CAPS",
+					"width": 1.75
+				},
+				{
+					"keycode": "A"
+				},
+				{
+					"keycode": "S"
+				},
+				{
+					"keycode": "D"
+				},
+				{
+					"keycode": "F"
+				},
+				{
+					"keycode": "G"
+				},
+				{
+					"keycode": "H"
+				},
+				{
+					"keycode": "J"
+				},
+				{
+					"keycode": "K"
+				},
+				{
+					"keycode": "L"
+				},
+				{
+					"keycode": "SEMICOLON",
+					"display": ";"
+				},
+				{
+					"keycode": "QUOTELEFT",
+					"display": "`"
+				},
+				{
+					"keycode": "ENTER",
+					"display": "Enter",
+					"width": 2.25
+				}
+			]
+		},
+		{
+			"keys": [
+				{
+					"keycode": "SHIFT",
+					"display": "^",
+					"toggle": true,
+					"width": 2.25
+				},
+				{
+					"keycode": "Z"
+				},
+				{
+					"keycode": "X"
+				},
+				{
+					"keycode": "C"
+				},
+				{
+					"keycode": "V"
+				},
+				{
+					"keycode": "B"
+				},
+				{
+					"keycode": "N"
+				},
+				{
+					"keycode": "M"
+				},
+				{
+					"keycode": "COMMA",
+					"display": "<\n  ,"
+				},
+				{
+					"keycode": "PERIOD",
+					"display": ">\n  ."
+				},
+				{
+					"keycode": "SLASH",
+					"display": "?\n  /"
+				},
+				{
+					"keycode": "SHIFT",
+					"display": "Shift",
+					"toggle": true,
+					"width": 2.75
+				}
+			]
+		},
+		{
+			"keys": [
+				{
+					"keycode": "CONTROL",
+					"display": "Ctrl",
+					"toggle": true,
+					"width": 1.5
+				},
+				{
+					"keycode": "SUPER",
+					"display": "Sup",
+					"toggle": true,
+					"width": 1.25
+				},
+				{
+					"keycode": "ALT",
+					"display": "Alt",
+					"toggle": true,
+					"width": 1.25
+				},
+				{
+					"keycode": "SPACE",
+					"display": "",
+					"width": 5.75
+				},
+				{
+					"keycode": "ALT",
+					"display": "Alt",
+					"toggle": true,
+					"width": 1.25
+				},
+				{
+					"keycode": "SUPER",
+					"display": "Sup",
+					"toggle": true,
+					"width": 1.25
+				},
+				{
+					"keycode": "MENU",
+					"display": "Menu",
+					"width": 1.5
+				},
+				{
+					"keycode": "CONTROL",
+					"display": "Ctrl",
+					"toggle": true,
+					"width": 1.5
+				}
+			]
+		}
+	]
+}