Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/PrincipalSpears/SnootGame into Monster-Update-6

This commit is contained in:
2021-07-01 01:45:35 -05:00
4 changed files with 19 additions and 17 deletions

View File

@ -385,7 +385,7 @@ screen main_menu():
imagebutton auto "gui/button/menubuttons/helpbutton_%s.png" action ShowMenu("extras")
imagebutton auto "gui/button/menubuttons/quitbutton_%s.png" action Quit(confirm=not main_menu)
# if gui.show_name:
#
# vbox:
@ -1531,24 +1531,28 @@ style pref_vbox:
## Since a mouse may not be present, we replace the quick menu with a version
## that uses fewer and bigger buttons that are easier to touch.
screen quick_button(filename, label, function):
button:
xmaximum 160
ymaximum 100
action function
fixed:
add filename xalign 0.5 yalign 0.5 zoom 1.75
text label xalign 0.5 yalign 0.5 size 42 color "#000000EE"
screen quick_menu():
variant "touch"
variant "small"
zorder 100
if quick_menu:
hbox:
style_prefix "quick"
xalign 0.5
yalign 1.0
textbutton _("Back") action Rollback()
textbutton _("Skip") action Skip() alternate Skip(fast=True, confirm=True)
textbutton _("Auto") action Preference("auto-forward", "toggle")
textbutton _("Menu") action ShowMenu()
yalign 0.975
use quick_button("gui/button/uioptionbuttons/template_idle.png", "Back", Rollback())
use quick_button("gui/button/uioptionbuttons/template_idle.png", "Skip", Skip()) #alternate Skip(fast=True, confirm=True))
use quick_button("gui/button/uioptionbuttons/template_idle.png", "Auto", Preference("auto-forward", "toggle"))
use quick_button("gui/button/uioptionbuttons/template_idle.png", "Menu", ShowMenu())
style window:
variant "small"