mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-18 08:16:45 +00:00
Code Issues Releases Wiki Activity

Improve tooltips cleanup (bug #4714)

Browse source
This commit is contained in:
Andrei Kortunov 2018-11-13 10:00:12 +04:00
parent 194232abde
commit 71f1a53090
4 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -4,6 +4,7 @@
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
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

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();