From 025af1717fa7c0e45cb7111e6c0ea2fa3475cb51 Mon Sep 17 00:00:00 2001 From: Jan Borsodi Date: Sat, 23 Oct 2010 00:17:41 +0200 Subject: [PATCH] Removed gameWindowSize parameter from all dialogs that had it, instead this is fetched via the environment variable. --- apps/openmw/mwgui/birth.cpp | 3 ++- apps/openmw/mwgui/birth.hpp | 2 +- apps/openmw/mwgui/class.cpp | 6 ++++-- apps/openmw/mwgui/class.hpp | 4 ++-- apps/openmw/mwgui/race.cpp | 3 ++- apps/openmw/mwgui/race.hpp | 2 +- apps/openmw/mwgui/review.cpp | 3 ++- apps/openmw/mwgui/review.hpp | 2 +- apps/openmw/mwgui/text_input.cpp | 4 +++- apps/openmw/mwgui/text_input.hpp | 2 +- apps/openmw/mwgui/window_manager.cpp | 12 ++++++------ 11 files changed, 25 insertions(+), 18 deletions(-) diff --git a/apps/openmw/mwgui/birth.cpp b/apps/openmw/mwgui/birth.cpp index 5e4247725..1c525e8fd 100644 --- a/apps/openmw/mwgui/birth.cpp +++ b/apps/openmw/mwgui/birth.cpp @@ -11,11 +11,12 @@ using namespace MWGui; using namespace Widgets; -BirthDialog::BirthDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize) +BirthDialog::BirthDialog(MWWorld::Environment& environment) : Layout("openmw_chargen_birth_layout.xml") , environment(environment) { // Centre dialog + MyGUI::IntSize gameWindowSize = environment.mWindowManager->getGui()->getViewSize(); MyGUI::IntCoord coord = mMainWidget->getCoord(); coord.left = (gameWindowSize.width - coord.width)/2; coord.top = (gameWindowSize.height - coord.height)/2; diff --git a/apps/openmw/mwgui/birth.hpp b/apps/openmw/mwgui/birth.hpp index ae9067b1a..192a03e48 100644 --- a/apps/openmw/mwgui/birth.hpp +++ b/apps/openmw/mwgui/birth.hpp @@ -20,7 +20,7 @@ namespace MWGui class BirthDialog : public OEngine::GUI::Layout { public: - BirthDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize); + BirthDialog(MWWorld::Environment& environment); enum Gender { diff --git a/apps/openmw/mwgui/class.cpp b/apps/openmw/mwgui/class.cpp index 592ca1f39..cd31e1003 100644 --- a/apps/openmw/mwgui/class.cpp +++ b/apps/openmw/mwgui/class.cpp @@ -73,11 +73,12 @@ void GenerateClassResultDialog::onBackClicked(MyGUI::Widget* _sender) /* PickClassDialog */ -PickClassDialog::PickClassDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize) +PickClassDialog::PickClassDialog(MWWorld::Environment& environment) : Layout("openmw_chargen_class_layout.xml") , environment(environment) { // Centre dialog + MyGUI::IntSize gameWindowSize = environment.mWindowManager->getGui()->getViewSize(); MyGUI::IntCoord coord = mMainWidget->getCoord(); coord.left = (gameWindowSize.width - coord.width)/2; coord.top = (gameWindowSize.height - coord.height)/2; @@ -427,7 +428,7 @@ ClassChoiceDialog::ClassChoiceDialog(MWWorld::Environment& environment) /* CreateClassDialog */ -CreateClassDialog::CreateClassDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize) +CreateClassDialog::CreateClassDialog(MWWorld::Environment& environment) : Layout("openmw_chargen_create_class_layout.xml") , environment(environment) , specDialog(nullptr) @@ -436,6 +437,7 @@ CreateClassDialog::CreateClassDialog(MWWorld::Environment& environment, MyGUI::I , descDialog(nullptr) { // Centre dialog + MyGUI::IntSize gameWindowSize = environment.mWindowManager->getGui()->getViewSize(); MyGUI::IntCoord coord = mMainWidget->getCoord(); coord.left = (gameWindowSize.width - coord.width)/2; coord.top = (gameWindowSize.height - coord.height)/2; diff --git a/apps/openmw/mwgui/class.hpp b/apps/openmw/mwgui/class.hpp index 3a8672f1f..4ad8de495 100644 --- a/apps/openmw/mwgui/class.hpp +++ b/apps/openmw/mwgui/class.hpp @@ -114,7 +114,7 @@ namespace MWGui class PickClassDialog : public OEngine::GUI::Layout { public: - PickClassDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize); + PickClassDialog(MWWorld::Environment& environment); const std::string &getClassId() const { return currentClassId; } void setClassId(const std::string &classId); @@ -287,7 +287,7 @@ namespace MWGui class CreateClassDialog : public OEngine::GUI::Layout { public: - CreateClassDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize); + CreateClassDialog(MWWorld::Environment& environment); virtual ~CreateClassDialog(); std::string getName() const; diff --git a/apps/openmw/mwgui/race.cpp b/apps/openmw/mwgui/race.cpp index 72f400a34..04896aef1 100644 --- a/apps/openmw/mwgui/race.cpp +++ b/apps/openmw/mwgui/race.cpp @@ -15,7 +15,7 @@ using namespace MWGui; using namespace Widgets; -RaceDialog::RaceDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize) +RaceDialog::RaceDialog(MWWorld::Environment& environment) : Layout("openmw_chargen_race_layout.xml") , environment(environment) , genderIndex(0) @@ -25,6 +25,7 @@ RaceDialog::RaceDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWin , hairCount(14) { // Centre dialog + MyGUI::IntSize gameWindowSize = environment.mWindowManager->getGui()->getViewSize(); MyGUI::IntCoord coord = mMainWidget->getCoord(); coord.left = (gameWindowSize.width - coord.width)/2; coord.top = (gameWindowSize.height - coord.height)/2; diff --git a/apps/openmw/mwgui/race.hpp b/apps/openmw/mwgui/race.hpp index fc147c6c7..bfa3c505d 100644 --- a/apps/openmw/mwgui/race.hpp +++ b/apps/openmw/mwgui/race.hpp @@ -24,7 +24,7 @@ namespace MWGui class RaceDialog : public OEngine::GUI::Layout { public: - RaceDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize); + RaceDialog(MWWorld::Environment& environment); enum Gender { diff --git a/apps/openmw/mwgui/review.cpp b/apps/openmw/mwgui/review.cpp index 4e202c2d2..dd693bc02 100644 --- a/apps/openmw/mwgui/review.cpp +++ b/apps/openmw/mwgui/review.cpp @@ -13,12 +13,13 @@ using namespace Widgets; const int ReviewDialog::lineHeight = 18; -ReviewDialog::ReviewDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize) +ReviewDialog::ReviewDialog(MWWorld::Environment& environment) : Layout("openmw_chargen_review_layout.xml") , environment(environment) , lastPos(0) { // Centre dialog + MyGUI::IntSize gameWindowSize = environment.mWindowManager->getGui()->getViewSize(); MyGUI::IntCoord coord = mMainWidget->getCoord(); coord.left = (gameWindowSize.width - coord.width)/2; coord.top = (gameWindowSize.height - coord.height)/2; diff --git a/apps/openmw/mwgui/review.hpp b/apps/openmw/mwgui/review.hpp index 9f97eb14d..f2d2cf8f1 100644 --- a/apps/openmw/mwgui/review.hpp +++ b/apps/openmw/mwgui/review.hpp @@ -25,7 +25,7 @@ namespace MWGui public: typedef std::vector SkillList; - ReviewDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize); + ReviewDialog(MWWorld::Environment& environment); void setPlayerName(const std::string &name); void setRace(const std::string &raceId); diff --git a/apps/openmw/mwgui/text_input.cpp b/apps/openmw/mwgui/text_input.cpp index c443d62d8..e1fc216c9 100644 --- a/apps/openmw/mwgui/text_input.cpp +++ b/apps/openmw/mwgui/text_input.cpp @@ -1,14 +1,16 @@ #include "text_input.hpp" +#include "window_manager.hpp" #include "../mwworld/environment.hpp" #include "../mwworld/world.hpp" using namespace MWGui; -TextInputDialog::TextInputDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize) +TextInputDialog::TextInputDialog(MWWorld::Environment& environment) : Layout("openmw_text_input_layout.xml") , environment(environment) { // Centre dialog + MyGUI::IntSize gameWindowSize = environment.mWindowManager->getGui()->getViewSize(); MyGUI::IntCoord coord = mMainWidget->getCoord(); coord.left = (gameWindowSize.width - coord.width)/2; coord.top = (gameWindowSize.height - coord.height)/2; diff --git a/apps/openmw/mwgui/text_input.hpp b/apps/openmw/mwgui/text_input.hpp index 8a0f1c56e..5a38e9b46 100644 --- a/apps/openmw/mwgui/text_input.hpp +++ b/apps/openmw/mwgui/text_input.hpp @@ -18,7 +18,7 @@ namespace MWGui class TextInputDialog : public OEngine::GUI::Layout { public: - TextInputDialog(MWWorld::Environment& environment, MyGUI::IntSize gameWindowSize); + TextInputDialog(MWWorld::Environment& environment); std::string getTextInput() const { return textEdit ? textEdit->getOnlyText() : ""; } void setTextInput(const std::string &text) { if (textEdit) textEdit->setOnlyText(text); } diff --git a/apps/openmw/mwgui/window_manager.cpp b/apps/openmw/mwgui/window_manager.cpp index 03a8dc626..c2f870bd2 100644 --- a/apps/openmw/mwgui/window_manager.cpp +++ b/apps/openmw/mwgui/window_manager.cpp @@ -169,7 +169,7 @@ void WindowManager::updateVisible() { if (nameDialog) removeDialog(nameDialog); - nameDialog = new TextInputDialog(environment, gui->getViewSize()); + nameDialog = new TextInputDialog(environment); std::string sName = getGameSettingString("sName", "Name"); nameDialog->setTextLabel(sName); nameDialog->setTextInput(playerName); @@ -183,7 +183,7 @@ void WindowManager::updateVisible() { if (raceDialog) removeDialog(raceDialog); - raceDialog = new RaceDialog(environment, gui->getViewSize()); + raceDialog = new RaceDialog(environment); raceDialog->setNextButtonShow(raceChosen); raceDialog->setRaceId(playerRaceId); raceDialog->eventDone = MyGUI::newDelegate(this, &WindowManager::onRaceDialogDone); @@ -213,7 +213,7 @@ void WindowManager::updateVisible() { if (pickClassDialog) removeDialog(pickClassDialog); - pickClassDialog = new PickClassDialog(environment, gui->getViewSize()); + pickClassDialog = new PickClassDialog(environment); pickClassDialog->setNextButtonShow(classChosen); pickClassDialog->setClassId(playerClass.name); pickClassDialog->eventDone = MyGUI::newDelegate(this, &WindowManager::onPickClassDialogDone); @@ -226,7 +226,7 @@ void WindowManager::updateVisible() { if (createClassDialog) removeDialog(createClassDialog); - createClassDialog = new CreateClassDialog(environment, gui->getViewSize()); + createClassDialog = new CreateClassDialog(environment); createClassDialog->eventDone = MyGUI::newDelegate(this, &WindowManager::onCreateClassDialogDone); createClassDialog->eventBack = MyGUI::newDelegate(this, &WindowManager::onCreateClassDialogBack); createClassDialog->open(); @@ -237,7 +237,7 @@ void WindowManager::updateVisible() { if (birthSignDialog) removeDialog(birthSignDialog); - birthSignDialog = new BirthDialog(environment, gui->getViewSize()); + birthSignDialog = new BirthDialog(environment); birthSignDialog->setNextButtonShow(birthSignChosen); birthSignDialog->setBirthId(playerBirthSignId); birthSignDialog->eventDone = MyGUI::newDelegate(this, &WindowManager::onBirthSignDialogDone); @@ -251,7 +251,7 @@ void WindowManager::updateVisible() reviewNext = false; if (reviewDialog) removeDialog(reviewDialog); - reviewDialog = new ReviewDialog(environment, gui->getViewSize()); + reviewDialog = new ReviewDialog(environment); reviewDialog->setPlayerName(playerName); reviewDialog->setRace(playerRaceId); reviewDialog->setClass(playerClass);