From e8ec987c6a2d3034a89cefc84da3e717fc9685de Mon Sep 17 00:00:00 2001
From: pennyrigate <pennyrigate@cybergal.com>
Date: Fri, 12 Jul 2024 00:18:59 -0400
Subject: [PATCH] fixed some menu bugs

---
 menus/back_button.gd |  8 ++++++++
 menus/main_menu.tscn | 16 ++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/menus/back_button.gd b/menus/back_button.gd
index 18327af..8b4fb33 100644
--- a/menus/back_button.gd
+++ b/menus/back_button.gd
@@ -12,4 +12,12 @@ func _process(delta):
 
 func _gui_input(event):
 	if event.is_action_pressed("ui_accept"):
+		Fade.fade_out(Options.transition_speed_secs)
+		yield(Fade, "fade_finished")
+		SceneManager.current_scene = next_scene.instance()
+
+func _input(event):
+	if event.is_action_pressed("ui_cancel"):
+		Fade.fade_out(Options.transition_speed_secs)
+		yield(Fade, "fade_finished")
 		SceneManager.current_scene = next_scene.instance()
diff --git a/menus/main_menu.tscn b/menus/main_menu.tscn
index f880294..386425f 100644
--- a/menus/main_menu.tscn
+++ b/menus/main_menu.tscn
@@ -175,9 +175,9 @@ texture_focused = ExtResource( 4 )
 [node name="Options" type="TextureButton" parent="Panel"]
 material = SubResource( 4 )
 margin_left = 8.0
-margin_top = 61.0
+margin_top = 48.0
 margin_right = 16.0
-margin_bottom = 69.0
+margin_bottom = 56.0
 focus_neighbour_top = NodePath("../MarathonMode")
 focus_neighbour_bottom = NodePath("../HighScores")
 texture_focused = ExtResource( 4 )
@@ -185,9 +185,9 @@ texture_focused = ExtResource( 4 )
 [node name="HighScores" type="TextureButton" parent="Panel"]
 material = SubResource( 4 )
 margin_left = 8.0
-margin_top = 74.0
+margin_top = 61.0
 margin_right = 16.0
-margin_bottom = 82.0
+margin_bottom = 69.0
 focus_neighbour_top = NodePath("../Options")
 focus_neighbour_bottom = NodePath("../SoundTest")
 texture_focused = ExtResource( 4 )
@@ -195,9 +195,9 @@ texture_focused = ExtResource( 4 )
 [node name="SoundTest" type="TextureButton" parent="Panel"]
 material = SubResource( 4 )
 margin_left = 8.0
-margin_top = 87.0
+margin_top = 74.0
 margin_right = 16.0
-margin_bottom = 95.0
+margin_bottom = 82.0
 focus_neighbour_top = NodePath("../HighScores")
 focus_neighbour_bottom = NodePath("../Exit")
 texture_focused = ExtResource( 4 )
@@ -205,9 +205,9 @@ texture_focused = ExtResource( 4 )
 [node name="Exit" type="TextureButton" parent="Panel"]
 material = SubResource( 4 )
 margin_left = 8.0
-margin_top = 100.0
+margin_top = 87.0
 margin_right = 16.0
-margin_bottom = 108.0
+margin_bottom = 95.0
 focus_neighbour_top = NodePath("../SoundTest")
 focus_neighbour_bottom = NodePath("../Continue")
 texture_focused = ExtResource( 4 )