mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-24 09:39:51 +00:00
Code Issues Projects Releases Wiki Activity

Removes add behavior when pressing escape while waiting.

Browse Source
This commit is contained in:
Digmaster 2014-05-29 01:52:41 -04:00
parent 033f1850f9
commit a5cfa8a049
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/openmw/mwgui/waitdialog.cpp
View File

@ -71,7 +71,8 @@ namespace MWGui
void WaitDialog::exit()
{
MWBase::Environment::get().getWindowManager()->popGuiMode();
if(!mProgressBar.isVisible()) //Only exit if not currently waiting
MWBase::Environment::get().getWindowManager()->popGuiMode();
}
void WaitDialog::open()

5
apps/openmw/mwgui/windowbase.cpp
View File

@ -23,6 +23,11 @@ void WindowBase::setVisible(bool visible)
close();
}
bool WindowBase::isVisible()
{
return mMainWidget->getVisible();
}
void WindowBase::center()
{
// Centre dialog

2
apps/openmw/mwgui/windowbase.hpp
View File

@ -29,6 +29,8 @@ namespace MWGui
virtual void exit() {}
///Sets the visibility of the window
virtual void setVisible(bool visible);
///Returns the visibility state of the window
virtual bool isVisible();
void center();
/** Event : Dialog finished, OK button clicked.\n