Moved GameOptionsDialog render logic to GameViewContainer

Author: oscar139

appOPHD/States/MapViewState.cpp

@@ -308,7 +308,6 @@ void MapViewState::onActivate()
 void MapViewState::onDeactivate()
 {
 	mGameOverDialog.enabled(false);
-	mGameOptionsDialog.enabled(false);
 
 	hideUi();
 }

appOPHD/States/MapViewStateUi.cpp

@@ -225,7 +225,6 @@ void MapViewState::setupUiPositions(NAS2D::Vector<int> size)
 	mCheatMenu.position(NAS2D::Point{centerPosition(mCheatMenu).x, centerPosition(mCheatMenu).y});
 	mGameOverDialog.position(centerPosition(mGameOverDialog) - NAS2D::Vector{0, 100});
 	mAnnouncement.position(centerPosition(mAnnouncement) - NAS2D::Vector{0, 100});
-	mGameOptionsDialog.position(centerPosition(mGameOptionsDialog) - NAS2D::Vector{0, 100});
 
 	mDiggerDirection.position(NAS2D::Point{centerPosition(mDiggerDirection).x, size.y / 2 - 125});
 
@@ -280,7 +279,6 @@ void MapViewState::unhideUi()
 	mConnections.show();
 
 	mGameOverDialog.enabled(true);
-	mGameOptionsDialog.enabled(true);
 }
 
 
@@ -392,7 +390,6 @@ void MapViewState::drawUI()
 	mStructures.update();
 
 	// Windows
-	mGameOptionsDialog.update();
 	mWindowStack.update();
 
 	if (!modalUiElementDisplayed()) { mToolTip.update(); }

appOPHD/UI/GameViewContainer.cpp

@@ -18,6 +18,7 @@ GameViewContainer::GameViewContainer(GameState& gameState) :
 	const auto rendererCenter = NAS2D::Utility<NAS2D::Renderer>::get().center().to<int>();
 	const auto centerPosition = [&rendererCenter](const Control& control) { return (rendererCenter - control.size() / 2); };
 	mFileIoDialog.position(NAS2D::Point{centerPosition(mFileIoDialog).x, centerPosition(mFileIoDialog).y});
+	mGameOptionsDialog.position(NAS2D::Point{centerPosition(mGameOptionsDialog).x, centerPosition(mGameOptionsDialog).y});
 
 	constexpr auto hudHeight = constants::ResourceIconSize + constants::MarginTight * 2;
 	const auto rendererSize = NAS2D::Utility<NAS2D::Renderer>::get().size();