Preparation for whole-screen-root

Author: orengg

Menus/MainMenuGUI.cpp

@@ -195,13 +195,17 @@ int MainMenuGUI::Create(Controller *pController)
     m_apScreenBox[QUITSCREEN] = dynamic_cast<GUICollectionBox *>(m_pGUIController->GetControl("QuitConfirmBox"));
     m_apScreenBox[MODMANAGERSCREEN] = dynamic_cast<GUICollectionBox *>(m_pGUIController->GetControl("ModManagerScreen"));
 
-	GUICollectionBox *pRootBox = m_apScreenBox[ROOT];
-    pRootBox->SetPositionAbs((g_FrameMan.GetResX() - pRootBox->GetWidth()) / 2, 0);// (g_FrameMan.GetResY() - pRootBox->GetHeight()) / 2);
-// NO, this screws up the menu positioning!
-//    pRootBox->Resize(pRootBox->GetWidth(), g_FrameMan.GetResY());
-
-    // Set up screens' initial positions and visibility
+	//m_apScreenBox[ROOT]->Resize(g_FrameMan.GetResX(), g_FrameMan.GetResY());
+	m_apScreenBox[ROOT]->SetPositionAbs((g_FrameMan.GetResX() - m_apScreenBox[ROOT]->GetWidth()) / 2, 0);// (g_FrameMan.GetResY() - pRootBox->GetHeight()) / 2);
+
+	//for (int iscreen = MAINSCREEN; iscreen < SCREENCOUNT; ++iscreen)
+	//{
+	//	if (m_apScreenBox[iscreen]) {
+	//		m_apScreenBox[iscreen]->CenterInParent(true, true);
+	//	}
+	//}
     m_apScreenBox[QUITSCREEN]->CenterInParent(true, true);
+
     // Hide all screens, the appropriate screen will reappear on next update
     HideAllScreens();
 
@@ -706,17 +710,17 @@ void MainMenuGUI::Update()
     //////////////////////////////////////
     // PLAYERS MENU SCREEN
 
-    else if (m_MenuScreen == PLAYERSSCREEN)
-    {
-        if (m_ScreenChange)
-        {
-            m_apScreenBox[PLAYERSSCREEN]->SetVisible(true);
-            m_aMainMenuButton[BACKTOMAIN]->SetVisible(true);
-            m_ScreenChange = false;
-        }
-
-//        m_aMainMenuButton[BACKTOMAIN]->SetFocus();
-    }
+//    else if (m_MenuScreen == PLAYERSSCREEN)
+//    {
+//        if (m_ScreenChange)
+//        {
+//            m_apScreenBox[PLAYERSSCREEN]->SetVisible(true);
+//            m_aMainMenuButton[BACKTOMAIN]->SetVisible(true);
+//            m_ScreenChange = false;
+//        }
+//
+////        m_aMainMenuButton[BACKTOMAIN]->SetFocus();
+//    }
 
     //////////////////////////////////////
     // SKIRMISH SETUP MENU SCREEN
@@ -1171,31 +1175,31 @@ void MainMenuGUI::Update()
             // PLAYER SCREEN BUTTONS
 			// Player count setting button pressed
 
-			if (m_MenuScreen == PLAYERSSCREEN && 
-                (anEvent.GetControl()->GetName() == "ButtonOnePlayer" ||
-                 anEvent.GetControl()->GetName() == "ButtonTwoPlayers" ||
-                 anEvent.GetControl()->GetName() == "ButtonThreePlayers" ||
-                 anEvent.GetControl()->GetName() == "ButtonFourPlayers"))
-            {
-                // Hide all screens, the appropriate screen will reappear on next update
-                HideAllScreens();
-                m_MenuScreen = SKIRMISHSCREEN;
-                m_ScreenChange = true;
-
-                // Set desired player count
-                if (anEvent.GetControl()->GetName() == "ButtonOnePlayer")
-                    m_StartPlayers = 1;
-                else if (anEvent.GetControl()->GetName() == "ButtonTwoPlayers")
-                    m_StartPlayers = 2;
-                else if (anEvent.GetControl()->GetName() == "ButtonThreePlayers")
-                    m_StartPlayers = 3;
-                else if (anEvent.GetControl()->GetName() == "ButtonFourPlayers")
-                    m_StartPlayers = 4;
-                else
-                    m_StartPlayers = 0;
-
-                g_GUISound.ButtonPressSound()->Play();
-            }
+			//if (m_MenuScreen == PLAYERSSCREEN && 
+   //             (anEvent.GetControl()->GetName() == "ButtonOnePlayer" ||
+   //              anEvent.GetControl()->GetName() == "ButtonTwoPlayers" ||
+   //              anEvent.GetControl()->GetName() == "ButtonThreePlayers" ||
+   //              anEvent.GetControl()->GetName() == "ButtonFourPlayers"))
+   //         {
+   //             // Hide all screens, the appropriate screen will reappear on next update
+   //             HideAllScreens();
+   //             m_MenuScreen = SKIRMISHSCREEN;
+   //             m_ScreenChange = true;
+
+   //             // Set desired player count
+   //             if (anEvent.GetControl()->GetName() == "ButtonOnePlayer")
+   //                 m_StartPlayers = 1;
+   //             else if (anEvent.GetControl()->GetName() == "ButtonTwoPlayers")
+   //                 m_StartPlayers = 2;
+   //             else if (anEvent.GetControl()->GetName() == "ButtonThreePlayers")
+   //                 m_StartPlayers = 3;
+   //             else if (anEvent.GetControl()->GetName() == "ButtonFourPlayers")
+   //                 m_StartPlayers = 4;
+   //             else
+   //                 m_StartPlayers = 0;
+
+   //             g_GUISound.ButtonPressSound()->Play();
+   //         }
 
             /////////////////////////////////////////////
             // SKIRMISH SETUP SCREEN BUTTONS