mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 07:53:53 +00:00
Code Issues Releases Wiki Activity

Merge branch 'AlchemyQuestionMarkNotCentered' into 'master'

Browse source 
Fixes the offset question mark in the alchemy tooltip when the effect is not known

See merge request OpenMW/openmw!143
This commit is contained in:
Andrei Kortunov 2019-09-02 17:13:56 +00:00
commit 08614f6a87
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -129,6 +129,7 @@
Bug #5106: Still can jump even when encumbered Bug #5106: Still can jump even when encumbered
Bug #5110: ModRegion with a redundant numerical argument breaks script execution Bug #5110: ModRegion with a redundant numerical argument breaks script execution
Bug #5112: Insufficient magicka for current spell not reflected on HUD icon Bug #5112: Insufficient magicka for current spell not reflected on HUD icon
Bug #5113: Unknown alchemy question mark not centered
Bug #5123: Script won't run on respawn Bug #5123: Script won't run on respawn
Bug #5124: Arrow remains attached to actor if pulling animation was cancelled Bug #5124: Arrow remains attached to actor if pulling animation was cancelled
Bug #5126: Swimming creatures without RunForward animations are motionless during combat Bug #5126: Swimming creatures without RunForward animations are motionless during combat

5
apps/openmw/mwgui/widgets.cpp
View file

@ -375,7 +375,8 @@ namespace MWGui
if (!mEffectParams.mKnown) if (!mEffectParams.mKnown)
{ {
mTextWidget->setCaption ("?"); mTextWidget->setCaption ("?");
mRequestedWidth = mTextWidget->getTextSize().width + 24; mTextWidget->setCoord(sIconOffset / 2, mTextWidget->getCoord().top, mTextWidget->getCoord().width, mTextWidget->getCoord().height); // Compensates for the missing image when effect is not known
mRequestedWidth = mTextWidget->getTextSize().width + sIconOffset;
mImageWidget->setImageTexture (""); mImageWidget->setImageTexture ("");
return; return;
} }
@ -466,7 +467,7 @@ namespace MWGui
} }
mTextWidget->setCaptionWithReplacing(spellLine); mTextWidget->setCaptionWithReplacing(spellLine);
mRequestedWidth = mTextWidget->getTextSize().width + 24; mRequestedWidth = mTextWidget->getTextSize().width + sIconOffset;
mImageWidget->setImageTexture(MWBase::Environment::get().getWindowManager()->correctIconPath(magicEffect->mIcon)); mImageWidget->setImageTexture(MWBase::Environment::get().getWindowManager()->correctIconPath(magicEffect->mIcon));
} }

1
apps/openmw/mwgui/widgets.hpp
View file

@ -268,6 +268,7 @@ namespace MWGui
virtual void initialiseOverride(); virtual void initialiseOverride();
private: private:
static const int sIconOffset = 24;
void updateWidgets(); void updateWidgets();