Apply no outside window cursor change to all windows

OctoFlareDev · OctoFlareDev · commit 94933ccd5cd4 · 2022-07-07T19:10:08.000+08:00
diff --git a/scripts/draw_window_about/draw_window_about.gml b/scripts/draw_window_about/draw_window_about.gml
@@ -89,5 +89,7 @@ function draw_window_about() {
 	if (draw_button2(x1 + 580 - 72 - 8, y1 + 380, 72, condstr(language != 1, "OK", "确定"), false) && (windowopen = 1 || theme != 3)) {
 		windowclose = 1
 	}
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_audio_export/draw_window_audio_export.gml b/scripts/draw_window_audio_export/draw_window_audio_export.gml
@@ -96,7 +96,9 @@ function draw_window_mp3_export() {
 		windowclose = 1
 	}
 	
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
 
 
diff --git a/scripts/draw_window_branch_export/draw_window_branch_export.gml b/scripts/draw_window_branch_export/draw_window_branch_export.gml
@@ -451,6 +451,8 @@ function draw_window_branch_export() {
 	        menu.menua = menua
 	    }
 	}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_clip_editor/draw_window_clip_editor.gml b/scripts/draw_window_clip_editor/draw_window_clip_editor.gml
@@ -27,6 +27,8 @@ function draw_window_clip_editor() {
 	if (draw_button2(x1 + 320, y1 + 398, 72, condstr(language != 1, "OK", "确定")) && (windowopen = 1 || theme != 3)) {
 		windowclose = 1
 	}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_greeting/draw_window_greeting.gml b/scripts/draw_window_greeting/draw_window_greeting.gml
@@ -211,8 +211,10 @@ function draw_window_greeting() {
 		else open_url("https://www.bilibili.com/video/BV1Mx411a76p")
 	}
 
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 	if (!isplayer) if (draw_icon(4, x1 + 700 - 40, y1 + 430 - 40, condstr(language != 1, "Player Mode", "播放器模式"), 0, 0, 1)) {
 		isplayer = 1 //Go into player mode if button is pressed in the greeting screen
 		//window_set_size(floor(800 * window_scale), floor(500 * window_scale))
diff --git a/scripts/draw_window_instruments/draw_window_instruments.gml b/scripts/draw_window_instruments/draw_window_instruments.gml
@@ -241,7 +241,9 @@ function draw_window_instruments() {
 	draw_line(x1 + 13 + 194 + 160, y1 + 87, x1 + 13 + 194 + 160, y1 + 86 + 20 * a)
 	draw_line(x1 + 13 + 194 + 160 + 80, y1 + 87, x1 + 13 + 194 + 160 + 80, y1 + 86 + 20 * a)
 	draw_scrollbar(insscrollbar, x1 + 14 + 194 + 160 + 80 + 70, y1 + 88, 21, 9, ds_list_size(instrument_list) - 2, 0, 1)
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 	
 }
diff --git a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml
@@ -68,7 +68,9 @@ function draw_window_macro_arpeggio() {
 		selection_code_update()
 	}
 	if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 
 }
diff --git a/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml b/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml
@@ -60,6 +60,8 @@ function draw_window_macro_portamento() {
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
 	if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml b/scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml
@@ -51,6 +51,8 @@ function draw_window_macro_setpanning() {
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
 	if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml b/scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml
@@ -54,6 +54,8 @@ function draw_window_macro_setpitch() {
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
 	if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml b/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml
@@ -54,6 +54,8 @@ function draw_window_macro_setvelocity() {
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
 	if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language != 1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml
@@ -92,6 +92,8 @@ function draw_window_macro_stagger() {
 		history_set(h_selectchange, selection_x, selection_y, selection_code, selection_x, selection_y, str)
 	}
 	if (draw_button2(x1 + 75, y1 + 128, 60, condstr(language != 1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml b/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml
@@ -72,6 +72,8 @@ function draw_window_macro_stereo() {
 		if(!keyboard_check(vk_alt)) selection_place(false)
 	}
 	if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language != 1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml b/scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml
@@ -76,6 +76,8 @@ function draw_window_macro_tremolo() {
 		window = 0
 	}
 	if (draw_button2(x1 + 80, y1 + 215, 60, condstr(language != 1, "Cancel", "取消")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_midi_import/draw_window_midi_import.gml b/scripts/draw_window_midi_import/draw_window_midi_import.gml
@@ -423,6 +423,8 @@ function draw_window_midi_import() {
 	if (w_midi_tab > 2) w_midi_tab = 0
 	draw_theme_color()
 	if (wmenu = 1 && !mouse_check_button(mb_left)) wmenu = 0
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_mididevices/draw_window_mididevices.gml b/scripts/draw_window_mididevices/draw_window_mididevices.gml
@@ -84,6 +84,8 @@ function draw_window_mididevices() {
 	draw_set_color(12632256)
 	draw_line(x1 + 18 + 250 + 70, y1 + 87, x1 + 18 + 250 + 70, y1 + 86 + 20 * a)
 	draw_line(x1 + 18 + 250 + 70 + 64 + 85, y1 + 87, x1 + 18 + 250 + 70 + 64 + 85, y1 + 86 + 20 * a)
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_minecraft/draw_window_minecraft.gml b/scripts/draw_window_minecraft/draw_window_minecraft.gml
@@ -411,5 +411,7 @@ function draw_window_minecraft() {
 	}
 	
 	if (draw_button2(x1 + 240 - 36, y1 + 413, 72, condstr(language != 1, "OK", "确定")) && (windowopen = 1 || theme != 3)) windowclose = 1
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_properties/draw_window_properties.gml b/scripts/draw_window_properties/draw_window_properties.gml
@@ -98,6 +98,8 @@ function draw_window_properties() {
 	draw_theme_color()
 
 	if (draw_button2(x1 + 430 - 72, y1 + 366, 72, condstr(language != 1, "OK", "确定")) && (windowopen = 1 || theme != 3)) {windowclose = 1}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_save_options/draw_window_save_options.gml b/scripts/draw_window_save_options/draw_window_save_options.gml
@@ -55,6 +55,8 @@ function draw_window_save_options() {
 		windowclose = 1
 		}
 	}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_schematic_export/draw_window_schematic_export.gml b/scripts/draw_window_schematic_export/draw_window_schematic_export.gml
@@ -466,6 +466,8 @@ function draw_window_schematic_export() {
 	        menu.menua = menua
 	    }
 	}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_set_accent/draw_window_set_accent.gml b/scripts/draw_window_set_accent/draw_window_set_accent.gml
@@ -149,6 +149,8 @@ function draw_window_set_accent() {
 			else message("请输入一个有效的数字！", "设置主题颜色")
 		}
 	}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_songinfo/draw_window_songinfo.gml b/scripts/draw_window_songinfo/draw_window_songinfo.gml
@@ -139,5 +139,7 @@ function draw_window_songinfo() {
 			windowclose = 1
 		}
 	}
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_stats/draw_window_stats.gml b/scripts/draw_window_stats/draw_window_stats.gml
@@ -69,5 +69,7 @@ function draw_window_stats() {
 	}
 	if (draw_button2(x1 + 220, y1 + 368, 72, "确定") && (windowopen = 1 || theme != 3)) windowclose = 1
 	}
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_tempo_tapper/draw_window_tempo_tapper.gml b/scripts/draw_window_tempo_tapper/draw_window_tempo_tapper.gml
@@ -68,6 +68,8 @@ function draw_window_tempo_tapper() {
 		ltime = 0
 		windowclose = 1
 	}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_track_export/draw_window_track_export.gml b/scripts/draw_window_track_export/draw_window_track_export.gml
@@ -407,6 +407,8 @@ function draw_window_track_export() {
 	        menu.menua = menua
 	    }
 	}
-	window_set_cursor(curs)
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		window_set_cursor(curs)
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/draw_window_update/draw_window_update.gml b/scripts/draw_window_update/draw_window_update.gml
@@ -73,5 +73,7 @@ function draw_window_update() {
 	        windowclose = 1
 	    }
 	}
-	if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	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) {
+		if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)
+	}
 }
diff --git a/scripts/macros/macros.gml b/scripts/macros/macros.gml
@@ -1,6 +1,6 @@
 function macros() {
 #macro gm_runtime_version "2022.6.0.23"
-#macro version_date "2022.06.23"
+#macro version_date "2022.07.07"
 #macro version "3.10.0-beta.3"
 #macro is_prerelease 1 // remember to change to 0 in the release!
 #macro nbs_version 5

Original file line number	Diff line number	Diff line change
`@@ -89,5 +89,7 @@ function draw_window_about() {`
`89`	`89`	`if (draw_button2(x1 + 580 - 72 - 8, y1 + 380, 72, condstr(language != 1, "OK", "确定"), false) && (windowopen = 1 \|\| theme != 3)) {`
`90`	`90`	`windowclose = 1`
`91`	`91`	`}`
`92`		`- if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`92`	`+ 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) {`
	`93`	`+ if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`94`	`+ }`
`93`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,9 @@ function draw_window_mp3_export() {`
`96`	`96`	`windowclose = 1`
`97`	`97`	`}`
`98`	`98`
`99`		`- if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`99`	`+ 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) {`
	`100`	`+ if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`101`	`+ }`
`100`	`102`	`}`
`101`	`103`
`102`	`104`
Original file line number	Diff line number	Diff line change
`@@ -451,6 +451,8 @@ function draw_window_branch_export() {`
`451`	`451`	`menu.menua = menua`
`452`	`452`	`}`
`453`	`453`	`}`
`454`		`- window_set_cursor(curs)`
`455`		`- if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`454`	`+ 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) {`
	`455`	`+ window_set_cursor(curs)`
	`456`	`+ if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`457`	`+ }`
`456`	`458`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ function draw_window_clip_editor() {`
`27`	`27`	`if (draw_button2(x1 + 320, y1 + 398, 72, condstr(language != 1, "OK", "确定")) && (windowopen = 1 \|\| theme != 3)) {`
`28`	`28`	`windowclose = 1`
`29`	`29`	`}`
`30`		`- window_set_cursor(curs)`
`31`		`- if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`30`	`+ 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) {`
	`31`	`+ window_set_cursor(curs)`
	`32`	`+ if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`33`	`+ }`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,9 @@ function draw_window_macro_arpeggio() {`
`68`	`68`	`selection_code_update()`
`69`	`69`	`}`
`70`	`70`	`if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 \|\| theme != 3)) {windowclose = 1}`
`71`		`- window_set_cursor(curs)`
`72`		`- if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`71`	`+ 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) {`
	`72`	`+ window_set_cursor(curs)`
	`73`	`+ if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`74`	`+ }`
`73`	`75`
`74`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ function draw_window_macro_portamento() {`
`60`	`60`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`61`	`61`	`}`
`62`	`62`	`if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 \|\| theme != 3)) {windowclose = 1}`
`63`		`- window_set_cursor(curs)`
`64`		`- if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`63`	`+ 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) {`
	`64`	`+ window_set_cursor(curs)`
	`65`	`+ if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`66`	`+ }`
`65`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ function draw_window_macro_setpanning() {`
`51`	`51`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`52`	`52`	`}`
`53`	`53`	`if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 \|\| theme != 3)) {windowclose = 1}`
`54`		`- window_set_cursor(curs)`
`55`		`- if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`54`	`+ 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) {`
	`55`	`+ window_set_cursor(curs)`
	`56`	`+ if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`57`	`+ }`
`56`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ function draw_window_macro_setpitch() {`
`54`	`54`	`if(!keyboard_check(vk_alt)) selection_place(false)`
`55`	`55`	`}`
`56`	`56`	`if (draw_button2(x1 + 70, y1 + 98, 60, condstr(language !=1, "Cancel", "取消")) && (windowopen = 1 \|\| theme != 3)) {windowclose = 1}`
`57`		`- window_set_cursor(curs)`
`58`		`- if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`57`	`+ 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) {`
	`58`	`+ window_set_cursor(curs)`
	`59`	`+ if (array_length(text_mouseover) = 0) window_set_cursor(cr_default)`
	`60`	`+ }`
`59`	`61`	`}`