Skip to content

Commit 0f195cc

Browse files
committed
fix: add label about setting loop end point to preferences
1 parent 3c54fd6 commit 0f195cc

1 file changed

Lines changed: 26 additions & 18 deletions

File tree

scripts/draw_window_properties/draw_window_properties.gml

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ function draw_window_properties() {
66
curs = cr_default
77
text_exists[0] = 0
88
x1 = floor(rw / 2 - 220)
9-
y1 = floor(rh / 2 - 200) + windowoffset
10-
draw_window(x1, y1, x1 + 440, y1 + 400)
9+
y1 = floor(rh / 2 - 240) + windowoffset
10+
draw_window(x1, y1, x1 + 440, y1 + 420)
1111
draw_theme_font(font_main_bold)
1212
if (language != 1) draw_text_dynamic(x1 + 8, y1 + 8, "Song Properties")
1313
else draw_text_dynamic(x1 + 8, y1 + 8, "歌曲属性")
1414
draw_theme_font(font_main)
1515
if (theme = 0) {
1616
draw_set_color(c_white)
17-
draw_rectangle(x1 + 6, y1 + 26, x1 + 434, y1 + 359, 0)
17+
draw_rectangle(x1 + 6, y1 + 26, x1 + 434, y1 + 379, 0)
1818
draw_set_color(make_color_rgb(137, 140, 149))
19-
draw_rectangle(x1 + 6, y1 + 26, x1 + 434, y1 + 359, 1)
19+
draw_rectangle(x1 + 6, y1 + 26, x1 + 434, y1 + 379, 1)
2020
}
2121
if (language != 1) draw_areaheader(x1 + 22, y1 + 48, 396, 200, "Information")
2222
else draw_areaheader(x1 + 22, y1 + 48, 396, 200, "信息")
@@ -56,7 +56,7 @@ function draw_window_properties() {
5656
if (a != song_desc) changed = 1
5757

5858
draw_theme_color()
59-
if (language != 1) draw_areaheader(x1 + 22, y1 + 268, 396, 85, "Playback")
59+
if (language != 1) draw_areaheader(x1 + 22, y1 + 268, 396, 105, "Playback")
6060
else draw_areaheader(x1 + 22, y1 + 268, 396, 85, "播放")
6161

6262
if (language != 1) draw_text_dynamic(x1 + 37, y1 + 285, "Time signature:")
@@ -69,35 +69,43 @@ function draw_window_properties() {
6969
else popup_set_window(x1 + 37, y1 + 283, 110, 18, "乐曲的拍号。")
7070

7171
a = loop
72-
if (language != 1) {if (draw_checkbox(x1 + 232, y1 + 285, loop, "Enable looping", "Whether to loop this song back to"+br+"the start at the end of playback.", false, true)) loop=!loop}
73-
else {if (draw_checkbox(x1 + 232, y1 + 285, loop, "启用循环", "是否在播放结尾循环至开始处。", false, true)) loop=!loop}
72+
if (language != 1) {if (draw_checkbox(x1 + 252, y1 + 285, loop, "Enable looping", "Whether to loop this song back to"+br+"the start at the end of playback.", false, true)) loop=!loop}
73+
else {if (draw_checkbox(x1 + 252, y1 + 285, loop, "启用循环", "是否在播放结尾循环至开始处。", false, true)) loop=!loop}
7474
if (a != loop) changed = 1
7575
if (!loop) draw_set_color(c_gray)
76-
if (language != 1) draw_text_dynamic(x1 + 232, y1 + 305, "Loop start tick:")
77-
else draw_text_dynamic(x1 + 232, y1 + 305, "循环开始刻:")
76+
if (language != 1) draw_text_dynamic(x1 + 252, y1 + 305, "Loop start tick:")
77+
else draw_text_dynamic(x1 + 252, y1 + 305, "循环开始刻:")
7878
a = loopstart
7979
if (loop) {
80-
loopstart = median(0, draw_dragvalue(7, x1 + 320, y1 + 305, loopstart, 0.5), obj_controller.enda)
80+
loopstart = median(0, draw_dragvalue(7, x1 + 340, y1 + 305, loopstart, 0.5), obj_controller.enda)
8181
} else {
82-
draw_text_dynamic(x1 + 320, y1 + 305, loopstart)
82+
draw_text_dynamic(x1 + 340, y1 + 305, loopstart)
8383
}
8484
if (a != loopstart) changed = 1
8585

86-
if (language != 1) draw_text_dynamic(x1 + 232, y1 + 325, "Times to loop:")
87-
else draw_text_dynamic(x1 + 232, y1 + 325, "循环次数:")
86+
if (language != 1) draw_text_dynamic(x1 + 252, y1 + 325, "Times to loop:")
87+
else draw_text_dynamic(x1 + 252, y1 + 325, "循环次数:")
8888
a = loopmax
8989
if (loop) {
90-
loopmax = median(0, draw_dragvalue(13, x1 + 320, y1 + 325, loopmax, 0.5), 10)
90+
loopmax = median(0, draw_dragvalue(13, x1 + 340, y1 + 325, loopmax, 0.5), 10)
9191
} else {
92-
draw_text_dynamic(x1 + 320, y1 + 325, loopmax)
92+
draw_text_dynamic(x1 + 340, y1 + 325, loopmax)
9393
}
94-
if (language != 1) {if (loopmax = 0) draw_text_dynamic(x1 + 340, y1 + 325, "(infinite)")}
95-
else {if (loopmax = 0) draw_text_dynamic(x1 + 340, y1 + 325, "(无限)")}
94+
if (language != 1) {if (loopmax = 0) draw_text_dynamic(x1 + 360, y1 + 325, "(infinite)")}
95+
else {if (loopmax = 0) draw_text_dynamic(x1 + 360, y1 + 325, "(无限)")}
9696
if (a != loopmax) changed = 1
9797
timestoloop = loopmax
98+
99+
if (loop) {
100+
draw_set_color(c_orange)
101+
draw_theme_font(font_small)
102+
draw_text_dynamic(x1 + 37, y1 + 315, "Warning: the 'Loop to bar end' setting was\nremoved to make playback consistent!\nTo make sure your song loops at the right\npoint, add a silent note at the end.")
103+
}
104+
105+
draw_theme_font(font_main)
98106
draw_theme_color()
99107

100-
if (draw_button2(x1 + 430 - 72, y1 + 366, 72, condstr(language != 1, "OK", "确定")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
108+
if (draw_button2(x1 + 430 - 72, y1 + 386, 72, condstr(language != 1, "OK", "确定")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
101109
if (display_mouse_get_x() - window_get_x() >= 0 && display_mouse_get_y() - window_get_y() >= 0 && display_mouse_get_x() - window_get_x() < 0 + window_width && display_mouse_get_y() - window_get_y() < 0 + window_height) {
102110
window_set_cursor(curs)
103111
if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)

0 commit comments

Comments
 (0)