mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 12:49:40 +00:00
Code Issues Releases Wiki Activity

more deprecated fixes

Browse source
This commit is contained in:
scrawl 2012-03-21 13:32:32 +01:00
parent deeb21a131
commit 97ab48993e
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwgui/console.cpp
View file

@ -113,9 +113,9 @@ namespace MWGui
getWidget(history, "list_History"); getWidget(history, "list_History");
// Set up the command line box // Set up the command line box
command->eventEditSelectAccept = command->eventEditSelectAccept +=
newDelegate(this, &Console::acceptCommand); newDelegate(this, &Console::acceptCommand);
command->eventKeyButtonPressed = command->eventKeyButtonPressed +=
newDelegate(this, &Console::keyPress); newDelegate(this, &Console::keyPress);
// Set up the log window // Set up the log window

4
apps/openmw/mwgui/messagebox.cpp
View file

@ -177,7 +177,7 @@ MessageBox::MessageBox(MessageBoxManager& parMessageBoxManager, const std::strin
void MessageBox::update (int height) void MessageBox::update (int height)
{ {
MyGUI::IntSize gameWindowSize = mMessageBoxManager.mWindowManager->getGui()->getViewSize(); MyGUI::IntSize gameWindowSize = MyGUI::RenderManager::getInstance().getViewSize();
MyGUI::IntCoord coord; MyGUI::IntCoord coord;
coord.left = (gameWindowSize.width - mFixedWidth)/2; coord.left = (gameWindowSize.width - mFixedWidth)/2;
coord.top = (gameWindowSize.height - mHeight - height - mBottomPadding); coord.top = (gameWindowSize.height - mHeight - height - mBottomPadding);
@ -222,7 +222,7 @@ InteractiveMessageBox::InteractiveMessageBox(MessageBoxManager& parMessageBoxMan
MyGUI::IntSize textSize = mMessageWidget->getTextSize(); MyGUI::IntSize textSize = mMessageWidget->getTextSize();
MyGUI::IntSize gameWindowSize = mMessageBoxManager.mWindowManager->getGui()->getViewSize(); MyGUI::IntSize gameWindowSize = MyGUI::RenderManager::getInstance().getViewSize();
int biggestButtonWidth = 0; int biggestButtonWidth = 0;
int buttonWidth = 0; int buttonWidth = 0;

2
apps/openmw/mwgui/window_base.cpp
View file

@ -16,7 +16,7 @@ void WindowBase::open()
void WindowBase::center() void WindowBase::center()
{ {
// Centre dialog // Centre dialog
MyGUI::IntSize gameWindowSize = mWindowManager.getGui()->getViewSize(); MyGUI::IntSize gameWindowSize = MyGUI::RenderManager::getInstance().getViewSize();
MyGUI::IntCoord coord = mMainWidget->getCoord(); MyGUI::IntCoord coord = mMainWidget->getCoord();
coord.left = (gameWindowSize.width - coord.width)/2; coord.left = (gameWindowSize.width - coord.width)/2;
coord.top = (gameWindowSize.height - coord.height)/2; coord.top = (gameWindowSize.height - coord.height)/2;

6
apps/openmw/mwgui/window_manager.cpp
View file

@ -41,8 +41,8 @@ WindowManager::WindowManager(MWWorld::Environment& environment,
// Get size info from the Gui object // Get size info from the Gui object
assert(gui); assert(gui);
int w = gui->getViewSize().width; int w = MyGUI::RenderManager::getInstance().getViewSize().width;
int h = gui->getViewSize().height; int h = MyGUI::RenderManager::getInstance().getViewSize().height;
hud = new HUD(w,h, showFPSLevel); hud = new HUD(w,h, showFPSLevel);
menu = new MainMenu(w,h); menu = new MainMenu(w,h);
@ -153,7 +153,7 @@ void WindowManager::updateVisible()
dialogueWindow->setVisible(false); dialogueWindow->setVisible(false);
// Mouse is visible whenever we're not in game mode // Mouse is visible whenever we're not in game mode
gui->setVisiblePointer(isGuiMode()); MyGUI::PointerManager::getInstance().setVisible(isGuiMode());
// If in game mode, don't show anything. // If in game mode, don't show anything.
if(mode == GM_Game) //Use a switch/case structure if(mode == GM_Game) //Use a switch/case structure