Skip to content

Commit 6f9a995

Browse files
committed
fix: revert player mode progress bar fix
This reverts commit de289a9.
1 parent fcfd78f commit 6f9a995

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

scripts/control_draw/control_draw.gml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2200,11 +2200,9 @@ function control_draw() {
22002200
draw_set_halign(fa_left)
22012201
draw_set_alpha(1)
22022202

2203-
2204-
var bar_pos = min(marker_pos, enda)
22052203
if (isplayer) {
22062204
if (!dropmode) {
2207-
bar_pos = draw_dragbar(bar_pos, enda, rw / 2 - 200, rh / 2 + 25, 400, 1, time_str((clamp(((mouse_x - (rw / 2 - 200)) / 400) * enda, 0, enda)) / tempo), condstr(language != 1, "Song Position", "当前位置"), 0)
2205+
marker_pos = draw_dragbar(marker_pos, enda, rw / 2 - 200, rh / 2 + 25, 400, 1, time_str((clamp(((mouse_x - (rw / 2 - 200)) / 400) * enda, 0, enda)) / tempo), condstr(language != 1, "Song Position", "当前位置"), 0)
22082206
draw_set_halign(fa_left)
22092207
draw_theme_color()
22102208
if (blackout) draw_set_color(c_white)
@@ -2214,7 +2212,7 @@ function control_draw() {
22142212
dropalpha = 1
22152213
} else {
22162214
draw_set_alpha(dropalpha)
2217-
bar_pos = draw_dragbar(bar_pos, enda, 93 - 84 + 100, 52 + 15, 400, 1, time_str((clamp(((mouse_x - (93 - 84 + 100)) / 400) * enda, 0, enda)) / tempo), condstr(language != 1, "Song Position", "当前位置"), 0)
2215+
marker_pos = draw_dragbar(marker_pos, enda, 93 - 84 + 100, 52 + 15, 400, 1, time_str((clamp(((mouse_x - (93 - 84 + 100)) / 400) * enda, 0, enda)) / tempo), condstr(language != 1, "Song Position", "当前位置"), 0)
22182216
draw_set_alpha(1)
22192217
if (mouse_x != mouse_xprev || mouse_y != mouse_yprev || mouse_rectangle(0, 0, 530, 90) || window != 0) {
22202218
dropalpha = 1
@@ -2227,9 +2225,6 @@ function control_draw() {
22272225
draw_set_halign(fa_left)
22282226
}
22292227
}
2230-
if (marker_pos != bar_pos) { // User dragged the bar
2231-
marker_pos = bar_pos
2232-
}
22332228

22342229
if (!isplayer) {
22352230
// Bars-beats-sixteenths

0 commit comments

Comments
 (0)