Rework Game Menu

1 files changed, 56 insertions, 69 deletions

diff --git a/game/screens.rpy b/game/screens.rpy
index 17a1f3a..378367e 100644
--- a/game/screens.rpy
+++ b/game/screens.rpy
@@ -333,30 +333,25 @@ style quick_button_text:
 
 screen navigation():
 
-    vbox:
+    hbox:
         style_prefix "navigation"
 
         xpos gui.navigation_xpos
-        yalign 0.5
+        yalign 0.0
 
         spacing gui.navigation_spacing
 
         if main_menu:
-
             textbutton _("Start") action Start()
-
         else:
-
             textbutton _("History") action ShowMenu("history")
 
         textbutton _("Preferences") action ShowMenu("preferences")
 
         if _in_replay:
-
             textbutton _("End Replay") action EndReplay(confirm=True)
 
         elif not main_menu:
-
             textbutton _("Main Menu") action SpheresMainMenu()
 
         textbutton _("About") action ShowMenu("about")
@@ -487,55 +482,41 @@ screen game_menu(title, scroll=None, yinitial=0.0):
     frame:
         style "game_menu_outer_frame"
 
-        hbox:
-
-            ## Reserve space for the navigation section.
-            frame:
-                style "game_menu_navigation_frame"
-
-            frame:
-                style "game_menu_content_frame"
-
-                if scroll == "viewport":
-
-                    viewport:
-                        yinitial yinitial
-                        scrollbars "vertical"
-                        mousewheel True
-                        draggable True
-                        pagekeys True
-
-                        side_yfill True
-
-                        vbox:
+        vbox:
+            null height 12
+            use navigation
+            null height 44
+            textbutton _("Return"):
+                style "return_button"
+
+                action Return()
+            null height 20
+            hbox:
+                frame:
+                    style "game_menu_content_frame"
+                    if scroll == "viewport":
+                        viewport:
+                            yinitial yinitial
+                            scrollbars "vertical"
+                            mousewheel True
+                            draggable True
+                            pagekeys True
+                            side_yfill True
+                            vbox:
+                                transclude
+                    elif scroll == "vpgrid":
+                        vpgrid:
+                            cols 1
+                            yinitial yinitial
+                            scrollbars "vertical"
+                            mousewheel True
+                            draggable True
+                            pagekeys True
+                            side_yfill True
                             transclude
-
-                elif scroll == "vpgrid":
-
-                    vpgrid:
-                        cols 1
-                        yinitial yinitial
-
-                        scrollbars "vertical"
-                        mousewheel True
-                        draggable True
-                        pagekeys True
-
-                        side_yfill True
-
+                    else:
                         transclude
 
-                else:
-
-                    transclude
-
-    use navigation
-
-    textbutton _("Return"):
-        style "return_button"
-
-        action Return()
-
     label title
 
     if main_menu:
@@ -559,7 +540,8 @@ style game_menu_outer_frame:
     bottom_padding 30
     top_padding 120
 
-    background Frame("gui/overlay/game_menu.png", 0, 0)
+    background Frame("gui/overlay/confirm.png", 0, 0)
+    #background Frame("gui/overlay/game_menu.png", 0, 0)
 
 style game_menu_navigation_frame:
     xsize 280
@@ -738,6 +720,11 @@ screen preferences():
 
                     bar value Preference("auto-forward time")
 
+                    if main_menu:
+                        null height 60
+                        textbutton _("Clear Cache"):
+                            action Jump("clear_cache")
+
                 vbox:
 
                     if config.has_music:
@@ -774,12 +761,6 @@ screen preferences():
                             style "mute_all_button"
 
                 if main_menu:
-                    vbox:
-                        style_prefix "check"
-                        null height 60
-                        textbutton _("Clear Cache"):
-                            action Jump("clear_cache")
-
                     hbox:
                         vbox:
                             style_prefix "check"
@@ -810,15 +791,15 @@ screen preferences():
                         textbutton _("Disable"):
                             action SetVariable("persistent.nothreading", True)
 
-                if renpy.android or config.developer:
-                    vbox:
-                        style_prefix "check"
-                        null height 60
-                        label _("Socket Error:")
-                        textbutton _("CRASH"):
-                            action SetVariable("persistent.fatality", True)
-                        textbutton _("Continue"):
-                            action SetVariable("persistent.fatality", None)
+                #if renpy.android or config.developer:
+                #    vbox:
+                #        style_prefix "check"
+                #        null height 60
+                #        label _("Socket Error:")
+                #        textbutton _("CRASH"):
+                #            action SetVariable("persistent.fatality", True)
+                #        textbutton _("Continue"):
+                #            action SetVariable("persistent.fatality", None)
 
                 if config.developer or debug:
                     vbox:
@@ -875,6 +856,12 @@ style slider_pref_vbox is pref_vbox
 style mute_all_button is check_button
 style mute_all_button_text is check_button_text
 
+style check_button_text:
+    size 32
+
+style navigation_button_text:
+    size 32
+
 style pref_label:
     top_margin gui.pref_spacing
     bottom_margin 2