mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 06:53:52 +00:00
Code Issues Releases Wiki Activity

Merge branch 'issue-5588' into 'master'

Browse source 
Prevent empty right page of journal having invisible topics (Fixes #5588)

Closes #5588

See merge request OpenMW/openmw!310
This commit is contained in:
psi29a 2020-10-03 10:55:44 +00:00
commit 3040b3b2b6
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -47,6 +47,7 @@
Bug #5539: Window resize breaks when going from a lower resolution to full screen resolution Bug #5539: Window resize breaks when going from a lower resolution to full screen resolution
Bug #5548: Certain exhausted topics can be highlighted again even though there's no new dialogue Bug #5548: Certain exhausted topics can be highlighted again even though there's no new dialogue
Bug #5557: Diagonal movement is noticeably slower with analogue stick Bug #5557: Diagonal movement is noticeably slower with analogue stick
Bug #5588: Randomly clicking on the journal's right-side page when it's empty shows random topics
Bug #5603: Setting constant effect cast style doesn't correct effects view Bug #5603: Setting constant effect cast style doesn't correct effects view
Bug #5611: Usable items with "0 Uses" should be used only once Bug #5611: Usable items with "0 Uses" should be used only once
Feature #390: 3rd person look "over the shoulder" Feature #390: 3rd person look "over the shoulder"

12
apps/openmw/mwgui/bookpage.cpp
View file

@ -941,6 +941,9 @@ public:
if (!mBook) if (!mBook)
return; return;
if (mPage >= mBook->mPages.size())
return;
dirtyFocusItem (); dirtyFocusItem ();
mFocusItem = 0; mFocusItem = 0;
@ -952,6 +955,9 @@ public:
if (!mBook) if (!mBook)
return; return;
if (mPage >= mBook->mPages.size())
return;
left -= mCroppedParent->getAbsoluteLeft (); left -= mCroppedParent->getAbsoluteLeft ();
top -= mCroppedParent->getAbsoluteTop (); top -= mCroppedParent->getAbsoluteTop ();
@ -988,6 +994,9 @@ public:
if (!mBook) if (!mBook)
return; return;
if (mPage >= mBook->mPages.size())
return;
// work around inconsistency in MyGUI where the mouse press coordinates aren't // work around inconsistency in MyGUI where the mouse press coordinates aren't
// transformed by the current Layer (even though mouse *move* events are). // transformed by the current Layer (even though mouse *move* events are).
MyGUI::IntPoint pos (left, top); MyGUI::IntPoint pos (left, top);
@ -1013,6 +1022,9 @@ public:
if (!mBook) if (!mBook)
return; return;
if (mPage >= mBook->mPages.size())
return;
// work around inconsistency in MyGUI where the mouse release coordinates aren't // work around inconsistency in MyGUI where the mouse release coordinates aren't
// transformed by the current Layer (even though mouse *move* events are). // transformed by the current Layer (even though mouse *move* events are).
MyGUI::IntPoint pos (left, top); MyGUI::IntPoint pos (left, top);