flxtext properties compile fix and set default window pos/size on inspector windows

Author: TheZoroForce240

source/funkin/backend/system/console/ConsoleUI.hx

@@ -234,7 +234,7 @@ class ConsoleUI {
 		if (!active) return;
 
 		if (settingsOpen.value) {
-			ImGui.setNextWindowPos(Lib.application.window.x + Lib.application.window.width - 240, Lib.application.window.y, ImGuiCond.FirstUseEver);
+			ImGui.setNextWindowPos(ImGuiUtil.getWindowSpaceX() + Lib.application.window.width - 240, ImGuiUtil.getWindowSpaceY(), ImGuiCond.FirstUseEver);
 			ImGui.setNextWindowSize(240, 405, ImGuiCond.FirstUseEver);
 			if (ImGui.begin("Console Settings", settingsOpen, 0)) {
 				//ImGui.checkbox("Count duplicated output##Console Settings", countDuplicatedOutput); ImGui.setItemTooltip("Toggles if duplicated logs add a counter instead of displaying again");
@@ -259,7 +259,7 @@ class ConsoleUI {
 			saveSettings();
 		}
 
-		ImGui.setNextWindowPos(Lib.application.window.x, Lib.application.window.y + (Lib.application.window.height-250), ImGuiCond.FirstUseEver);
+		ImGui.setNextWindowPos(ImGuiUtil.getWindowSpaceX(), ImGuiUtil.getWindowSpaceY() + (Lib.application.window.height-250), ImGuiCond.FirstUseEver);
 		ImGui.setNextWindowSize(Lib.application.window.width, 250, ImGuiCond.FirstUseEver);
 		ImGui.setNextWindowDockID(0, ImGuiCond.FirstUseEver);
 		if (ImGui.begin("Console", null, ImGuiWindowFlags.NoScrollbar)) {

source/funkin/backend/system/console/inspector/ConsoleInspector.hx

@@ -2,6 +2,7 @@ package funkin.backend.system.console.inspector;
 
 //WIP
 
+import openfl.Lib;
 import flixel.FlxState;
 import flixel.group.FlxSpriteGroup;
 import funkin.backend.scripting.HScript;
@@ -22,6 +23,8 @@ import foxlite.FoxObject;
 import foxlite.FoxModel;
 #end
 
+using funkin.backend.utils.ImGuiUtil;
+
 typedef InspectorObject = {
 	var obj:Dynamic;
 	var name:String;
@@ -155,6 +158,8 @@ class ConsoleInspector {
 
 		FlxG.mouse.visible = true; //TODO: rework this, temp force on
 
+		ImGui.setNextWindowPos(ImGuiUtil.getWindowSpaceX(), ImGuiUtil.getWindowSpaceY(), ImGuiCond.FirstUseEver);
+		ImGui.setNextWindowSize(300, Lib.application.window.height, ImGuiCond.FirstUseEver);
 		if (ImGui.begin("Inspector")) {
 			ImGui.separatorText("Tools/Gizmo");
 			ImGui.indent();

source/funkin/backend/system/console/inspector/InspectorObjectProperties.hx

@@ -1,5 +1,6 @@
 package funkin.backend.system.console.inspector;
 
+import openfl.Lib;
 import flixel.text.FlxText;
 import flixel.util.FlxColor;
 import funkin.backend.system.console.inspector.ConsoleInspector.InspectorObject;
@@ -18,6 +19,8 @@ import foxlite.FoxObject;
 import foxlite.FoxModel;
 #end
 
+using funkin.backend.utils.ImGuiUtil;
+
 class InspectorObjectProperties {
 
 	#if IMGUI_ENABLED
@@ -48,6 +51,8 @@ class InspectorObjectProperties {
 
 		var selectedObject:Dynamic = objectData.obj;
 
+		ImGui.setNextWindowPos(ImGuiUtil.getWindowSpaceX() + Lib.application.window.width - 300, ImGuiUtil.getWindowSpaceY(), ImGuiCond.FirstUseEver);
+		ImGui.setNextWindowSize(300, Lib.application.window.height, ImGuiCond.FirstUseEver);
 		if (ImGui.begin("Object Properties")) {
 			ImGui.text(objectData.name + " - " + objectData.type);
 
@@ -203,7 +208,7 @@ class InspectorObjectProperties {
 					ImGui.setNextItemWidth(wid);
 
 					var index = intPool.get();
-					var list = ["NONE", "SHADOW", "SHADOW_XY", "OUTLINE", "OUTLINE_FAST"];
+					var list = ["NONE", "SHADOW", "SHADOW_XY", "OUTLINE", "OUTLINE_FAST", "OUTLINE_CARDINAL"];
 					switch(text.borderStyle) { //not that easy to automate due to args on SHADOW_XY
 						case NONE:
 							index.value = 0;
@@ -215,6 +220,8 @@ class InspectorObjectProperties {
 							index.value = 3;
 						case OUTLINE_FAST:
 							index.value = 4;
+						case OUTLINE_CARDINAL:
+							index.value = 5;
 					}			
 					if (ImGui.combo("##Border StyleborderStyle", index, list)) {
 						switch(index.value) {
@@ -228,6 +235,8 @@ class InspectorObjectProperties {
 								text.borderStyle = OUTLINE;
 							case 4:
 								text.borderStyle = OUTLINE_FAST;
+							case 5:
+								text.borderStyle = OUTLINE_CARDINAL;
 						}
 					}
 

source/funkin/backend/utils/ImGuiUtil.hx

@@ -1,8 +1,10 @@
 package funkin.backend.utils;
 
 import flixel.input.keyboard.FlxKey;
+import openfl.Lib;
 #if IMGUI_ENABLED
-import lime.tools.imgui.ImGuiTypes.ImGuiKey;
+import lime.tools.imgui.ImGuiFlags;
+import lime.tools.imgui.ImGuiTypes;
 #end
 
 class ImGuiUtil {
@@ -114,5 +116,12 @@ class ImGuiUtil {
 		}
 		return ImGuiKey.None;
 	}
+
+	public static function getWindowSpaceX() {
+		return (ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) != 0 ? Lib.application.window.x : 0;
+	}
+	public static function getWindowSpaceY() {
+		return (ImGuiIO.configFlags & ImGuiConfigFlags.ViewportsEnable) != 0 ? Lib.application.window.y : 0;
+	}
 	#end
 }