From 872576312459886a01cab99b100f96ea95e3228f Mon Sep 17 00:00:00 2001
From: CrispyPin <crispin@tasa.se>
Date: Thu, 20 Jan 2022 17:57:21 +0100
Subject: [PATCH] clean up keyboard

---
 src/overlay_resources/keyboard/KeyRow.tscn    |   1 +
 .../keyboard/key_normal.stylebox              | Bin 0 -> 439 bytes
 .../keyboard/key_pressed.stylebox             | Bin 0 -> 455 bytes
 src/overlay_resources/keyboard/keyboard.theme | Bin 936 -> 961 bytes
 .../keyboard/keyboard_overlay.gd              |  10 ++++--
 .../keyboard/layouts/layout_se.json           |   5 ++-
 src/overlays/KeyboardOverlay.tscn             |  33 +++++++++++++-----
 7 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 src/overlay_resources/keyboard/key_normal.stylebox
 create mode 100644 src/overlay_resources/keyboard/key_pressed.stylebox

diff --git a/src/overlay_resources/keyboard/KeyRow.tscn b/src/overlay_resources/keyboard/KeyRow.tscn
index 48e2e2b..e482f22 100644
--- a/src/overlay_resources/keyboard/KeyRow.tscn
+++ b/src/overlay_resources/keyboard/KeyRow.tscn
@@ -3,6 +3,7 @@
 [node name="KeyRow" type="HBoxContainer"]
 margin_right = 230.0
 margin_bottom = 128.0
+alignment = 1
 __meta__ = {
 "_edit_use_anchors_": false
 }
diff --git a/src/overlay_resources/keyboard/key_normal.stylebox b/src/overlay_resources/keyboard/key_normal.stylebox
new file mode 100644
index 0000000000000000000000000000000000000000..c49a55664e170ecbf6bd8edd0ca532faf2a2182b
GIT binary patch
literal 439
zcmV;o0Z9H*Q$s@n000005C8z@0{{S@0RR9fwJ-f(=K`$^0H%^WDgfn7bND(zNG&o-
zDj~Pt?H00kas5vG-)SSUv+{(OB(MlVnmqF3IU@xt04@MC0Mu%z4VV4DT&aYTD^wQO
z_Ik<oEoBVasQf?kAL5-)L$nzBs^<KUJpMcW7YoJH&4m_g<E@;vp|TZ9ZvPd|`<AUq
z`VTp^-77Ktvu$~MCdZg}N8f^O;tUiM{{=pdnZX2IO!soRhN-dB*#ItvwxuUxDh=jG
zq|aq*lQ=wNBFMGm#R|FM4eFC30T~<4hB8_BKanILKn^Sf{1v0ofWLs?aq)k^5pmH<
z`l^l+FDYKQ8s|!tZfN4F^05L~jV4E^VM!S>nj{7#DII_U88pQm62PK#9wRWOQ6@06
zh1L4M0d%^{KRa~Xg17!7#!z5$eh?G7WOIcCUy%bEBgIc?lzU7fyNYhVrcT4S>0|_{
z0Mk;!ZgUenWdFnR(jh=x>6c>A(rBTw;s_ch{951_=wsc95J#;-HUi=Nx~uYZNmVrI
hVtgrciUq`|z(iF6Sw7w0pNF%$gmM!~OfgbZLqi1?$P)kn

literal 0
HcmV?d00001

diff --git a/src/overlay_resources/keyboard/key_pressed.stylebox b/src/overlay_resources/keyboard/key_pressed.stylebox
new file mode 100644
index 0000000000000000000000000000000000000000..572678f4fe970b27996caeff0b63a898f916c293
GIT binary patch
literal 455
zcmV;&0XY6rQ$s@n000005C8z^0{{T80RR9fwJ-f(=mISb0QQnVHDE=Q4s{rYVHk!f
z6$k?BxX}zXSu!HKHTRPyH<6><o1vk7tawG2pn_Fx|6Bb+wNOQ0qZBOwF90(D31SVk
z;ZpxES5QL96)F|kHhW3!V@h#oqw@dEe~5R!jL}}`ySno~^7!xg15@N;p?tbI5o2w<
zm9sWfiiwije}(hDrC2rnha9xsJ2Bkaw!A-;W6ay5k3m;)tI<$Q{1>nsQw9}uG2Kh%
z8m2~%X92h<+LoV)sWh0@NT18rCUJPk#E@&rj1_Xj8`KvVoDPRFS@=JZBp^TzDgykQ
zQfa`3L=x~95IijY4>%$|+DYHlQKD&#$`)&!J6)=wiR{Y9x)DdHVM&=Wnj{KK3Y7zZ
z0vR;L9TEVea8C)0X_N`fY+<$jZ*;oLGe3AN2X9GaCW>7r$7e&wZ!VGm7P-waP&_=1
zvW$suSJ3Ns)NlNl?xSA?6xtx{F*m_O_CKsIT>?0jem@3HjFtu~4!wE8ul0V7p3t2L
xanw3wV-UzMyDUYQs&bPg=9h|7UO<Qn3{@?{KHgpUc{r;}C^t#S6a!LILqn4H#>D^t

literal 0
HcmV?d00001

diff --git a/src/overlay_resources/keyboard/keyboard.theme b/src/overlay_resources/keyboard/keyboard.theme
index a24fd022ceec3de8f76d72d7e3124d61f93bcf5c..4e441b3901a0c3f54a494219a4cf4a08a630fde5 100644
GIT binary patch
literal 961
zcmV;y13vsxQ$s@n000005C8zN3IG790{{RhwJ-f(u?hVg0A{3hJ`m3&9R(0b0ssI|
z04e|g06+y`@QBFmL*yn~-h>cIHqu3nF)IqUm~U|}gMsMYNKA2@90oxU_6YlhKgXw7
z0A2uR0AGzuwH$+A+|AO)G458y=M<YwW#8=o1()0KQ3yUUy|8z+o!NhkONQ(++QtVv
z<Npc1Bi{T!;CpGz_{Md!aW|-rVOu9No-6-*{HO4}*6Q$|fW?0Sf0yLAF*C=MMl=_O
zdUibWYn6)aw4&Kjdq$B@JLgKQ<Z^A;8u_$P()p%l63r-bcNX*i<E>$))K1q6^@Ey)
zXrVb7Rw}tKJ}ZS(V^6vQZ;3!oB?y($)~R)5>i>aKXhG3zA%zuw!!aMKyE8$KVVO}s
zaWR?*#=*69rXyo;@6s5W`LE!=flm&U>q>1P_qwg>L92QeiCjriS;?Iq{CJQXpLS#!
z3~p2o4MIR7yZ7Po;PF*buO@<})RPpB3P!_mr~xuHpPK&{FD?^Wq7I9M2>&fsAgH9E
za8680NJc!G!Gy>UAOz&2gTsTBNO57q2^1cRqC6yi4+s@2Jie7)8vX#sxZv)ze7MWX
zU!n+RZC*Q#Ca1EQorP0WtF6rXW;?`;Wd(9tf)Y(Bnj8x^EOpu>l>>m;sBu9eG%_P1
zNs>Z3Z~~E{D$@oMK;$4!Qi>acNFk9x0ulvDOHybvXq;?kY?Ax~Up@KD1f=#gn1^uE
zWOKf*S~0<bT)m9{QliHzhx7j4Od6ErtPMv)!8(uEO_=m@5{K1THV-4LbF4=%Cmx2%
zvK@=4B3JO1IjQrq{p>+WX13j1UwJ~Q@?6S!>C#<ygBN1o2dk_+#QEGq6!?x%!$AjE
zGizWtBMuO*hXgxzK|-N`tQJhG)(b}0a^GhVi)S5h-pPA&cXIKZF<PB)?)rFJI+5NQ
zgYO_OJ1GH$qCY#Tr;Suz>K|F{OCBI5TI~y?Ic<Ulb~fp#n9IBO{PvAot=}9Pix%>m
z7#kifyHi2kh^3gVjb1Xo-VNUv@CF*XM>cS~W3LZ24G`59B#n0R65t@tj>c;OkOLWR
zt%P>jmR&H6!=M8E@E!wrYUPROi#g1S5|$NErmbe9UF7;mJ$1NY_@r(kE&u?IU#6sl
zJyjg@efM?jv?Efo)1^VFza%YQlqnJ@npL1gm4On$n8HQAmZh_==3C+tcm5)%3e+Q$
jTFLh#$5$IQ_u9=;Jq@KNIsWseSrt{joQz!)Qd2`ioD8{B

literal 936
zcmV;Z16TY~Q$s@n000005C8xq3IG6*0{{RhwJ-f(BndSf0QO^aJ`m3&9S<Oo1ONb_
z08}6V000$=!6PEK50RT}c@sh;*+>T&dsY-~G2fzVR4v_)M;FJ*VGsmikFcM|ppFz*
z09^oO02-HSxdp$to289o+^vewDK?wRzS;i@F1O*M4t!#IVee`?v;P>E4B2J0jSqIl
z{}FsYy!n5?_tKd0jq7IPZcrV=woYa|SN`|-PvLv5RrBAX;=h1D8#8lEX+(2jsAtC`
zzgDT(PAi%nwPzIhv~#Y+N-o!it&vX)C7o|-Cee%{cV{sFKi(Q<O6_#LP(P?yhZdTX
zVWpCrz-Oh9YV1jOah3?=RDw_`ZJk<2rv4lF1}t?X&Tkmz^S{8U?#=`mW@SeG#KmT!
zmj>5XnT~A1y-Q<A=6{08fpT4`4dh<8RXu1`&mxg4Nh&M3(}SN4a^usE9D~7)s)0cW
zNM!duJRCf}O6t`-u#|d|!coCyI1cra90M^lADaIbE-e#SqR#({6$ud_JWxqN;hdP1
zkc@cr!U&NcKnTc32Zsj}VWL6?5+ytoMR`E{9u6l^czi3pF#G|Iagm}slT?;M3yNk7
zDP$?}mJoM|qL;OK?KGO4%4T*JPEoD4GV7bIi5bfZ<g^6kCV<hXfx!_PnGumB1xY$k
zf+3~IN*)rx)F99@N*h9?NF<OzQjmg5hTUk=KjF7zDFQ#|$*>3iMKI~;?-iCy%39@M
ze^t0XDGE?CblP|028;}X5QaY#ea`%9!rrcs$h3}R_NOInSl1yzf1Qb0`&#6bb6mVT
z#o_f{2(}xSVQ2K`4I{_et>j|NxhSxs=X)Qt#|7Nrx^L0D*Fq0&abCTT?5gQau7)y)
zc$XFvL9f1({3E_~o2CB~Smx0H-t%-mBb*hUBpTxXQCf8{ba+W>m38jvF>O$~+Ic|w
zbs~;qzxWVH`BVWYe@t^LzBMG?-VL;8GAA%P_$jtY0lBG?avd9cGDW>Vt#RHB1$2*W
zsA|Vh{b>cHY73I?a}osLM~tNm&<P}lmAH8kKC<@W;v2U=^(-HH#N{e^CW5UgH7i5d
z3xAqenC*5g!PEJK$7ZyX0uYe^;c+a34%SGjl3*{agYl<!XiNIKJgWQR!tql2h?!{U
zfD#=8ZUkTSY4}T)*gg?&G)w7xO%PF_j!afc{u`mWdPuX?Zl=`}f_hT$KOgL>%<?Ho
KwTJ;yQ$s^mY_BN*

diff --git a/src/overlay_resources/keyboard/keyboard_overlay.gd b/src/overlay_resources/keyboard/keyboard_overlay.gd
index c944a3f..8457898 100644
--- a/src/overlay_resources/keyboard/keyboard_overlay.gd
+++ b/src/overlay_resources/keyboard/keyboard_overlay.gd
@@ -7,11 +7,15 @@ const OVERLAY_PROPERTIES = {
 export var key_size := 120
 export var key_row : PackedScene
 export var key_button : PackedScene
+export var row_container_path : NodePath
+
+var row_container
 
 var keymap := {}
 var toggle_keys := []
 
 func _ready():
+	row_container = get_node(row_container_path)
 	load_keys("res://overlay_resources/keyboard/layouts/layout_se.json")
 
 
@@ -27,7 +31,7 @@ func load_keys(fp: String):
 func apply_keys():
 	for row in keymap.rows:
 		var row_box = key_row.instance()
-		$PanelContainer/CenterContainer/VBoxContainer.add_child(row_box)
+		row_container.add_child(row_box)
 		for key in row.keys:
 			var btn = key_button.instance()
 			
@@ -59,11 +63,11 @@ func apply_keys():
 				row_box.add_child(gapbox)
 
 		# vertical gaps
-		if row.has("gap"):
+		if row.has("gap") and row.gap > 0:
 			var gapbox = Control.new()
 			gapbox.rect_min_size.y = row.gap * key_size
 			gapbox.name = "Gap"
-			$PanelContainer/CenterContainer/VBoxContainer.add_child(gapbox)
+			row_container.add_child(gapbox)
 
 
 func key_toggled(state, code):
diff --git a/src/overlay_resources/keyboard/layouts/layout_se.json b/src/overlay_resources/keyboard/layouts/layout_se.json
index 88f5a43..efaf650 100644
--- a/src/overlay_resources/keyboard/layouts/layout_se.json
+++ b/src/overlay_resources/keyboard/layouts/layout_se.json
@@ -56,8 +56,7 @@
 				},
 				{
 					"keycode": "F12",
-					"display": "F12",
-					"gap": 0.5
+					"display": "F12"
 				}
 			]
 		},
@@ -231,7 +230,7 @@
 				},
 				{
 					"keycode": "LESS",
-					"display": "> \n<|"
+					"display": "> \n< |"
 				},
 				{
 					"keycode": "Z"
diff --git a/src/overlays/KeyboardOverlay.tscn b/src/overlays/KeyboardOverlay.tscn
index ce3e950..e0201ef 100644
--- a/src/overlays/KeyboardOverlay.tscn
+++ b/src/overlays/KeyboardOverlay.tscn
@@ -15,25 +15,40 @@ __meta__ = {
 }
 key_row = ExtResource( 3 )
 key_button = ExtResource( 4 )
+row_container_path = NodePath("CenterContainer/PanelContainer/RowContainer")
 
-[node name="PanelContainer" type="PanelContainer" parent="."]
-margin_right = 1024.0
-margin_bottom = 16.0
+[node name="CenterContainer" type="CenterContainer" parent="."]
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = 8.0
+margin_top = 8.0
+margin_right = 8.0
+margin_bottom = 8.0
 size_flags_horizontal = 0
 size_flags_vertical = 0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
-[node name="CenterContainer" type="CenterContainer" parent="PanelContainer"]
+[node name="PanelContainer" type="PanelContainer" parent="CenterContainer"]
+margin_left = 1016.0
+margin_top = 1016.0
+margin_right = 1032.0
+margin_bottom = 1032.0
+size_flags_horizontal = 0
+size_flags_vertical = 0
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="RowContainer" type="VBoxContainer" parent="CenterContainer/PanelContainer"]
 margin_left = 8.0
 margin_top = 8.0
-margin_right = 1016.0
+margin_right = 8.0
 margin_bottom = 8.0
-
-[node name="VBoxContainer" type="VBoxContainer" parent="PanelContainer/CenterContainer"]
-margin_left = 504.0
-margin_right = 504.0
 size_flags_horizontal = 0
 size_flags_vertical = 0
 alignment = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}