Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-08 11:38:19 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Properly center jail progress widget, fix a bug with it not disappearing if the console is open

Browse source
This commit is contained in:
MiroslavR 2015-02-07 18:38:41 +01:00
parent 1d9e973573
commit 1230cf49bf
4 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apps/openmw/mwgui/jailscreen.cpp
View file

@ -1,7 +1,4 @@
#include <MyGUI_RenderManager.h>
#include <MyGUI_ScrollBar.h>
#include <MyGUI_Gui.h>
#include <MyGUI_TextBox.h>
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/mechanicsmanager.hpp"
@ -19,22 +16,18 @@
namespace MWGui
{
JailScreen::JailScreen()
: WindowBase("openmw_loading_screen.layout"),
: WindowBase("openmw_jail_screen.layout"),
mTimeAdvancer(0.0125),
mDays(1),
mFadeTimeRemaining(0)
{
getWidget(mLoadingText, "LoadingText");
getWidget(mProgressBar, "ProgressBar");
getWidget(mLoadingBox, "LoadingBox");
setVisible(false);
mTimeAdvancer.eventProgressChanged += MyGUI::newDelegate(this, &JailScreen::onJailProgressChanged);
mTimeAdvancer.eventFinished += MyGUI::newDelegate(this, &JailScreen::onJailFinished);
mLoadingText->setCaptionWithReplacing("#{sInPrisonTitle}");
center();
}
@ -78,7 +71,7 @@ namespace MWGui
void JailScreen::onJailFinished()
{
MWBase::Environment::get().getWindowManager()->popGuiMode();
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Jail);
MWBase::Environment::get().getWindowManager()->fadeScreenIn(0.5);
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();

2
apps/openmw/mwgui/jailscreen.hpp
View file

@ -19,8 +19,6 @@ namespace MWGui
float mFadeTimeRemaining;
MyGUI::Widget* mLoadingBox;
MyGUI::TextBox* mLoadingText;
MyGUI::ScrollBar* mProgressBar;
void onJailProgressChanged(int cur, int total);