Replaced MapViewState::mTooltipSystemButton with GameViewContainer::mGameOptionsButton

Author: oscar139

appOPHD/States/MapViewState.cpp

@@ -553,11 +553,6 @@ void MapViewState::onMouseDown(NAS2D::MouseButton button, NAS2D::Point<int> posi
 
 	if (button == NAS2D::MouseButton::Left)
 	{
-		if (mTooltipSystemButton.area().contains(MOUSE_COORDS))
-		{
-			onSystemMenu();
-		}
-
 		const auto oldDepth = mMapView->currentDepth();
 		mNavControl->onClick(MOUSE_COORDS);
 		if (oldDepth != mMapView->currentDepth())
@@ -729,12 +724,6 @@ void MapViewState::onClickMap()
 }
 
 
-void MapViewState::onSystemMenu()
-{
-	mGameOptionsDialog.show();
-	resetUi();
-}
-
 /**
 * Handle side effects of changing depth view
 */

appOPHD/States/MapViewState.h

@@ -151,8 +151,6 @@ class MapViewState : public Wrapper
 
 	void onClickMap();
 
-	void onSystemMenu();
-
 	// ROBOT EVENT HANDLERS
 	void onDozerTaskComplete(Robot& robot);
 	void onDiggerTaskComplete(Robot& robot);
@@ -348,7 +346,6 @@ class MapViewState : public Wrapper
 	Button mBtnTogglePoliceOverlay;
 
 	// Bare Control's use for ToolTips
-	Control mTooltipSystemButton;
 	Control mTooltipCurrentTurns;
 
 	ToolTip mToolTip;

appOPHD/States/MapViewStateDraw.cpp

@@ -25,18 +25,13 @@ void MapViewState::drawSystemButton() const
 {
 	auto& renderer = NAS2D::Utility<NAS2D::Renderer>::get();
 
-	auto position = NAS2D::Point{renderer.size().x - 80, constants::MarginTight};
+	auto xOffsetFromRight = 100;
+	auto position = NAS2D::Point{renderer.size().x - xOffsetFromRight, constants::MarginTight};
 	constexpr auto textOffset = NAS2D::Vector{constants::ResourceIconSize + constants::Margin, 3 - constants::MarginTight};
 
 	// Turns
 	const auto turnImageRect = NAS2D::Rectangle<int>{{128, 0}, {constants::ResourceIconSize, constants::ResourceIconSize}};
 	renderer.drawSubImage(mUiIcons, position, turnImageRect);
 	const auto& font = Control::getDefaultFont();
 	renderer.drawText(font, std::to_string(mTurnCount), position + textOffset, NAS2D::Color::White);
-
-	position = mTooltipSystemButton.area().position + NAS2D::Vector{constants::MarginTight, constants::MarginTight};
-	bool isMouseInMenu = mTooltipSystemButton.area().contains(MOUSE_COORDS);
-	int menuGearHighlightOffsetX = isMouseInMenu ? 144 : 128;
-	const auto menuImageRect = NAS2D::Rectangle<int>{{menuGearHighlightOffsetX, 32}, {constants::ResourceIconSize, constants::ResourceIconSize}};
-	renderer.drawSubImage(mUiIcons, position, menuImageRect);
 }

appOPHD/States/MapViewStateUi.cpp

@@ -164,7 +164,6 @@ void MapViewState::initUi()
 	constexpr auto hudHeight = constants::ResourceIconSize + constants::MarginTight * 2;
 
 	mTooltipCurrentTurns.size({45, hudHeight});
-	mTooltipSystemButton.size({hudHeight, hudHeight});
 
 	// Tool Tips
 	mToolTip.add(mBtnTurns, constants::ToolTipBtnTurns);
@@ -174,7 +173,6 @@ void MapViewState::initUi()
 	mToolTip.add(mBtnToggleRouteOverlay, constants::ToolTipBtnRoutes);
 	mToolTip.add(mBtnTogglePoliceOverlay, constants::ToolTipBtnPolice);
 	mToolTip.add(mTooltipCurrentTurns, constants::ToolTipCurrentTurns);
-	mToolTip.add(mTooltipSystemButton, constants::ToolTipSystemMenu);
 }
 
 
@@ -187,7 +185,6 @@ void MapViewState::setupUiPositions(NAS2D::Vector<int> size)
 	mBottomUiRect = {{0, size.y - constants::BottomUiHeight}, {size.x, constants::BottomUiHeight}};
 
 	// Menu / System Icon
-	mTooltipSystemButton.position({size.x - (constants::ResourceIconSize + constants::MarginTight * 2), 0});
 	mTooltipCurrentTurns.position({size.x - 80 , 0});
 
 	mRobotDeploymentSummary.area({{8, size.y - constants::BottomUiHeight - 8 - 100}, {200, 100}});

appOPHD/UI/GameViewContainer.cpp

@@ -2,9 +2,10 @@
 
 #include "../States/GameState.h"
 
-GameViewContainer::GameViewContainer(GameState& gameState) : 
-	UIContainer{{&mFileIoDialog}},
-	mFileIoDialog{gameState.fileLoadDelegate(), gameState.fileSaveDelegate()}
+GameViewContainer::GameViewContainer(GameState& gameState) :
+	UIContainer{{&mFileIoDialog, &mGameOptionsDialog, &mGameOptionsButton}},
+	mFileIoDialog{gameState.fileLoadDelegate(), gameState.fileSaveDelegate()},
+	mGameOptionsButton{"Menu", {this, &GameViewContainer::onGameOptionsButton}}
 {
 	mGameOptionsDialog.hide();
 
@@ -17,6 +18,13 @@ 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});
+
+	constexpr auto hudHeight = constants::ResourceIconSize + constants::MarginTight * 2;
+	const auto rendererSize = NAS2D::Utility<NAS2D::Renderer>::get().size();
+	const auto gameOptionsButtonSize = getDefaultFont().size(mGameOptionsButton.text());
+
+	mGameOptionsButton.size({gameOptionsButtonSize.x + constants::Margin, hudHeight});
+	mGameOptionsButton.position({rendererSize.x - mGameOptionsButton.size().x, constants::MarginTight / 2});
 }
 
 

appOPHD/UI/GameViewContainer.h

@@ -4,6 +4,7 @@
 #include "GameOptionsDialog.h"
 
 #include "../Constants/Strings.h"
+#include "../Constants/UiConstants.h"
 
 #include <libControls/UIContainer.h>
 #include <libControls/Button.h>
@@ -18,8 +19,10 @@ class GameViewContainer : public UIContainer
 	GameOptionsDialog& gameOptionsDialog() { return mGameOptionsDialog; }
 
 private:
+	void onGameOptionsButton() { mGameOptionsDialog.show(); }
 	void showSaveDialog() { mGameOptionsDialog.hide(); mFileIoDialog.showSave(constants::SaveGamePath); }
 	void showLoadDialog() { mGameOptionsDialog.hide(); mFileIoDialog.showOpen(constants::SaveGamePath); }
 	FileIo mFileIoDialog;
 	GameOptionsDialog mGameOptionsDialog;
+	Button mGameOptionsButton;
 };