Merge remote-tracking branch 'origin/interface2' into kinetic_text

This commit is contained in:
Johnny28 2024-05-30 14:03:42 +02:00
commit 40a35cbc54
3 changed files with 68 additions and 42 deletions

View File

@ -5,7 +5,7 @@ label modal_popup(title, entry, img=None, confirm="Okay"):
$ enable_game_menu()
return
screen modal_popup(title, entry, img=None, confirm="Okay", xysize=(600, 350)):
screen modal_popup(title, entry, img=None, confirm="Okay"):
modal True
layer "interface"
zorder 5
@ -17,17 +17,15 @@ screen modal_popup(title, entry, img=None, confirm="Okay", xysize=(600, 350)):
frame:
at gui_modal_popup
xysize xysize
label title
vbox:
ypos 20
add img xalign 0.5
text entry
textbutton confirm align (1.0, 1.0) action Return(True)
textbutton confirm action Return(True)
transform gui_fade:
@ -51,6 +49,8 @@ image gui_fade_both = Fixed(Frame(Image("gui/creamy_pumpkin_pie/fade_top.png", o
style frame is empty:
align (0.5, 0.5)
yminimum 200
maximum (600, 450)
fit_first True
xfill False
yfill False
@ -61,6 +61,7 @@ style frame_vbox:
xalign 0.5
first_spacing 0
yspacing 5
ypos 30
fit_first True
xfill False
yfill False
@ -75,12 +76,20 @@ style frame_label_text is who:
outlines [(2, "#000000", 1, 1)]
style frame_text is what:
xalign 0.5
xoffset 0
ypos 0
xsize None
color "#fff"
outlines [(1, "#000000", 1, 1)]
hinting "bytecode"
size 12
size 16
xmaximum 500
style frame_button is button:
hover_background Frame(Image("gui/creamy_pumpkin_pie/choice_alt.png", oversample=4), 0, 4, 0, 4, tile=False)
xpadding 25
align (0.5, 1.0)
style frame_button_text is choice_text:
align (0.5, 0.5)

View File

@ -15,17 +15,14 @@ screen confirm(message, yes_action=Return(True), no_action=Return(False)):
modal True
layer "interface"
zorder 5
style_prefix "frame"
style_prefix "confirm"
add "gui_fade_both" at gui_fade
frame:
at gui_modal_popup
xysize (500, 250)
vbox:
ypos 20
text message
hbox:
@ -35,6 +32,17 @@ screen confirm(message, yes_action=Return(True), no_action=Return(False)):
## Right-click and escape answer "no".
key "game_menu" action no_action
style confirm_frame is frame
style confirm_vbox is frame_vbox
style confirm_hbox:
fit_first True
align (0.5, 1.0)
spacing 25
style confirm_button is frame_button
style confirm_button_text is frame_button_text
style confirm_text is frame_text:
size 20
# Skip indicator screen
#
# The skip_indicator screen is displayed to indicate that skipping is in

View File

@ -153,23 +153,31 @@ screen choice(items):
variant "pc"
default has_icons = any(x is not None for x in [e.kwargs.get("icon", None) for e in items])
default columns = math.ceil(len(items) / 12)
vbox:
hbox:
at gui_choice_show_hide
for i, entry in enumerate(items, 1):
$ scale = (1.0 * (32 / max(32, len(entry.caption))))
for column in range(columns):
vbox:
$ start_index = column * 12
$ end_index = start_index + 12
for i, entry in enumerate(items[start_index:end_index], 1):
$ scale = (1.0 * (28 / max(28, len(entry.caption))))
$ icon = entry.kwargs.get("icon", None)
$ progress = entry.kwargs.get("progress", None)
vbox:
spacing 2
button:
action entry.action
# Handle columns
if columns > 1:
xmaximum (config.screen_width // columns)
if i < 10 and entry.action:
keysym ("K_"+str(i), "K_KP"+str(i))
text "[i]" style "choice_number":
text "[i+start_index]" style "choice_number":
at gui_perspective
hbox:
@ -257,12 +265,13 @@ style choice_button is button
style choice_button_text is button_text
style choice_vbox:
xalign 0.5
yanchor 1.0
ypos 0.75
align (0.5, 1.0)
spacing 10
style choice_hbox:
xalign 0.5
yanchor 1.0
ypos 0.75
spacing 2
style choice_button: