Fixed issues mentioned in PR OpenNBS#247

Author: OctoFlareDev

scripts/control_draw/control_draw.gml

@@ -776,22 +776,26 @@ function control_draw() {
 	    a = starta
 	    b = startb
 	    if (mouse_x > x1 + 2 + 32 * totalcols - 32) {
-	        dragincxr += 0.1
+	        if (refreshrate >= 2) dragincxr += 0.025
+	        else dragincxr += 0.1
 	        dragincxr = min(dragincxr, 4)
 	        starta += ceil(dragincxr)
 	    } else dragincxr = 0
 	    if (mouse_x < x1 + 32) {
-	        dragincxl += 0.1
+	        if (refreshrate >= 2) dragincxl += 0.025
+	        else dragincxl += 0.1
 	        dragincxl = min(dragincxl, 4)
 	        starta -= ceil(dragincxl)
 	    } else dragincxl = 0
 	    if (mouse_y > y1 + 34 + totalrows * 32) {
-	        dragincyd += 0.1
+	        if (refreshrate >= 2) dragincyd += 0.025
+	        else dragincyd += 0.1
 	        dragincyd = min(dragincyd, 4)
 	        startb += ceil(dragincyd)
 	    } else dragincyd = 0
 	    if (mouse_y < y1 + 34 + 32) {
-	        dragincyu += 0.1
+	        if (refreshrate >= 2) dragincyu += 0.025
+	        else dragincyu += 0.1
 	        dragincyu = min(dragincyu, 4)
 	        startb -= ceil(dragincyu)
 	    } else dragincyu = 0
@@ -1479,16 +1483,18 @@ function control_draw() {
 
 	if (!fullscreen && show_layers) {
 		// Marker position
-		draw_set_halign(fa_right)
+		if (theme != 3) draw_set_halign(fa_right)
 		draw_theme_color()
 		draw_set_font(fnt_info_med_bold)
 		if (theme = 3) draw_set_font(fnt_wslui_info_med_bald)
-		draw_text(93, 52, time_str(marker_pos / tempo))
+		if (theme != 3) draw_text(93, 52, time_str(marker_pos / tempo))
+		else draw_text(93 - 84, 52, time_str(marker_pos / tempo))
 
 		// Song length
 		draw_set_font(fnt_small)
 		if (theme = 3) draw_set_font(fnt_wslui_small)
-		draw_text(93, 69, "/ " + time_str(enda / tempo))
+		if (theme != 3) draw_text(93, 69, "/ " + time_str(enda / tempo))
+		else draw_text(93 - 67, 69, "/ " + time_str(enda / tempo))
 		draw_set_font(fnt_main)
 		if (theme = 3) draw_set_font(fnt_wslui)
 

scripts/draw_button2/draw_button2.gml

@@ -20,7 +20,7 @@ function draw_button2() {
 		draw_sprite_ext(spr_button, 46, xx + 3, yy, w / 3 - 2, 1, 0, -1, 1)
 	    draw_sprite(spr_button, 45, xx, yy)
 	    draw_sprite(spr_button, 47, xx + w - 3, yy)
-	    draw_set_color(10526880)
+	    draw_set_color(8355711)
 		}
 	} else {
 	    m = mouse_rectangle(xx, yy, w, 23) && w_isdragging = 0

scripts/draw_text_url/draw_text_url.gml

@@ -23,7 +23,7 @@ function draw_text_url(argument0, argument1, argument2, argument3) {
 	}
 	if (theme != 3) draw_set_color(make_color_rgb(62, 144, 255))
 	draw_text_center(xx, yy, text)
-	if (theme != 3) draw_line(xx - floor(width/2) - 1, yy + 12, xx + ceil(width/2) - 1, yy + 13)
+	draw_line(xx - floor(width/2) - 1, yy + 12, xx + ceil(width/2) - 1, yy + 13)
 	draw_theme_color()
 
 

scripts/draw_window/draw_window.gml

@@ -1,15 +1,19 @@
-function draw_window(argument0, argument1, argument2, argument3) {
-	// draw_window(x1, y1, x2, y2)
-	var x1, y1, x2, y2;
-	x1 = argument0
-	y1 = argument1
-	x2 = argument2
-	y2 = argument3
+function draw_window() {
+	// draw_window(x1, y1, x2, y2[, sml])
+	var x1, y1, x2, y2, sml;
+	x1 = argument[0]
+	y1 = argument[1]
+	x2 = argument[2]
+	y2 = argument[3]
+	sml = 0
+	if (argument_count > 4) {
+		sml = argument[4]
+	}
 	draw_set_color(15790320)
 	if (theme = 1) draw_set_color(13160660)
 	if (theme = 2) draw_set_color(c_dark)
 	if (theme = 3) draw_set_color(c_white)
-	if (theme = 3) {
+	if (theme = 3 && sml = 0) {
 		draw_sprite(spr_shadow, 0, x1 - 16, y1 - 16)
 		draw_sprite_ext(spr_shadow, 1, x1 - 16, y1, 1, y2 - y1, 0, -1, 1)
 		draw_sprite(spr_shadow, 2, x1 - 16, y2 + 1)

scripts/draw_window_instruments/draw_window_instruments.gml

@@ -19,23 +19,24 @@ function draw_window_instruments() {
 	    draw_set_color(make_color_rgb(137, 140, 149))
 	    draw_rectangle(x1 + 12, y1 + 66, x1 + 535, y1 + 310, 1)
 	} else {
-	    draw_area(x1 + 11, y1 + 65, x1 + 535, y1 + 312)
+	    if (theme != 3) draw_area(x1 + 11, y1 + 65, x1 + 535, y1 + 312)
+	    else draw_area(x1 + 11, y1 + 67, x1 + 535, y1 + 312)
 	}
 	if (draw_button2(x1 + 455, y1 + 9, 80, "Import")) load_instruments("")
 	if (draw_button2(x1 + 455, y1 + 36, 80, "Open Folder")) open_url(sounds_directory)
 	// Tabs
-	draw_window(x1 + 13 + 194 + 160 + 80, y1 + 67, x1 + 14 + 194 + 160 + 80 + 88, y1 + 67 + 20)
-	popup_set_window(x1 + 13 + 194 + 160 + 80, y1 + 67, 88, 20, "Whether notes of this type should be\npressed when the marker reaches them.")
-	draw_text(x1 + 18 + 194 + 160 + 80, y1 + 70, "Press")
-	draw_window(x1 + 13 + 194 + 160, y1 + 67, x1 + 14 + 194 + 160 + 80, y1 + 67 + 20)
+	draw_window(x1 + 13 + 194 + 160 + 80, y1 + 67, x1 + 14 + 194 + 160 + 80 + 88 - 1, y1 + 67 + 20, 1)
+	popup_set_window(x1 + 13 + 194 + 160 + 80 - 1, y1 + 67, 88, 20, "Whether notes of this type should be\npressed when the marker reaches them.")
+	draw_text(x1 + 18 + 194 + 160 + 80 - 1, y1 + 70, "Press")
+	draw_window(x1 + 13 + 194 + 160, y1 + 67, x1 + 14 + 194 + 160 + 80, y1 + 67 + 20, 1)
 	popup_set_window(x1 + 13 + 194 + 160, y1 + 67, 80, 20, "The default key pitch of the sound file.")
 	draw_text(x1 + 18 + 194 + 160, y1 + 70, "Pitch")
-	draw_window(x1 + 13 + 194, y1 + 67, x1 + 14 + 194 + 160, y1 + 67 + 20)
+	draw_window(x1 + 13 + 194, y1 + 67, x1 + 14 + 194 + 160, y1 + 67 + 20, 1)
 	popup_set_window(x1 + 13 + 194, y1 + 67, 160, 20, "The sound file of this instrument.")
 	draw_text(x1 + 18 + 194, y1 + 70, "Sound")
-	draw_window(x1 + 13, y1 + 67, x1 + 14 + 194, y1 + 67 + 20)
-	popup_set_window(x1 + 13, y1 + 67, 194, 20, "The name of this instrument.")
-	draw_text(x1 + 18, y1 + 70, "Name")
+	draw_window(x1 + 13 - 2, y1 + 67, x1 + 14 + 194, y1 + 67 + 20, 1)
+	popup_set_window(x1 + 13 - 2, y1 + 67, 194, 20, "The name of this instrument.")
+	draw_text(x1 + 18 - 2, y1 + 70, "Name")
 
 	var sounds = 0;
 	for (var i = first_custom_index; i <= ds_list_size(instrument_list) - 1; i++) {

scripts/draw_window_preferences/draw_window_preferences.gml

@@ -142,15 +142,15 @@ function draw_window_preferences() {
 	        game_set_speed(60,gamespeed_fps)
 			refreshrate=1
 	    }
-		if (draw_radiobox(x1+274+64,y1+164+16,refreshrate == 2,"120FPS","Run the program at 120FPS.")) {
+		if (draw_radiobox(x1+274+64-6,y1+164+16,refreshrate == 2,"120FPS","Run the program at 120FPS.")) {
 			game_set_speed(120,gamespeed_fps)
 			refreshrate=2
 		}
-		if (draw_radiobox(x1+274+64,y1+164+16+20,refreshrate == 3,"144FPS","Run the program at 144FPS.")) {
+		if (draw_radiobox(x1+274+64-6,y1+164+16+20,refreshrate == 3,"144FPS","Run the program at 144FPS.")) {
 			game_set_speed(144,gamespeed_fps)
 			refreshrate=3
 		}
-		if (draw_radiobox(x1+274+128,y1+164+16+10,refreshrate == 4,"114514FPS","Choose this option with cautious (May cause very high CPU usage).")) {
+		if (draw_radiobox(x1+274+128-6,y1+164+16+10,refreshrate == 4,"Unlimited","Choose this option with cautious (May cause very high CPU usage).")) {
 			game_set_speed(114514,gamespeed_fps)
 			refreshrate=4
 		}