mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-17 10:10:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'scrawl/master'

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-09-09 23:37:25 +02:00
commit 9ff4f5e6b7
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/openmw/mwclass/potion.cpp
View File

@ -137,6 +137,7 @@ namespace MWClass
text += MWGui::ToolTips::getValueString(ref->base->data.value, store.gameSettings.search("sValue")->str);
info.effects = MWGui::Widgets::MWEffectList::effectListFromESM(&ref->base->effects);
info.isPotion = true;
if (MWBase::Environment::get().getWindowManager()->getFullHelp()) {
text += MWGui::ToolTips::getMiscString(ref->ref.owner, "Owner");

3
apps/openmw/mwgui/tooltips.cpp
View File

@ -186,6 +186,7 @@ void ToolTips::onFrame(float frameDuration)
params.mMagnMax = it->magnMax;
params.mRange = it->range;
params.mIsConstant = (spell->data.type == ESM::Spell::ST_Ability);
params.mNoTarget = false;
effects.push_back(params);
}
info.effects = effects;
@ -420,7 +421,7 @@ IntSize ToolTips::createToolTip(const MWGui::ToolTipInfo& info)
effectsWidget->setEffectList(info.effects);
std::vector<MyGUI::WidgetPtr> effectItems;
effectsWidget->createEffectWidgets(effectItems, effectArea, coord, true, Widgets::MWEffectList::EF_NoTarget);
effectsWidget->createEffectWidgets(effectItems, effectArea, coord, true, info.isPotion ? Widgets::MWEffectList::EF_NoTarget : 0);
totalSize.height += coord.top-6;
totalSize.width = std::max(totalSize.width, coord.width);
}

6
apps/openmw/mwgui/tooltips.hpp
View File

@ -13,6 +13,10 @@ namespace MWGui
struct ToolTipInfo
{
public:
ToolTipInfo()
: isPotion(false)
{}
std::string caption;
std::string text;
std::string icon;
@ -22,6 +26,8 @@ namespace MWGui
// effects (for potions, ingredients)
Widgets::SpellEffectList effects;
bool isPotion; // potions do not show target in the tooltip
};
class ToolTips : public OEngine::GUI::Layout