diff options
| -rw-r--r-- | game/gui.rpy | 20 | ||||
| -rw-r--r-- | game/screens.rpy | 125 |
2 files changed, 66 insertions, 79 deletions
diff --git a/game/gui.rpy b/game/gui.rpy index 22cb832..1025d2d 100644 --- a/game/gui.rpy +++ b/game/gui.rpy @@ -224,7 +224,7 @@ define gui.choice_button_text_insensitive_color = "#444444" define gui.slot_button_width = 276 define gui.slot_button_height = 206 define gui.slot_button_borders = Borders(10, 10, 10, 10) -define gui.slot_button_text_size = 14 +define gui.slot_button_text_size = 18 define gui.slot_button_text_xalign = 0.5 define gui.slot_button_text_idle_color = gui.idle_small_color define gui.slot_button_text_selected_idle_color = gui.selected_color @@ -261,7 +261,7 @@ define gui.choice_spacing = 22 define gui.navigation_spacing = 4 ## Controls the amount of spacing between preferences. -define gui.pref_spacing = 10 +define gui.pref_spacing = 40 ## Controls the amount of spacing between preference buttons. define gui.pref_button_spacing = 0 @@ -424,12 +424,12 @@ init python: if renpy.variant("small") or True: ## Font sizes. - gui.text_size = 30 - gui.name_text_size = 36 - gui.notify_text_size = 25 - gui.interface_text_size = 30 - gui.button_text_size = 30 - gui.label_text_size = 34 + gui.text_size = 36 + gui.name_text_size = 40 + gui.notify_text_size = 27 + gui.interface_text_size = 36 + gui.button_text_size = 36 + gui.label_text_size = 38 ## Adjust the location of the textbox. gui.textbox_height = 240 @@ -443,12 +443,12 @@ init python: gui.choice_button_width = 1240 gui.navigation_spacing = 20 - gui.pref_button_spacing = 10 + gui.pref_button_spacing = 12 gui.history_height = 190 gui.history_text_width = 690 - gui.quick_button_text_size = 20 + gui.quick_button_text_size = 24 ## File button layout. gui.file_slot_cols = 2 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 |