Skip to content

Commit 11f5423

Browse files
committed
Improve contrast of some colors in dark theme
- Layers without a name now display the default text in gray (as in light mode) - Changed link colors in greeting window to a lighter blue (better contrast in dark mode and still readable in light mode) - Changed green text to be lime in dark mode. Affects: up to date text in greeting window, "Compatible" indicator, reports in the Compatibility window.
1 parent 41d5c68 commit 11f5423

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

scripts/control_draw/control_draw.gml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ for (b = 0; b < totalrows; b += 1) {
829829
layername[startb + b] = draw_text_edit(100 + startb + b, layername[startb + b], x1 + 11, y1 + 10, 72, 14, 1, 0)
830830
if (layername[startb + b] = "") {
831831
draw_set_color(c_gray)
832-
if(theme = 2) draw_set_color(c_white)
832+
if(theme = 2) draw_set_color(make_color_rgb(160, 160, 160))
833833
draw_text(x1 + 11, y1 + 10, "Layer " + string(startb + b + 1))
834834
}
835835
draw_theme_color()
@@ -1122,6 +1122,7 @@ if (compatible = 1) {
11221122
draw_sprite(spr_minecraft, 0, rw - 30, 25)
11231123
draw_sprite(spr_minecraft, 0, rw - 59, 25)
11241124
draw_set_color(c_green)
1125+
if (theme == 2) draw_set_color(c_lime)
11251126
draw_text(rw - 166, 28, "Fully compatible")
11261127
draw_theme_color()
11271128
draw_set_font(fnt_main)

scripts/draw_window_greeting/draw_window_greeting.gml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ if (check_update) {
2323
}
2424
if (update = 2) {
2525
draw_set_color(c_green)
26+
if (theme == 2) draw_set_color(c_lime)
2627
draw_text_center(x1 + 132, y1 + 248, "You are using the latest version!")
2728
}
2829
if (update = 3) {
29-
draw_set_color(c_green)
30+
draw_set_color(c_lime)
3031
draw_text_center(x1 + 132, y1 + 248, "Successfully updated!")
3132
}
3233
} else {
@@ -37,7 +38,7 @@ draw_set_font(fnt_main)
3738
draw_theme_color()
3839
draw_text_center(x1 + 132, y1 + 233, "Version " + version + " - Released " + version_date)
3940
draw_text_center(x1 + 132, y1 + 280, "Open source Minecraft Note Block Studio")
40-
draw_set_color(c_blue)
41+
draw_set_color(make_color_rgb(62, 144, 255))
4142
draw_text_center(x1 + 132, y1 + 296, "www.git.io/fjQH3")
4243
draw_line(x1 + 85, y1 + 309, x1 + 177, y1 + 309)
4344

@@ -50,7 +51,7 @@ if (a) {
5051

5152
draw_theme_color()
5253
draw_text_center(x1 + 132, y1 + 340, "Original created by David Norgren")
53-
draw_set_color(c_blue)
54+
draw_set_color(make_color_rgb(62, 144, 255))
5455
draw_text_center(x1 + 132, y1 + 356, "www.stuffbydavid.com")
5556
draw_line(x1 + 70, y1 + 369, x1 + 193, y1 + 369)
5657
a = mouse_rectangle(x1 + 71, y1 + 358, 123, 12)

scripts/draw_window_minecraft/draw_window_minecraft.gml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ if (selected_tab_mc = 0) { // Schematic
8787

8888
if (tempo = 10 || tempo = 5 || tempo = 2.5) {
8989
draw_set_color(c_green)
90+
if (theme == 2) draw_set_color(c_lime)
9091
draw_text(x1 + 45, yy + 16, "The tempo is " + string(tempo) + " ticks per second.")
9192
} else {
9293
draw_set_color(c_red)
@@ -126,6 +127,7 @@ if (selected_tab_mc = 0) { // Schematic
126127
}
127128
} else {
128129
draw_set_color(c_green)
130+
if (theme == 2) draw_set_color(c_lime)
129131
draw_text(x1 + 45, yy + 16, "There are no blocks outside the 2 octave range.")
130132
}
131133
draw_theme_color()
@@ -145,6 +147,7 @@ if (selected_tab_mc = 0) { // Schematic
145147
}
146148
} else {
147149
draw_set_color(c_green)
150+
if (theme == 2) draw_set_color(c_lime)
148151
draw_text(x1 + 45, yy + 16, "There are no blocks with custom instruments.")
149152
}
150153
draw_theme_color()
@@ -158,6 +161,7 @@ if (selected_tab_mc = 0) { // Schematic
158161
if (tempo = 20 || tempo = 10 || tempo = 5 || tempo = 4 || tempo = 2.5 || tempo = 2 || tempo = 1.25 || tempo = 1 || tempo = 0.5 || tempo = 0.25) {
159162
draw_sprite(spr_yesno, 1, x1 + 25, yy + 8)
160163
draw_set_color(c_green)
164+
if (theme == 2) draw_set_color(c_lime)
161165
draw_text(x1 + 45, yy + 32, "The tempo is " + string(tempo) + " ticks per second.")
162166
} else {
163167
draw_sprite(spr_yesno, 2, x1 + 25, yy + 8)
@@ -207,6 +211,7 @@ if (selected_tab_mc = 0) { // Schematic
207211
} else {
208212
draw_sprite(spr_yesno, 1, x1 + 25, yy + 8)
209213
draw_set_color(c_green)
214+
if (theme == 2) draw_set_color(c_lime)
210215
draw_text(x1 + 45, yy + 32, "There are no blocks outside the 2 octave range.")
211216
}
212217
draw_theme_color()
@@ -228,6 +233,7 @@ if (selected_tab_mc = 0) { // Schematic
228233
} else {
229234
draw_sprite(spr_yesno, 1, x1 + 25, yy + 8)
230235
draw_set_color(c_green)
236+
if (theme == 2) draw_set_color(c_lime)
231237
draw_text(x1 + 45, yy + 32, "There are no blocks with custom instruments.")
232238
}
233239
draw_theme_color()

0 commit comments

Comments
 (0)