Position windows correctly in the center when scaling the window

Bentroen · Bentroen · commit ae55ccff9a97 · 2021-04-17T05:08:07.000-03:00
diff --git a/scripts/draw_downloadprogress/draw_downloadprogress.gml b/scripts/draw_downloadprogress/draw_downloadprogress.gml
@@ -8,15 +8,15 @@ function draw_downloadprogress(argument0, argument1, argument2, argument3) {
 	percent = done/total
 	done_mb = done/power(1024, 2)
 	total_mb = total/power(1024, 2)
-	x1 = floor(window_width / 2 - 150)
-	y1 = floor(window_height / 2 - 50)
+	x1 = floor(rw / 2 - 150)
+	y1 = floor(rh / 2 - 50)
 	draw_theme_color()
 	draw_window(x1, y1, x1 + 300, y1 + 100)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 16, y1 + 16, caption)
 	draw_set_font(fnt_main)
 	draw_set_halign(fa_center)
-	draw_text(floor(window_width / 2), y1 + 40, desc)
+	draw_text(floor(rw / 2), y1 + 40, desc)
 	draw_set_color(10512464)
 	draw_rectangle(x1 + 30, y1 + 60, x1 + 30 + percent * 240, y1 + 80, 0)
 	draw_theme_color()
@@ -30,7 +30,7 @@ function draw_downloadprogress(argument0, argument1, argument2, argument3) {
 		total_text = string_format(total_mb, 0, 2)
 	}
 	text = done_text + "/" + total_text + " MB (" + string(round(percent * 100)) + "%)"
-	draw_text(floor(window_width / 2), y1 + 65, text)
+	draw_text(floor(rw / 2), y1 + 65, text)
 	draw_set_halign(fa_left)
 
 
diff --git a/scripts/draw_notechart/draw_notechart.gml b/scripts/draw_notechart/draw_notechart.gml
@@ -2,12 +2,12 @@ function draw_notechart(argument0, argument1, argument2, argument3) {
 	// draw_notechart(x, y, key, sharp)
 	var x1, xx, yy, key, sharp, a;
 	x1 = argument0
-	xx = median(0, x1 - 32, window_width - 320)
+	xx = median(0, x1 - 32, rw - 320)
 	yy = argument1
 	key = argument2
 	sharp = argument3
 	draw_sprite(spr_notechart, 0 + 3 * theme, xx, yy - 320 + 1)
-	draw_sprite(spr_notechart, (1 + (x1 > window_width - 250)) + 3 * theme, x1 - 16 * (x1 > window_width - 250), yy)
+	draw_sprite(spr_notechart, (1 + (x1 > rw - 250)) + 3 * theme, x1 - 16 * (x1 > rw - 250), yy)
 
 	draw_set_color(0)
 	draw_set_alpha(0.25)
diff --git a/scripts/draw_window_about/draw_window_about.gml b/scripts/draw_window_about/draw_window_about.gml
@@ -1,8 +1,8 @@
 function draw_window_about() {
 	// draw_window_stats()
 	var x1, y1, a, n;
-	x1 = floor(window_width / 2 - 150)
-	y1 = floor(window_height / 2 - 200)
+	x1 = floor(rw / 2 - 150)
+	y1 = floor(rh / 2 - 200)
 	draw_window(x1, y1, x1 + 300, y1 + 400)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "About")
diff --git a/scripts/draw_window_branch_export/draw_window_branch_export.gml b/scripts/draw_window_branch_export/draw_window_branch_export.gml
@@ -2,8 +2,8 @@ function draw_window_branch_export() {
 	// draw_window_branch_export()
 	var x1, y1, a, b, c, d, str, nsel, tabs, tabstr, tabw, tabtip, menun, menua, menub, block, c1, c2;
 	curs = cr_default
-	x1 = floor(window_width / 2 - 275)
-	y1 = floor(window_height / 2 - 200)
+	x1 = floor(rw / 2 - 275)
+	y1 = floor(rh / 2 - 200)
 	draw_window(x1, y1, x1 + 550, y1 + 400)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Branch Export")
diff --git a/scripts/draw_window_clip_editor/draw_window_clip_editor.gml b/scripts/draw_window_clip_editor/draw_window_clip_editor.gml
@@ -2,8 +2,8 @@ function draw_window_clip_editor() {
 	// draw_window_clip_editor()
 	var x1, y1; 
 	curs = cr_default
-	x1 = floor(window_width / 2 - 220)
-	y1 = floor(window_height / 2 - 215)
+	x1 = floor(rw / 2 - 220)
+	y1 = floor(rh / 2 - 215)
 	draw_window(x1, y1, x1 + 440, y1 + 430)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Secret Clipboard Editor")
diff --git a/scripts/draw_window_datapack_export/draw_window_datapack_export.gml b/scripts/draw_window_datapack_export/draw_window_datapack_export.gml
@@ -2,8 +2,8 @@ function draw_window_datapack_export() {
 	// draw_window_datapack_export()
 	var x1, y1, a, b, c, d, str, nsel, tabs, tabstr, tabw, tabtip, menun, menua, menub, block, blocks, c1, c2;
 	curs = cr_default
-	x1 = floor(window_width / 2 - 275)
-	y1 = floor(window_height / 2 - 215)
+	x1 = floor(rw / 2 - 275)
+	y1 = floor(rh / 2 - 215)
 	draw_window(x1, y1, x1 + 550, y1 + 430)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Data Pack Export")
diff --git a/scripts/draw_window_greeting/draw_window_greeting.gml b/scripts/draw_window_greeting/draw_window_greeting.gml
@@ -2,8 +2,8 @@ function draw_window_greeting() {
 	// draw_window_greeting()
 	var x1, y1, a, b, c, d, e, m;
 	curs = cr_default
-	x1 = floor(window_width / 2 - 350)
-	y1 = floor(window_height / 2 - 210)
+	x1 = floor(rw / 2 - 350)
+	y1 = floor(rh / 2 - 210)
 	draw_window(x1, y1, x1 + 700, y1 + 430)
 	draw_sprite_ext(spr_logo, 0, x1 + 64, y1 + 50, 0.55, 0.55, 0, c_white, 1)
 	draw_set_font(fnt_info_med_bold)
diff --git a/scripts/draw_window_instruments/draw_window_instruments.gml b/scripts/draw_window_instruments/draw_window_instruments.gml
@@ -3,8 +3,8 @@ function draw_window_instruments() {
 	var x1, y1, a, b, c, str, menun, menua, menub, prev;
 	curs = cr_default
 	menun = -1
-	x1 = floor(window_width / 2 - 275)
-	y1 = floor(window_height / 2 - 175)
+	x1 = floor(rw / 2 - 275)
+	y1 = floor(rh / 2 - 175)
 	draw_window(x1, y1, x1 + 550, y1 + 350)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 10, y1 + 8, "Instrument Settings")
diff --git a/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml b/scripts/draw_window_macro_arpeggio/draw_window_macro_arpeggio.gml
@@ -4,8 +4,8 @@ function draw_window_macro_arpeggio() {
 	curs = cr_default
 	text_exists[0] = 0
 	if (selected = 0) return 0
-	x1 = floor(window_width / 2 - 80)
-	y1 = floor(window_height / 2 - 80)
+	x1 = floor(rw / 2 - 80)
+	y1 = floor(rh / 2 - 80)
 	draw_window(x1, y1, x1 + 140, y1 + 130)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Arpeggio")
diff --git a/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml b/scripts/draw_window_macro_portamento/draw_window_macro_portamento.gml
@@ -4,8 +4,8 @@ function draw_window_macro_portamento() {
 	curs = cr_default
 	text_exists[0] = 0
 	if (selected = 0) return 0
-	x1 = floor(window_width / 2 - 80)
-	y1 = floor(window_height / 2 - 80)
+	x1 = floor(rw / 2 - 80)
+	y1 = floor(rh / 2 - 80)
 	draw_window(x1, y1, x1 + 140, y1 + 130)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Portamento")
diff --git a/scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml b/scripts/draw_window_macro_setpanning/draw_window_macro_setpanning.gml
@@ -4,8 +4,8 @@ function draw_window_macro_setpanning() {
 	curs = cr_default
 	text_exists[0] = 0
 	if (selected = 0) return 0
-	x1 = floor(window_width / 2 - 80)
-	y1 = floor(window_height / 2 - 80)
+	x1 = floor(rw / 2 - 80)
+	y1 = floor(rh / 2 - 80)
 	draw_window(x1, y1, x1 + 140, y1 + 130)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Set note panning")
diff --git a/scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml b/scripts/draw_window_macro_setpitch/draw_window_macro_setpitch.gml
@@ -4,8 +4,8 @@ function draw_window_macro_setpitch() {
 	curs = cr_default
 	text_exists[0] = 0
 	if (selected = 0) return 0
-	x1 = floor(window_width / 2 - 80)
-	y1 = floor(window_height / 2 - 80)
+	x1 = floor(rw / 2 - 80)
+	y1 = floor(rh / 2 - 80)
 	draw_window(x1, y1, x1 + 140, y1 + 130)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Set note pitch")
diff --git a/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml b/scripts/draw_window_macro_setvelocity/draw_window_macro_setvelocity.gml
@@ -4,8 +4,8 @@ function draw_window_macro_setvelocity() {
 	curs = cr_default
 	text_exists[0] = 0
 	if (selected = 0) return 0
-	x1 = floor(window_width / 2 - 80)
-	y1 = floor(window_height / 2 - 80)
+	x1 = floor(rw / 2 - 80)
+	y1 = floor(rh / 2 - 80)
 	draw_window(x1, y1, x1 + 140, y1 + 130)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Set note velocity")
diff --git a/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml b/scripts/draw_window_macro_stagger/draw_window_macro_stagger.gml
@@ -4,8 +4,8 @@ function draw_window_macro_stagger() {
 	curs = cr_default
 	text_exists[0] = 0
 	if (selected = 0) return 0
-	x1 = floor(window_width / 2 - 80)
-	y1 = floor(window_height / 2 - 70)
+	x1 = floor(rw / 2 - 80)
+	y1 = floor(rh / 2 - 70)
 	draw_window(x1, y1, x1 + 150, y1 + 160)
 	draw_theme_color()
 	draw_set_font(fnt_mainbold)
diff --git a/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml b/scripts/draw_window_macro_stereo/draw_window_macro_stereo.gml
@@ -4,8 +4,8 @@ function draw_window_macro_stereo() {
 	curs = cr_default
 	text_exists[0] = 0
 	if (selected = 0) return 0
-	x1 = floor(window_width / 2 - 80)
-	y1 = floor(window_height / 2 - 80)
+	x1 = floor(rw / 2 - 80)
+	y1 = floor(rh / 2 - 80)
 	draw_window(x1, y1, x1 + 140, y1 + 130)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Stereo")
diff --git a/scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml b/scripts/draw_window_macro_tremolo/draw_window_macro_tremolo.gml
@@ -4,8 +4,8 @@ function draw_window_macro_tremolo() {
 	curs = cr_default
 	text_exists[0] = 0
 	if (selected = 0) return 0
-	x1 = floor(window_width / 2 - 72)
-	y1 = floor(window_height / 2 - 145)
+	x1 = floor(rw / 2 - 72)
+	y1 = floor(rh / 2 - 145)
 	draw_window(x1, y1, x1 + 150, y1 + 240)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Tremolo")
diff --git a/scripts/draw_window_midi_import/draw_window_midi_import.gml b/scripts/draw_window_midi_import/draw_window_midi_import.gml
@@ -4,8 +4,8 @@ function draw_window_midi_import() {
 	curs = cr_default
 	menun = -1
 	nsel = -1
-	x1 = floor(window_width / 2 - 300)
-	y1 = floor(window_height / 2 - 200)
+	x1 = floor(rw / 2 - 300)
+	y1 = floor(rh / 2 - 200)
 	draw_window(x1, y1, x1 + 600, y1 + 400)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "MIDI Import")
diff --git a/scripts/draw_window_mididevices/draw_window_mididevices.gml b/scripts/draw_window_mididevices/draw_window_mididevices.gml
@@ -3,8 +3,8 @@ function draw_window_mididevices() {
 	var x1, y1, a, b, c, str, menun, menua, menub;
 	curs = cr_default
 	menun = -1
-	x1 = floor(window_width / 2 - 250)
-	y1 = floor(window_height / 2 - 175)
+	x1 = floor(rw / 2 - 250)
+	y1 = floor(rh / 2 - 175)
 	draw_window(x1, y1, x1 + 500, y1 + 350)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "MIDI device manager")
diff --git a/scripts/draw_window_minecraft/draw_window_minecraft.gml b/scripts/draw_window_minecraft/draw_window_minecraft.gml
@@ -2,8 +2,8 @@ function draw_window_minecraft() {
 	// draw_window_minecraft()
 	var x1, y1, a, b, c, stabx, stabw, str, nsel;
 	curs = cr_default
-	x1 = floor(window_width / 2 - 245)
-	y1 = floor(window_height / 2 - 225)
+	x1 = floor(rw / 2 - 245)
+	y1 = floor(rh / 2 - 225)
 	draw_window(x1, y1, x1 + 490, y1 + 450)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Minecraft Compatibility")
diff --git a/scripts/draw_window_mp3_export/draw_window_mp3_export.gml b/scripts/draw_window_mp3_export/draw_window_mp3_export.gml
@@ -3,8 +3,8 @@ function draw_window_mp3_export() {
 
 	var x1, y1
 	curs = cr_default
-	x1 = floor(window_width / 2 - 125)
-	y1 = floor(window_height / 2 - 135)
+	x1 = floor(rw / 2 - 125)
+	y1 = floor(rh / 2 - 135)
 	draw_window(x1, y1, x1 + 250, y1 + 270)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "MP3 Export")
diff --git a/scripts/draw_window_preferences/draw_window_preferences.gml b/scripts/draw_window_preferences/draw_window_preferences.gml
@@ -3,8 +3,8 @@ function draw_window_preferences() {
 	var x1, y1, a, b, c, as, stabx, stabw, nsel, str;
 	curs = cr_default
 	nsel = -1
-	x1 = floor(window_width / 2 - 250)
-	y1 = floor(window_height / 2 - 255)
+	x1 = floor(rw / 2 - 250)
+	y1 = floor(rh / 2 - 255)
 	draw_window(x1, y1, x1 + 500, y1 + 510)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Preferences")
diff --git a/scripts/draw_window_properties/draw_window_properties.gml b/scripts/draw_window_properties/draw_window_properties.gml
@@ -3,8 +3,8 @@ function draw_window_properties() {
 	var x1, y1, a; 
 	curs = cr_default
 	text_exists[0] = 0
-	x1 = floor(window_width / 2 - 220)
-	y1 = floor(window_height / 2 - 200)
+	x1 = floor(rw / 2 - 220)
+	y1 = floor(rh / 2 - 200)
 	draw_window(x1, y1, x1 + 440, y1 + 400)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Song Properties")
diff --git a/scripts/draw_window_save_options/draw_window_save_options.gml b/scripts/draw_window_save_options/draw_window_save_options.gml
@@ -3,8 +3,8 @@ function draw_window_save_options() {
 	var x1, y1, min_version;
 	curs = cr_default
 	text_exists[0] = 0
-	x1 = floor(window_width / 2 - 72)
-	y1 = floor(window_height / 2 - 90)
+	x1 = floor(rw / 2 - 72)
+	y1 = floor(rh / 2 - 90)
 	draw_window(x1, y1, x1 + 140, y1 + 162)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Save options")
diff --git a/scripts/draw_window_schematic_export/draw_window_schematic_export.gml b/scripts/draw_window_schematic_export/draw_window_schematic_export.gml
@@ -2,8 +2,8 @@ function draw_window_schematic_export() {
 	// draw_window_schematic_export()
 	var x1, y1, a, b, c, d, str, nsel, tabs, tabstr, tabw, tabtip, menun, menua, menub, block, blocks, c1, c2;
 	curs = cr_default
-	x1 = floor(window_width / 2 - 275)
-	y1 = floor(window_height / 2 - 200)
+	x1 = floor(rw / 2 - 275)
+	y1 = floor(rh / 2 - 200)
 	draw_window(x1, y1, x1 + 550, y1 + 400)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Schematic Export")
diff --git a/scripts/draw_window_songinfo/draw_window_songinfo.gml b/scripts/draw_window_songinfo/draw_window_songinfo.gml
@@ -45,8 +45,8 @@ function draw_window_songinfo() {
 	    h += 10
 	if (window = w_songinfoedit)
 	    h += 32
-	x1 = floor(window_width / 2 - w / 2)
-	y1 = floor(window_height / 2 - h / 2)
+	x1 = floor(rw / 2 - w / 2)
+	y1 = floor(rh / 2 - h / 2)
 	draw_window(x1, y1, x1 + w, y1 + h)
 
 	draw_set_font(fnt_info_big)
diff --git a/scripts/draw_window_stats/draw_window_stats.gml b/scripts/draw_window_stats/draw_window_stats.gml
@@ -1,8 +1,8 @@
 function draw_window_stats() {
 	// draw_window_stats()
 	var x1, y1, a, n;
-	x1 = floor(window_width / 2 - 150)
-	y1 = floor(window_height / 2 - 200)
+	x1 = floor(rw / 2 - 150)
+	y1 = floor(rh / 2 - 200)
 	draw_window(x1, y1, x1 + 300, y1 + 400)
 	draw_set_font(fnt_mainbold)
 	draw_text(x1 + 8, y1 + 8, "Song Stats")
diff --git a/scripts/draw_window_update/draw_window_update.gml b/scripts/draw_window_update/draw_window_update.gml
@@ -11,8 +11,8 @@ function draw_window_update() {
 	    }
 		return 0
 	}
-	x1 = floor(window_width / 2 - 250)
-	y1 = floor(window_height / 2 - 200)
+	x1 = floor(rw / 2 - 250)
+	y1 = floor(rh / 2 - 200)
 	draw_window(x1, y1, x1 + 500, y1 + 400)
 	draw_set_font(fnt_mainbold)
 	if (window = w_update) draw_text(x1 + 8, y1 + 8, "Update")
diff --git a/scripts/menu_draw/menu_draw.gml b/scripts/menu_draw/menu_draw.gml
@@ -1,18 +1,19 @@
 function menu_draw() {
 	// menu_draw()
 	if (ani < 1) ani += 0.1
-	var m, menux, menuy, noclick;
+	var m, menux, menuy, noclick, o;
 	menux[0] = sx
 	menuy[0] = sy
 	sel = -1
 	noclick = 0
+	o = obj_controller;
 	for (m = 0; m < menus; m += 1) {
 	    if (!menu_show[m]) continue
 	    var dx, dy, i, iy, hei;
 	    dx = menux[m]
 	    dy = menuy[m]
 	    hei = menu_hei[m] * (1 - power(1 - ani, 2))
-	    if (dy + hei > window_height) dy = window_height - hei
+	    if (dy + hei > o.rh) dy = o.rh - hei
 	    iy = 8
 	    draw_set_color(window_background)
 	    draw_rectangle(dx, dy, dx + menu_wid[m], dy + hei, 0)
