Reset window when only window = 0

OctoFlareDev · OctoFlareDev · commit 7507549d3f4d · 2021-05-28T12:32:37.000+08:00
diff --git a/scripts/draw_window_greeting/draw_window_greeting.gml b/scripts/draw_window_greeting/draw_window_greeting.gml
@@ -88,6 +88,9 @@ function draw_window_greeting() {
 	}
 	draw_text(b + 48 + (a > 1), c + 9 + (a > 1), "Load a song")
 	if (a = 2 && mouse_check_button_released(mb_left)) {
+		windowalpha = 0
+		windowclose = 0
+		windowopen = 0
 	    load_song("")
 	    return 1
 	}
@@ -117,6 +120,9 @@ function draw_window_greeting() {
 	            recent_song[10] = ""
 	            recent_song_time[10] = 0
 	        } else {
+				windowalpha = 0
+				windowclose = 0
+				windowopen = 0
 	            load_song(recent_song[a])
 	        }
 	    }
@@ -140,7 +146,12 @@ function draw_window_greeting() {
 	draw_sprite(spr_bigicons_f, 2, b + (a > 1), c + (a > 1))
 	}
 	draw_text(b + 48 + (a > 1), c + 9 + (a > 1), "Generate song out of MIDI file")
-	if (a = 2 && mouse_check_button_released(mb_left)) open_midi("")
+	if (a = 2 && mouse_check_button_released(mb_left)) {
+		windowalpha = 0
+		windowclose = 0
+		windowopen = 0
+		open_midi("")
+	}
 
 	b = x1 + 300
 	c += 44
diff --git a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml
@@ -30,6 +30,9 @@ function draw_window_macro_arpeggio() {
 		message("Please add pipes ( | ) to separate values!", "Error")
 		return 1
 	}
+	windowalpha = 0
+	windowclose = 0
+	windowopen = 0
 	window = 0
 	str = selection_code
 	arr_data = selection_to_array(str)
diff --git a/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml b/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml
@@ -25,6 +25,9 @@ function draw_window_macro_portamento() {
 
 	draw_theme_color()
 	if (draw_button2(x1 + 10, y1 + 98, 60, "OK")) {
+		windowalpha = 0
+		windowclose = 0
+		windowopen = 0
 		str = selection_code
 		val = 0
 		decr = port_cent / string_count("-1", str)
diff --git a/scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml b/scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml
@@ -25,6 +25,9 @@ function draw_window_macro_setpanning() {
 
 	draw_theme_color()
 	if (draw_button2(x1 + 10, y1 + 98, 60, "OK")) {
+		windowalpha = 0
+		windowclose = 0
+		windowopen = 0
 		str = selection_code
 		val = 0
 		arr_data = selection_to_array(str)
diff --git a/scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml b/scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml
@@ -24,6 +24,9 @@ function draw_window_macro_setpitch() {
 
 	draw_theme_color()
 	if (draw_button2(x1 + 10, y1 + 98, 60, "OK")) {
+		windowalpha = 0
+		windowclose = 0
+		windowopen = 0
 		str = selection_code
 		val = 0
 		arr_data = selection_to_array(str)
diff --git a/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml b/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml
@@ -24,6 +24,9 @@ function draw_window_macro_setvelocity() {
 
 	draw_theme_color()
 	if (draw_button2(x1 + 10, y1 + 98, 60, "OK")) {
+		windowalpha = 0
+		windowclose = 0
+		windowopen = 0
 		str = selection_code
 		val = 0
 		arr_data = selection_to_array(str)
diff --git a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml
@@ -39,6 +39,9 @@ function draw_window_macro_stagger() {
 			message("Stagger can only extend downwards!", "Error")
 			return -1
 		}
+		windowalpha = 0
+		windowclose = 0
+		windowopen = 0
 		window = 0
 		str = selection_code
 		arr_data = selection_to_array(str)
diff --git a/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml b/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml
@@ -25,6 +25,9 @@ function draw_window_macro_stereo() {
 
 	draw_theme_color()
 	if (draw_button2(x1 + 10, y1 + 98, 60, "OK")) {
+		windowalpha = 0
+		windowclose = 0
+		windowopen = 0
 		str = selection_code
 		arr_data = selection_to_array(str)
 		window = 0
diff --git a/scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml b/scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml
@@ -56,6 +56,9 @@ function draw_window_macro_tremolo() {
 		if tremolotype = 0 macro_tremolo()
 		if tremolotype = 1 macro_tremolo_fadein()
 		if tremolotype = 2 macro_tremolo_fadeout()
+		windowalpha = 0
+		windowclose = 0
+		windowopen = 0
 		window = 0
 	}
 	if (draw_button2(x1 + 80, y1 + 215, 60, "Cancel") && windowopen = 1) {windowclose = 1}
diff --git a/scripts/draw_window_midi_import/draw_window_midi_import.gml b/scripts/draw_window_midi_import/draw_window_midi_import.gml
@@ -34,7 +34,7 @@ function draw_window_midi_import() {
 	} else {
 	if (draw_switch(x1 + 12, y1 + 374, w_midi_remember, "Remember changes", "Whether to use these settings the\nnext time you import a MIDI file.") && wmenu = 0) w_midi_remember=!w_midi_remember
 	}
-	if (draw_button2(x1 + 520, y1 + 368, 72, "Import") && wmenu = 0) {w_midi_tab = 0 window = -1 import_midi()}
+	if (draw_button2(x1 + 520, y1 + 368, 72, "Import") && wmenu = 0) {w_midi_tab = 0 window = -1 import_midi() windowalpha = 0 windowclose = 0 windowopen = 0}
 	if (draw_button2(x1 + 520 - 80, y1 + 368, 72, "Cancel") && wmenu = 0 && windowopen = 1) {midifile = "" w_midi_tab = 0 windowclose = 1}
 	if (draw_button2(x1 + 520 - 160, y1 + 368, 72, "Use default") && wmenu = 0) {
 	    if (question("Are you sure?", "Confirm")) { 
diff --git a/scripts/draw_window_minecraft/draw_window_minecraft.gml b/scripts/draw_window_minecraft/draw_window_minecraft.gml
@@ -145,11 +145,11 @@ function draw_window_minecraft() {
 		    }
 		    if (draw_button2(x1 + 45, yy + 34, 120, "Select lower blocks", 0, 1)) {
 		        select_outside(true, false)
-		        window = 0
+		        windowclose = 1
 		    }
 			if (draw_button2(x1 + 175, yy + 34, 120, "Select higher blocks", 0, 1)) {
 		        select_outside(false, true)
-		        window = 0
+		        windowclose = 1
 		    }
 		    if (draw_button2(x1 + 305, yy + 34, 100, "Transpose notes", 0, 1)) {
 		        if (question("Transpose notes so that they fall within Minecraft's 2 octaves?", "Transpose notes")) {
@@ -182,7 +182,7 @@ function draw_window_minecraft() {
 		    else draw_text(x1 + 45, yy + 16, "There are " + string(block_custom) + " blocks with custom instruments.")
 		    if (draw_button2(x1 + 45, yy + 34, 160, "Select affected blocks", 0, 1)) {
 		        select_custom()
-		        window = 0
+		        windowclose = 1
 		    }
 		} else {
 		    draw_set_color(c_green)
@@ -254,11 +254,11 @@ function draw_window_minecraft() {
 		    }
 		    if (draw_button2(x1 + 45, yy + 50, 120, "Select lower blocks", 0, 1)) {
 		        select_outside(true, false)
-		        window = 0
+		        windowclose = 1
 		    }
 			if (draw_button2(x1 + 175, yy + 50, 120, "Select higher blocks", 0, 1)) {
 		        select_outside(false, true)
-		        window = 0
+		        windowclose = 1
 		    }
 		    if (draw_button2(x1 + 305, yy + 50, 100, "Transpose notes", 0, 1)) {
 		        if (question("Transpose notes so that they fall within Minecraft's 2 octaves?", "Transpose notes")) {
@@ -297,7 +297,7 @@ function draw_window_minecraft() {
 		    else draw_text(x1 + 45, yy + 32, "There are " + string(block_custom) + " blocks with custom instruments.")
 			if (draw_button2(x1 + 45, yy + 50, 160, "Select affected blocks", 0, 1)) {
 		        select_custom()
-		        window = 0
+		        windowclose = 1
 		    }
 		} else {
 			if (theme != 3) {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ function draw_window_midi_import() {`
`34`	`34`	`} else {`
`35`	`35`	`if (draw_switch(x1 + 12, y1 + 374, w_midi_remember, "Remember changes", "Whether to use these settings the\nnext time you import a MIDI file.") && wmenu = 0) w_midi_remember=!w_midi_remember`
`36`	`36`	`}`
`37`		`- if (draw_button2(x1 + 520, y1 + 368, 72, "Import") && wmenu = 0) {w_midi_tab = 0 window = -1 import_midi()}`
	`37`	`+ if (draw_button2(x1 + 520, y1 + 368, 72, "Import") && wmenu = 0) {w_midi_tab = 0 window = -1 import_midi() windowalpha = 0 windowclose = 0 windowopen = 0}`
`38`	`38`	`if (draw_button2(x1 + 520 - 80, y1 + 368, 72, "Cancel") && wmenu = 0 && windowopen = 1) {midifile = "" w_midi_tab = 0 windowclose = 1}`
`39`	`39`	`if (draw_button2(x1 + 520 - 160, y1 + 368, 72, "Use default") && wmenu = 0) {`
`40`	`40`	`if (question("Are you sure?", "Confirm")) {`
Original file line number	Diff line number	Diff line change
`@@ -145,11 +145,11 @@ function draw_window_minecraft() {`
`145`	`145`	`}`
`146`	`146`	`if (draw_button2(x1 + 45, yy + 34, 120, "Select lower blocks", 0, 1)) {`
`147`	`147`	`select_outside(true, false)`
`148`		`- window = 0`
	`148`	`+ windowclose = 1`
`149`	`149`	`}`
`150`	`150`	`if (draw_button2(x1 + 175, yy + 34, 120, "Select higher blocks", 0, 1)) {`
`151`	`151`	`select_outside(false, true)`
`152`		`- window = 0`
	`152`	`+ windowclose = 1`
`153`	`153`	`}`
`154`	`154`	`if (draw_button2(x1 + 305, yy + 34, 100, "Transpose notes", 0, 1)) {`
`155`	`155`	`if (question("Transpose notes so that they fall within Minecraft's 2 octaves?", "Transpose notes")) {`
`@@ -182,7 +182,7 @@ function draw_window_minecraft() {`
`182`	`182`	`else draw_text(x1 + 45, yy + 16, "There are " + string(block_custom) + " blocks with custom instruments.")`
`183`	`183`	`if (draw_button2(x1 + 45, yy + 34, 160, "Select affected blocks", 0, 1)) {`
`184`	`184`	`select_custom()`
`185`		`- window = 0`
	`185`	`+ windowclose = 1`
`186`	`186`	`}`
`187`	`187`	`} else {`
`188`	`188`	`draw_set_color(c_green)`
`@@ -254,11 +254,11 @@ function draw_window_minecraft() {`
`254`	`254`	`}`
`255`	`255`	`if (draw_button2(x1 + 45, yy + 50, 120, "Select lower blocks", 0, 1)) {`
`256`	`256`	`select_outside(true, false)`
`257`		`- window = 0`
	`257`	`+ windowclose = 1`
`258`	`258`	`}`
`259`	`259`	`if (draw_button2(x1 + 175, yy + 50, 120, "Select higher blocks", 0, 1)) {`
`260`	`260`	`select_outside(false, true)`
`261`		`- window = 0`
	`261`	`+ windowclose = 1`
`262`	`262`	`}`
`263`	`263`	`if (draw_button2(x1 + 305, yy + 50, 100, "Transpose notes", 0, 1)) {`
`264`	`264`	`if (question("Transpose notes so that they fall within Minecraft's 2 octaves?", "Transpose notes")) {`
`@@ -297,7 +297,7 @@ function draw_window_minecraft() {`
`297`	`297`	`else draw_text(x1 + 45, yy + 32, "There are " + string(block_custom) + " blocks with custom instruments.")`
`298`	`298`	`if (draw_button2(x1 + 45, yy + 50, 160, "Select affected blocks", 0, 1)) {`
`299`	`299`	`select_custom()`
`300`		`- window = 0`
	`300`	`+ windowclose = 1`
`301`	`301`	`}`
`302`	`302`	`} else {`
`303`	`303`	`if (theme != 3) {`