From fdf2693824480883a7810a7088fbe62e69c10a16 Mon Sep 17 00:00:00 2001
From: domi41 <dominique.merle.41@gmail.com>
Date: Fri, 4 Sep 2020 17:39:52 +0200
Subject: [PATCH] fix: Help popup must not overflow.

---
 gui/forms/NewPollForm.tscn  | 43 +++++++++++++++++++++++--------------
 gui/forms/SettingsForm.tscn |  6 +++---
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/gui/forms/NewPollForm.tscn b/gui/forms/NewPollForm.tscn
index e09c3f7..318c8da 100644
--- a/gui/forms/NewPollForm.tscn
+++ b/gui/forms/NewPollForm.tscn
@@ -27,15 +27,16 @@ __meta__ = {
 }
 
 [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"]
-margin_left = 74.0
-margin_top = 136.0
-margin_right = 526.0
-margin_bottom = 662.0
+margin_left = 80.0
+margin_top = 170.0
+margin_right = 532.0
+margin_bottom = 628.0
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="TitleHBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
+visible = false
 margin_right = 452.0
 margin_bottom = 60.0
 
@@ -57,9 +58,8 @@ max_length = 256
 placeholder_text = "Who should we raid?"
 
 [node name="CandidatesContainer" type="MarginContainer" parent="CenterContainer/VBoxContainer"]
-margin_top = 68.0
 margin_right = 452.0
-margin_bottom = 318.0
+margin_bottom = 250.0
 rect_min_size = Vector2( 230, 250 )
 size_flags_vertical = 3
 
@@ -73,9 +73,9 @@ hide_root = true
 script = ExtResource( 3 )
 
 [node name="GradingHBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
-margin_top = 326.0
+margin_top = 258.0
 margin_right = 452.0
-margin_bottom = 378.0
+margin_bottom = 310.0
 
 [node name="Label" type="Label" parent="CenterContainer/VBoxContainer/GradingHBoxContainer"]
 self_modulate = Color( 1, 1, 1, 0.25098 )
@@ -96,16 +96,16 @@ clip_text = true
 items = [ "Quality (2 grades)", null, 2, true, false, 0, 0, null, "", false, "Quality (3 grades)", null, 2, false, false, 0, 0, null, "", false, "Quality (4 grades)", null, 2, false, false, 2, 0, null, "", false ]
 
 [node name="DelegationCheckButton" type="CheckButton" parent="CenterContainer/VBoxContainer"]
-margin_top = 386.0
+margin_top = 318.0
 margin_right = 452.0
-margin_bottom = 466.0
+margin_bottom = 398.0
 disabled = true
 text = "Allow Delegations"
 
 [node name="ButtonsHBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer"]
-margin_top = 474.0
+margin_top = 406.0
 margin_right = 452.0
-margin_bottom = 526.0
+margin_bottom = 458.0
 
 [node name="CancelButton" type="Button" parent="CenterContainer/VBoxContainer/ButtonsHBoxContainer"]
 margin_right = 214.0
@@ -129,9 +129,20 @@ size_flags_horizontal = 3
 text = "CREATE"
 
 [node name="NoProviderPopup" parent="CenterContainer" instance=ExtResource( 4 )]
-margin_left = -28.0
-margin_top = 122.0
-margin_right = 628.0
-margin_bottom = 676.0
+margin_left = 26.0
+margin_top = 99.0
+margin_right = 586.0
+margin_bottom = 699.0
+dialog_text = "No vote provider is enabled.
+No-one will be able to vote!
+
+Let's go pick one in the Settings!
+I will come with you.
+
+We're all in this together.
+
+-- Your friend,
+-- The Popup Painter
+"
 [connection signal="pressed" from="CenterContainer/VBoxContainer/ButtonsHBoxContainer/CancelButton" to="." method="_on_CancelButton_pressed"]
 [connection signal="pressed" from="CenterContainer/VBoxContainer/ButtonsHBoxContainer/LaunchButton" to="." method="_on_LaunchButton_pressed"]
diff --git a/gui/forms/SettingsForm.tscn b/gui/forms/SettingsForm.tscn
index 4686c70..b91f6a6 100644
--- a/gui/forms/SettingsForm.tscn
+++ b/gui/forms/SettingsForm.tscn
@@ -37,11 +37,10 @@ margin_bottom = 440.0
 size_flags_vertical = 3
 
 [node name="Providers" type="Control" parent="CenterContainer/VBoxContainer/TabContainer"]
-visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 8.0
-margin_top = 60.0
+margin_top = 61.0
 margin_right = -8.0
 margin_bottom = -8.0
 
@@ -79,7 +78,7 @@ margin_top = 12.0
 margin_right = 585.0
 margin_bottom = 68.0
 text = "Enable this to simulate
-votes for a quick demo."
+votes for a quick demo"
 
 [node name="TwitchContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer/TabContainer/Providers/VBoxContainer"]
 margin_top = 196.0
@@ -137,6 +136,7 @@ disabled = true
 text = "Some other Chat Commands"
 
 [node name="General" type="Control" parent="CenterContainer/VBoxContainer/TabContainer"]
+visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 8.0