From f892d4892ba95d3041b455673529e81e62777e59 Mon Sep 17 00:00:00 2001
From: CrispyPin <crispin@tasa.se>
Date: Sun, 23 Jan 2022 18:07:52 +0100
Subject: [PATCH] clean up keyboard

---
 src/overlay_resources/keyboard/KeyBtn.tscn    |  19 +++++++++++++-----
 src/overlay_resources/keyboard/KeyRow.tscn    |   1 +
 .../keyboard/key_normal.stylebox              | Bin 439 -> 445 bytes
 .../keyboard/key_pressed.stylebox             | Bin 455 -> 459 bytes
 .../keyboard/layouts/layout_se.json           |   2 +-
 src/overlays/KeyboardOverlay.tscn             |   1 +
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/overlay_resources/keyboard/KeyBtn.tscn b/src/overlay_resources/keyboard/KeyBtn.tscn
index 3ad2010..a932e17 100644
--- a/src/overlay_resources/keyboard/KeyBtn.tscn
+++ b/src/overlay_resources/keyboard/KeyBtn.tscn
@@ -1,9 +1,14 @@
-[gd_scene format=2]
+[gd_scene load_steps=2 format=2]
 
-[node name="Key" type="Button"]
-margin_right = 128.0
-margin_bottom = 128.0
-rect_min_size = Vector2( 128, 128 )
+[ext_resource path="res://overlay_resources/keyboard/keyboard.theme" type="Theme" id=1]
+
+[node name="Btn" type="Button"]
+margin_top = 993.0
+margin_right = 78.0
+margin_bottom = 1054.0
+rect_min_size = Vector2( 100, 100 )
+rect_pivot_offset = Vector2( 50, 50 )
+theme = ExtResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
@@ -11,4 +16,8 @@ __meta__ = {
 [node name="Label" type="Label" parent="."]
 anchor_right = 1.0
 anchor_bottom = 1.0
+text = "Key"
 align = 1
+__meta__ = {
+"_edit_use_anchors_": false
+}
diff --git a/src/overlay_resources/keyboard/KeyRow.tscn b/src/overlay_resources/keyboard/KeyRow.tscn
index 48e2e2b..08125f2 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
+custom_constants/separation = 0
 __meta__ = {
 "_edit_use_anchors_": false
 }
diff --git a/src/overlay_resources/keyboard/key_normal.stylebox b/src/overlay_resources/keyboard/key_normal.stylebox
index c49a55664e170ecbf6bd8edd0ca532faf2a2182b..c01042ef101bd052b0d2d17e57ba10fa636cbe16 100644
GIT binary patch
literal 445
zcmV;u0Yd&#Q$s@n000005C8!40{{S}0RR9fwJ-f(^8(!r0Jai5DFEe6bNIhPY7CTA
zLT<g=EoATF`knZ{Q)#O{`0d|PSOj6T_=SgZMhYtcE&wtB)M}^=m;J9?sf5uLDvN7-
zy=42AGWKj#{(t!o@y?e4+6#SEYyL+b{~do7iiFe6eHLruot(9yvh_)B{}aypmaR$p
z4>`5nD>1yYO?h)B$Cmd---2%93=|Xp13Hdb!314Q_j0+0sd2Me04{#EB_~=Y4Q2<V
z&t+?i93C#w<681!h1~E4^+}N!8BON@V<K5lh!74S1{I-DfS+LCVewz!f8>ZbXeE7B
zM~RmdFI<gtrAjq0aaH+PHx`2lOsH{587i721|=ySU;-hDiaQd(lVFnx3^&LGX11_e
z|2LEsCjffoHak3hi7p2x1$u+j-*}7+wQ#N<VnStPGjbL8&`>CbNF!N~NqX1N=Dk;+
z@NRle+g2#kj*utwgpT?9AVk&%80iXl7^E1jo65Q8@5HGd^*Z{oD-ztP0m#OntxxNS
nDE*IWCz8l5!xM}Ehzd-qRpB1*Cj5Li)Mb?GW#TpgQd2`iP0Gid

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

diff --git a/src/overlay_resources/keyboard/key_pressed.stylebox b/src/overlay_resources/keyboard/key_pressed.stylebox
index 572678f4fe970b27996caeff0b63a898f916c293..ec6842bd0cc64d80231db44476f8d4160f3d2c79 100644
GIT binary patch
literal 459
zcmV;+0W|(nQ$s@n000005C8!50{{TC0RR9fwJ-f(^a4!{0ESaRGhmC-0d*LLVHk#K
z1%d#?jkefi$%yPm+)tX^dyjH&0+T*AxU(=At)l<!2R~hh!H+rxE&wn9H2@Vi5NoL|
z*Zsd-K}}9qscy1u7Mt71)NyF1^8d_#hj)t?qpi?*b?3hX^8fJ%Pimwj7YpUn4~iJ;
z<E@;vr8*{R{Qe`HH?Ct9^*?gZb}yxHYuobvRFE-mk47e8SBtC}tI<eA{0FcgJAz8W
z*<fr8wrn~*p4EU;w6A?8rt)O7MjByjeG@}NW`^Kv%vdEaJQkb|=Rc%EnI!z5Oa}&$
zf{BfPQz~_ANF<JbKmbDVKj8oLc=%{3jaN^Ir*kS>>~UM_QVh*x0Y|7|NtrR4BnnFk
zl>>kR88pQm62PKxo+2=+Q6@06h1L4M0dU&hceuG8kb`#;m5EB%$>G`1ZEo(s;y^eQ
z6fsVtC1d8>H4FD&YB6R^|Ix1k11%8d7@FW9TR#kzZUQtFd@2S_j1~$Lj;(pZt~Gy+
zUe|4eVAKM#VF=`xyOgENsH#aa=1a{}FCan%=Bf(9GVlKWJe<`flzSv(iUCqnLqh=0
B%AEiJ

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

diff --git a/src/overlay_resources/keyboard/layouts/layout_se.json b/src/overlay_resources/keyboard/layouts/layout_se.json
index 71ee497..fd2ebb0 100644
--- a/src/overlay_resources/keyboard/layouts/layout_se.json
+++ b/src/overlay_resources/keyboard/layouts/layout_se.json
@@ -345,7 +345,7 @@
 				{
 					"keycode": "MENU",
 					"display": "Menu",
-					"width": 1.5
+					"width": 1.25
 				},
 				{
 					"keycode": "CONTROL_R",
diff --git a/src/overlays/KeyboardOverlay.tscn b/src/overlays/KeyboardOverlay.tscn
index e0201ef..1f03351 100644
--- a/src/overlays/KeyboardOverlay.tscn
+++ b/src/overlays/KeyboardOverlay.tscn
@@ -48,6 +48,7 @@ margin_right = 8.0
 margin_bottom = 8.0
 size_flags_horizontal = 0
 size_flags_vertical = 0
+custom_constants/separation = 0
 alignment = 1
 __meta__ = {
 "_edit_use_anchors_": false