ENGINES: Move sub gui before gui when hideSelf is false when subbing

xoreos · Dec 29, 2018 · 8788bc1 · 8788bc1
1 parent ac8d499
commit 8788bc1
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/engines/aurora/gui.cpp b/src/engines/aurora/gui.cpp
@@ -360,10 +360,12 @@ uint32 GUI::sub(GUI &gui, uint32 startCode, bool showSelf, bool hideSelf) {
 	if (hideSelf)
 		hide();
 
-	// Move the gui a bit behind the sub gui
-	float x, y, z;
-	getPosition(x, y, z);
-	setPosition(x, y, z + 100.0f);
+	// Move the gui a bit before the root gui
+	if (!hideSelf) {
+		float x, y, z;
+		getPosition(x, y, z);
+		gui.setPosition(x, y, z - 100.0f);
+	}
 
 	GfxMan.unlockFrame();
 
@@ -372,9 +374,6 @@ uint32 GUI::sub(GUI &gui, uint32 startCode, bool showSelf, bool hideSelf) {
 
 	GfxMan.lockFrame();
 
-	// Reset the position
-	setPosition(x, y, z);
-
 	// Hide the sub GUI
 	if (hideSelf && showSelf)
 		show();