mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 17:15:34 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2034 from akortunov/guifixes

Browse source 
Improve GUI cleanup
This commit is contained in:
Bret Curtis 2018-11-15 07:31:57 +01:00 committed by GitHub
commit a21792657a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -4,6 +4,8 @@
Bug #3623: Fix HiDPI on Windows Bug #3623: Fix HiDPI on Windows
Bug #4540: Rain delay when exiting water Bug #4540: Rain delay when exiting water
Bug #4701: PrisonMarker record is not hardcoded like other markers Bug #4701: PrisonMarker record is not hardcoded like other markers
Bug #4714: Crash upon game load in the repair menu while the "Your repair failed!" message is active
Bug #4715: "Cannot get class of an empty object" exception after pressing ESC in the dialogue mode
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3442: Default values for fallbacks from ini file Feature #3442: Default values for fallbacks from ini file
Feature #4673: Weapon sheathing Feature #4673: Weapon sheathing

3
apps/openmw/mwgui/dialogue.cpp
View file

@ -740,6 +740,9 @@ namespace MWGui
bool DialogueWindow::isCompanion(const MWWorld::Ptr& actor) bool DialogueWindow::isCompanion(const MWWorld::Ptr& actor)
{ {
if (actor.isEmpty())
return false;
return !actor.getClass().getScript(actor).empty() return !actor.getClass().getScript(actor).empty()
&& actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion"); && actor.getRefData().getLocals().getIntVar(actor.getClass().getScript(actor), "companion");
} }

15
apps/openmw/mwgui/tooltips.cpp
View file

@ -330,6 +330,21 @@ namespace MWGui
} }
} }
void ToolTips::clear()
{
mFocusObject = MWWorld::Ptr();
while (mDynamicToolTipBox->getChildCount())
{
MyGUI::Gui::getInstance().destroyWidget(mDynamicToolTipBox->getChildAt(0));
}
for (unsigned int i=0; i < mMainWidget->getChildCount(); ++i)
{
mMainWidget->getChildAt(i)->setVisible(false);
}
}
void ToolTips::setFocusObject(const MWWorld::Ptr& focus) void ToolTips::setFocusObject(const MWWorld::Ptr& focus)
{ {
mFocusObject = focus; mFocusObject = focus;

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

@ -59,6 +59,8 @@ namespace MWGui
void setDelay(float delay); void setDelay(float delay);
void clear();
void setFocusObject(const MWWorld::Ptr& focus); void setFocusObject(const MWWorld::Ptr& focus);
void setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y); void setFocusObjectScreenCoords(float min_x, float min_y, float max_x, float max_y);
///< set the screen-space position of the tooltip for focused object ///< set the screen-space position of the tooltip for focused object

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

@ -1728,7 +1728,7 @@ namespace MWGui
mMessageBoxManager->clear(); mMessageBoxManager->clear();
mToolTips->setFocusObject(MWWorld::Ptr()); mToolTips->clear();
mSelectedSpell.clear(); mSelectedSpell.clear();
mCustomMarkers.clear(); mCustomMarkers.clear();