Skip to content

Commit a7d5d96

Browse files
committed
fix: make blackout mode available in drop mode
Fixes #404
1 parent 7a12585 commit a7d5d96

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

scripts/control_draw/control_draw.gml

+7-4
Original file line numberDiff line numberDiff line change
@@ -339,17 +339,19 @@ function control_draw() {
339339
}
340340
}
341341
}
342-
if (!isplayer) {
343342
if (blackout) {
344343
draw_set_color(c_black)
345-
draw_rectangle(x1 + 2, y1 + 34, x1 + 2 + 32 * totalcols, y1 + 34 + 32 * totalrows, false)
344+
if (!isplayer) {
345+
draw_rectangle(x1 + 2, y1 + 34, x1 + 2 + 32 * totalcols, y1 + 34 + 32 * totalrows, false)
346+
} else {
347+
draw_clear(c_black)
348+
}
346349
}
347-
if (theme = 3 && !blackout) {
350+
if (!isplayer && theme = 3 && !blackout) {
348351
draw_set_color(16382457)
349352
if (fdark) draw_set_color(2565927)
350353
draw_rectangle(x1 + 2, y1 + 34, x1 + 2 + 32 * totalcols, y1 + 34 + 32 * totalrows, false)
351354
}
352-
}
353355
note_offset = floor(((marker_pos - floor(marker_pos + 0.5 * !isplayer)) * 32) + 0.5) * ((playing && marker_follow && marker_pagebypage = 2 && (marker_pos - floor(totalcols / 2 + 0.5) < enda + 1 && marker_pos - floor(totalcols / 2 + 0.5) > 0)) || isplayer)
354356
if (!isplayer) {
355357
for (a = 0; a < totalcols; a += 1) {
@@ -397,6 +399,7 @@ function control_draw() {
397399
draw_theme_color()
398400
}
399401
} else if (dropmode) {
402+
// Drop mode notes
400403
for (a = 0; a < totalcols; a += 1) {
401404
for (b = 0; b <= endb; b += 1) {
402405
if (floor(starta) + a <= enda) {

scripts/draw_window_preferences/draw_window_preferences.gml

+2-2
Original file line numberDiff line numberDiff line change
@@ -333,12 +333,12 @@ function draw_window_preferences() {
333333
//if (draw_radiobox(x1 + 40, y1 + (theme = 3) * 22 + 164 + 16 + 20 + 20, theme == 1, "90s", "Use the 90s theme.")) {theme = 1 change_theme()}
334334
//if (draw_radiobox(x1 + 40, y1 + (theme = 3) * 22 + 164 + 16 + 20 + 20 + 20, theme == 3, "Fluent", "Use the fluent theme.")) {theme = 3 change_theme()}
335335
if (language != 1) {
336-
if (!isplayer) if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 20 + 20 + 25, blackout, "Blackout mode", "Makes the workspace background solid black, so you can\nremove in your video editor when recording the screen.", false, true)) blackout = !blackout
336+
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 20 + 20 + 25, blackout, "Blackout mode", "Makes the workspace background solid black, so you can\nremove in your video editor when recording the screen.", false, true)) blackout = !blackout
337337
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 25, windowsound, "Navigation sound", "Whether to play sound effects when navigating the interface.\n(Only applies to the Fluent theme.)", (theme != 3), true)) windowsound = !windowsound
338338
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 25, fdark, "Dark mode", "Whether to use darker colors on the interface.\n(Only applies to the Fluent theme.)", (theme != 3), true)) {fdark = !fdark if (fdark) window_set_darkmode() else window_unset_darkmode()}
339339
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 20 + 25, acrylic, "Transparency effects", "Whether to show transparency effects on the interface.\n(Only applies to the Fluent theme.)", (theme != 3), true)) {acrylic = !acrylic change_theme()}
340340
} else {
341-
if (!isplayer) if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 20 + 20 + 25, blackout, "全黑模式", "使背景变为纯黑色,可以用于剪辑时扣掉。", false, true)) blackout = !blackout
341+
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 20 + 20 + 25, blackout, "全黑模式", "使背景变为纯黑色,可以用于剪辑时扣掉。", false, true)) blackout = !blackout
342342
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 25, windowsound, "界面音效", "是否在浏览时播放音效。\n(仅限 Fluent 主题)", (theme != 3), true)) windowsound = !windowsound
343343
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 25, fdark, "暗色模式", "是否在界面上使用暗色调。\n(仅限 Fluent 主题)", (theme != 3), true)) {fdark = !fdark if (fdark) window_set_darkmode() else window_unset_darkmode()}
344344
if (draw_checkbox(x1 + 40, y1 + (theme = 3) * 22 + 74 + 16 + 20 + 20 + 20 + 25, acrylic, "透明效果", "是否在界面上显示透明效果。\n(仅限 Fluent 主题)", (theme != 3), true)) {acrylic = !acrylic change_theme()}

0 commit comments

Comments
 (0)