mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-17 19:11:35 +00:00
Code Issues Releases Wiki Activity

Tooltips: dynamic stats, birthsign and hand-to-hand layout fixes

Browse source
This commit is contained in:
Andrei Kortunov 2017-04-30 22:39:05 +04:00
parent 27181367e2
commit 987677db75
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -183,7 +183,7 @@ namespace MWGui
int modified = static_cast<int>(value.getModified()); int modified = static_cast<int>(value.getModified());
MyGUI::Widget* w; MyGUI::Widget* w;
std::string valStr = MyGUI::utility::toString(current) + "/" + MyGUI::utility::toString(modified); std::string valStr = MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
if (id == "HBar") if (id == "HBar")
{ {
mHealth->setProgressRange(modified); mHealth->setProgressRange(modified);

6
apps/openmw/mwgui/review.cpp
View file

@ -164,7 +164,7 @@ namespace MWGui
int modified = static_cast<int>(value.getModified()); int modified = static_cast<int>(value.getModified());
mHealth->setValue(current, modified); mHealth->setValue(current, modified);
std::string valStr = MyGUI::utility::toString(current) + "/" + MyGUI::utility::toString(modified); std::string valStr = MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
mHealth->setUserString("Caption_HealthDescription", "#{sHealthDesc}\n" + valStr); mHealth->setUserString("Caption_HealthDescription", "#{sHealthDesc}\n" + valStr);
} }
@ -174,7 +174,7 @@ namespace MWGui
int modified = static_cast<int>(value.getModified()); int modified = static_cast<int>(value.getModified());
mMagicka->setValue(current, modified); mMagicka->setValue(current, modified);
std::string valStr = MyGUI::utility::toString(current) + "/" + MyGUI::utility::toString(modified); std::string valStr = MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
mMagicka->setUserString("Caption_HealthDescription", "#{sMagDesc}\n" + valStr); mMagicka->setUserString("Caption_HealthDescription", "#{sMagDesc}\n" + valStr);
} }
@ -184,7 +184,7 @@ namespace MWGui
int modified = static_cast<int>(value.getModified()); int modified = static_cast<int>(value.getModified());
mFatigue->setValue(current, modified); mFatigue->setValue(current, modified);
std::string valStr = MyGUI::utility::toString(current) + "/" + MyGUI::utility::toString(modified); std::string valStr = MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
mFatigue->setUserString("Caption_HealthDescription", "#{sFatDesc}\n" + valStr); mFatigue->setUserString("Caption_HealthDescription", "#{sFatDesc}\n" + valStr);
} }

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

@ -154,7 +154,7 @@ namespace MWGui
// health, magicka, fatigue tooltip // health, magicka, fatigue tooltip
MyGUI::Widget* w; MyGUI::Widget* w;
std::string valStr = MyGUI::utility::toString(current) + "/" + MyGUI::utility::toString(modified); std::string valStr = MyGUI::utility::toString(current) + " / " + MyGUI::utility::toString(modified);
if (id == "HBar") if (id == "HBar")
{ {
getWidget(w, "Health"); getWidget(w, "Health");

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

@ -785,7 +785,7 @@ namespace MWGui
{ {
if (it == categories[category].spells.begin()) if (it == categories[category].spells.begin())
{ {
text += std::string("\n#{fontcolourhtml=header}") + std::string("#{") + categories[category].label + "}"; text += std::string("\n\n#{fontcolourhtml=header}") + std::string("#{") + categories[category].label + "}";
} }
const std::string &spellId = *it; const std::string &spellId = *it;

8
files/mygui/openmw_tooltips.layout
View file

@ -86,7 +86,7 @@
<!-- Hand-to-hand tooltip --> <!-- Hand-to-hand tooltip -->
<Widget type="HBox" skin="HUD_Box_NoTransp" position="0 0 300 300" align="Stretch" name="HandToHandToolTip"> <Widget type="HBox" skin="HUD_Box_NoTransp" position="0 0 300 300" align="Stretch" name="HandToHandToolTip">
<Property key="AutoResize" value="true"/> <Property key="AutoResize" value="true"/>
<Property key="Padding" value="8"/> <Property key="Padding" value="6"/>
<Widget type="VBox"> <Widget type="VBox">
<UserString key="VStretch" value="true"/> <UserString key="VStretch" value="true"/>
@ -102,9 +102,9 @@
</Widget> </Widget>
<!-- Health/Magicka/Fatigue tooltip --> <!-- Health/Magicka/Fatigue tooltip -->
<Widget type="HBox" skin="HUD_Box_NoTransp" position="0 0 300 300" align="Stretch" name="HealthToolTip"> <Widget type="HBox" skin="HUD_Box_NoTransp" position="0 0 0 0" align="Stretch" name="HealthToolTip">
<Property key="AutoResize" value="true"/> <Property key="AutoResize" value="true"/>
<Property key="Padding" value="8"/> <Property key="Padding" value="14"/>
<Property key="Spacing" value="8"/> <Property key="Spacing" value="8"/>
<Widget type="VBox"> <Widget type="VBox">
@ -115,7 +115,7 @@
</Widget> </Widget>
</Widget> </Widget>
<Widget type="AutoSizedEditBox" skin="SandText" position="44 8 248 284" align="Left Top" name="HealthDescription"> <Widget type="AutoSizedEditBox" skin="SandText" position="44 8 392 0" align="Left Top" name="HealthDescription">
<Property key="MultiLine" value="true"/> <Property key="MultiLine" value="true"/>
<Property key="WordWrap" value="true"/> <Property key="WordWrap" value="true"/>
<Property key="TextAlign" value="Left Top"/> <Property key="TextAlign" value="Left Top"/>