Added parameter to open on a parent display

ConnorAU · Apr 5, 2019 · 72cf653 · 72cf653
1 parent 75cd6d0
commit 72cf653
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 8 deletions.
diff --git a/addon/systems/displayGuiMessage.sqf b/addon/systems/displayGuiMessage.sqf
@@ -16,10 +16,15 @@ params [
 	["_title","",[""]],
 	["_code",{},[{}]],
 	["_button1","",[""]],
-	["_button2",0,[""]]
+	["_button2",0,[""]],
+	["_parentDisplay",displayNull,[displayNull]]
 ];
 
-createDialog QUOTE(DISPLAY_NAME);
+if (!isNull _parentDisplay) then {
+	_parentDisplay createDisplay QUOTE(DISPLAY_NAME);
+} else {
+	createDialog QUOTE(DISPLAY_NAME);
+};
 
 private _return = {
 	params ["_display","_confirmed"];

diff --git a/addon/systems/displayListbox.sqf b/addon/systems/displayListbox.sqf
@@ -15,10 +15,15 @@ params [
 	["_title","",[""]],
 	["_code",{},[{}]],
 	["_button1","",[""]],
-	["_button2",0,[""]]
+	["_button2",0,[""]],
+	["_parentDisplay",displayNull,[displayNull]]
 ];
 
-createDialog QUOTE(DISPLAY_NAME);
+if (!isNull _parentDisplay) then {
+	_parentDisplay createDisplay QUOTE(DISPLAY_NAME);
+} else {
+	createDialog QUOTE(DISPLAY_NAME);
+};
 
 private _return = {
 	params ["_display","_confirmed"];

diff --git a/addon/systems/displaySlider.sqf b/addon/systems/displaySlider.sqf
@@ -18,10 +18,15 @@ params [
 	["_formatVal",{},[{}]],
 	["_code",{},[{}]],
 	["_button1","",[""]],
-	["_button2",0,[""]]
+	["_button2",0,[""]],
+	["_parentDisplay",displayNull,[displayNull]]
 ];
 
-createDialog QUOTE(DISPLAY_NAME);
+if (!isNull _parentDisplay) then {
+	_parentDisplay createDisplay QUOTE(DISPLAY_NAME);
+} else {
+	createDialog QUOTE(DISPLAY_NAME);
+};
 
 private _return = {
 	params ["_display","_confirmed"];

diff --git a/addon/systems/displayText.sqf b/addon/systems/displayText.sqf
@@ -15,10 +15,15 @@ params [
 	["_title","",[""]],
 	["_code",{},[{}]],
 	["_button1","",[""]],
-	["_button2",0,[""]]
+	["_button2",0,[""]],
+	["_parentDisplay",displayNull,[displayNull]]
 ];
 
-createDialog ([QUOTE(DISPLAY_NAME),QUOTE(JOIN(DISPLAY_NAME,Multi))] select _multiLine);
+if (!isNull _parentDisplay) then {
+	_parentDisplay createDisplay ([QUOTE(DISPLAY_NAME),QUOTE(JOIN(DISPLAY_NAME,Multi))] select _multiLine);
+} else {
+	createDialog ([QUOTE(DISPLAY_NAME),QUOTE(JOIN(DISPLAY_NAME,Multi))] select _multiLine);
+};
 
 private _return = {
 	params ["_display","_confirmed"];