From 899a3dce3dec54f9fb007cafbbab733a5b6c3c7a Mon Sep 17 00:00:00 2001
From: CrispyPin <crispin@tasa.se>
Date: Wed, 19 Jan 2022 21:15:32 +0100
Subject: [PATCH] apply gaps when loading keyboard layout

---
 src/overlay_resources/keyboard/KeyBtn.tscn    |   1 -
 src/overlay_resources/keyboard/keyboard.theme | Bin 936 -> 936 bytes
 .../keyboard/keyboard_overlay.gd              |  39 ++++++------------
 .../keyboard/layouts/layout_se.json           |  20 ++++-----
 src/overlays/KeyboardOverlay.tscn             |  13 ++++--
 5 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/src/overlay_resources/keyboard/KeyBtn.tscn b/src/overlay_resources/keyboard/KeyBtn.tscn
index 9dace5c..39de05d 100644
--- a/src/overlay_resources/keyboard/KeyBtn.tscn
+++ b/src/overlay_resources/keyboard/KeyBtn.tscn
@@ -9,4 +9,3 @@ rect_min_size = Vector2( 128, 128 )
 anchor_right = 1.0
 anchor_bottom = 1.0
 align = 1
-valign = 1
diff --git a/src/overlay_resources/keyboard/keyboard.theme b/src/overlay_resources/keyboard/keyboard.theme
index f0b34193d31854c3b98a4bc8f150f8f43d5df833..a24fd022ceec3de8f76d72d7e3124d61f93bcf5c 100644
GIT binary patch
delta 557
zcmV+|0@D4c2dD>-9s>4bksv^SR{&iAWdItNYPki!xSOSoW8AHZ&nY&W%D&nE3NE+d
zqYivxdSUNsJG1{7mkiluw2cpT#{Us~KfL*W!1vOa@r~<d<8DwL!?sRlJXikr_)p<`
ztyS~iqT;`RKN~Z1Old@OVW?-vBfnOu*iI{&9kpi^`LuJc#7ZvLhOLo1PYWfTZ)zsd
zj3ReuF#kW^8fHrEbiGhNs9A>=nv-FrlAFM1rI2duNq2FU2;@|PP$_MlT1Te-8~6s3
z9sy$l90QYr0YEhYj&YHqJCjtFLJNv!3n^qN@s<#GiK3UadF?csoXTc)7EV#EwleFR
zt%(`S3gol|<tBj9llB3Zf6=?wLJw|nUcHa(s_9LxhBAkEmlhL2ufCJ~BffQ;rT-IH
z=FtG&^K?EVoE4rV8sh&^T6HjVcu8uNb?)ggZBV+}c|iJgB93Ff_z+0>Q~@Y|Omi!~
zH6-5N4YX%6ConqrDYi)gxv7$J9UFTxMZG_*ao!CDbdPMPYR6Fhe`y7zY73I?a}osL
zM~tNm&<P}lmAH8kKC<@W;v2U=^(-HH#N{e^CW5UgH7i5d3xAqenC*5g!PEJK$7ZyX
z0uYe^;c+a34%SGjl3*{agYl<!XiNIKJgWQR!tql2h?!{UfD#=8ZUkTSY4}T)*gg?&
vG)w7xO%PF_j!afcAO0Jmxq3*m)o!NM6M}kD@IN2ys?72!NwtUpQd2`iiY5yF

delta 557
zcmV+|0@D4c2dD>-9s(xhksv^SSO8rBX8@~lsg_&ti@RCcIL6(o_?%+1sqCBmui$bU
zKI*_HrWf|Ewln*WamkQfM%(ycXZ#<*_rsh22YfG$8Q-{WHtq)1F>LE(#&hL=kN*_D
z*IG6IEh_#C_yZg_X6BgEh~~mj&yGiatx~a_Rx~?m&nWU~=Uj=ET&@j2TO*$qN;==v
zOrjY@?#^KTf4nu!l-lWfp?*-a4lOh%!%8JLfzL`I)!38n;w%x!sRW@?+B&t4O#L_T
zB`7zO8UbSg0h50LKr}6XfMZ;w=*}dSrO<++*+L3gO1ve+U83k^ZC*Q#Ca1EQorP0W
ztF6rXW@}=`vI02`fY6il0hfQ`JQs)hn{e-AxDtAkOQg&p-lfGv(5vqx|A=qhX6gR~
zmU%RQ_dK1?2xo;SiH7)plvW)K9bS@JWu1F^OdFK0b{>#^orvSuFFpiPK2-q9AJg25
zZw-mJcLVL2%n6JReu`~UKyIp}T*t<qOi}MoYn*pO0o@}Ts@gGBe_DS5soH|1`<w&;
z_z`0%19Sq3VI^)}gpaJfxcJ8HPd&?r9&x!!o{3;<O3lg;_QIbg7G}F$OYn3);jtO*
zqyR)DKzJO>po2A%swCJ8>tOt;9omw<E|2QIxNy9bK4K;sI-o?yfE&RVeH#9fCALq*
v8_iNWUlT+Ws3Vh=lK&k>Xs#a8Y_*$d^@O0F6#UNzyDGDMN>VLiQd2`i>MIXU

diff --git a/src/overlay_resources/keyboard/keyboard_overlay.gd b/src/overlay_resources/keyboard/keyboard_overlay.gd
index 0a2e757..ae83abb 100644
--- a/src/overlay_resources/keyboard/keyboard_overlay.gd
+++ b/src/overlay_resources/keyboard/keyboard_overlay.gd
@@ -42,35 +42,22 @@ func apply_keys():
 				
 			row_box.add_child(btn)
 			btn.connect("pressed", self, "key_pressed", [key.keycode])
-		#TODO gaps
+			
+			# horizontal gaps
+			if key.has("gap"):
+				var gapbox = Control.new()
+				gapbox.rect_min_size.x = key.gap * key_size
+				gapbox.name = "Gap"
+				row_box.add_child(gapbox)
+		# vertical gaps
+		if row.has("gap"):
+			var gapbox = Control.new()
+			gapbox.rect_min_size.y = row.gap * key_size
+			gapbox.name = "Gap"
+			$PanelContainer/CenterContainer/VBoxContainer.add_child(gapbox)
 
 
 func key_pressed(code, toggle=false):
 	GDVK.press(code)
 	
 
-
-func _on_KeyO_pressed():
-	GDVK.press("O")
-
-
-func _on_KeyE_pressed():
-	GDVK.key_down("SHIFT")
-	GDVK.press("1")
-	GDVK.key_up("SHIFT")
-	
-
-
-func _on_KeyH_pressed():
-	GDVK.press("H")
-	pass # Replace with function body.
-
-
-func _on_KeyL_pressed():
-	GDVK.press("L")
-	pass # Replace with function body.
-
-
-func _on_KeyCaps_pressed():
-	GDVK.press("CAPSLOCK")
-	pass # Replace with function body.
diff --git a/src/overlay_resources/keyboard/layouts/layout_se.json b/src/overlay_resources/keyboard/layouts/layout_se.json
index b21e86a..62e73ba 100644
--- a/src/overlay_resources/keyboard/layouts/layout_se.json
+++ b/src/overlay_resources/keyboard/layouts/layout_se.json
@@ -267,8 +267,8 @@
 				},
 				{
 					"keycode": "SHIFT",
-					"display": "SHIFT",
-					"width": 2.5
+					"display": "Shift",
+					"width": 2.75
 				}
 			]
 		},
@@ -282,28 +282,28 @@
 				},
 				{
 					"keycode": "SUPER",
-					"display": "Super",
-					"width": 1.5
+					"display": "Sup",
+					"width": 1.25
 				},
 				{
 					"keycode": "ALT",
 					"display": "Alt",
-					"width": 1.5
+					"width": 1.25
 				},
 				{
 					"keycode": "SPACE",
 					"display": "",
-					"width": 5.5
+					"width": 5.75
 				},
 				{
 					"keycode": "ALT",
-					"display": "Alt Gr(!)",
-					"width": 1.5
+					"display": "Alt",
+					"width": 1.25
 				},
 				{
 					"keycode": "SUPER",
-					"display": "Super",
-					"width": 1.5
+					"display": "Sup",
+					"width": 1.25
 				},
 				{
 					"keycode": "MENU",
diff --git a/src/overlays/KeyboardOverlay.tscn b/src/overlays/KeyboardOverlay.tscn
index 93e14d1..ce3e950 100644
--- a/src/overlays/KeyboardOverlay.tscn
+++ b/src/overlays/KeyboardOverlay.tscn
@@ -17,8 +17,10 @@ key_row = ExtResource( 3 )
 key_button = ExtResource( 4 )
 
 [node name="PanelContainer" type="PanelContainer" parent="."]
-anchor_right = 1.0
+margin_right = 1024.0
 margin_bottom = 16.0
+size_flags_horizontal = 0
+size_flags_vertical = 0
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -26,9 +28,12 @@ __meta__ = {
 [node name="CenterContainer" type="CenterContainer" parent="PanelContainer"]
 margin_left = 8.0
 margin_top = 8.0
-margin_right = 2040.0
+margin_right = 1016.0
 margin_bottom = 8.0
 
 [node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/CenterContainer"]
-margin_left = 1016.0
-margin_right = 1016.0
+margin_left = 504.0
+margin_right = 504.0
+size_flags_horizontal = 0
+size_flags_vertical = 0
+alignment = 1