mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-04-02 19:36:41 +00:00
Code Issues Releases Wiki Activity

Fix being able to flip journal pages with the mousewheel when the options overlay is active (Fixes #2855)

Browse source
This commit is contained in:
scrawl 2015-08-15 20:44:15 +02:00
parent 58cd2b1a84
commit 7dd09dd637
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/openmw/mwgui/journalwindow.cpp
View file

@ -61,6 +61,7 @@ namespace
DisplayStateStack mStates; DisplayStateStack mStates;
Book mTopicIndexBook; Book mTopicIndexBook;
bool mQuestMode; bool mQuestMode;
bool mOptionsMode;
bool mAllQuests; bool mAllQuests;
template <typename T> template <typename T>
@ -182,6 +183,7 @@ namespace
mQuestMode = false; mQuestMode = false;
mAllQuests = false; mAllQuests = false;
mOptionsMode = false;
} }
void adjustButton (char const * name, bool optional = false) void adjustButton (char const * name, bool optional = false)
@ -244,6 +246,7 @@ namespace
void setBookMode () void setBookMode ()
{ {
mOptionsMode = false;
setVisible (OptionsBTN, true); setVisible (OptionsBTN, true);
setVisible (OptionsOverlay, false); setVisible (OptionsOverlay, false);
@ -253,6 +256,8 @@ namespace
void setOptionsMode () void setOptionsMode ()
{ {
mOptionsMode = true;
setVisible (OptionsBTN, false); setVisible (OptionsBTN, false);
setVisible (OptionsOverlay, true); setVisible (OptionsOverlay, true);
@ -508,6 +513,8 @@ namespace
void notifyNextPage(MyGUI::Widget* _sender) void notifyNextPage(MyGUI::Widget* _sender)
{ {
if (mOptionsMode)
return;
if (!mStates.empty ()) if (!mStates.empty ())
{ {
unsigned int & page = mStates.top ().mPage; unsigned int & page = mStates.top ().mPage;
@ -523,6 +530,8 @@ namespace
void notifyPrevPage(MyGUI::Widget* _sender) void notifyPrevPage(MyGUI::Widget* _sender)
{ {
if (mOptionsMode)
return;
if (!mStates.empty ()) if (!mStates.empty ())
{ {
unsigned int & page = mStates.top ().mPage; unsigned int & page = mStates.top ().mPage;