Skip to content

Commit

Permalink
UI consistency fix in levelup dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
scrawl committed Feb 6, 2015
1 parent 61ec919 commit 9ce3e4b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
3 changes: 2 additions & 1 deletion apps/openmw/mwgui/levelupdialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ namespace MWGui

if(world->getStore().get<ESM::Class>().isDynamic(cls->mId))
{
// Vanilla uses thief.dds for custom classes.
// Choosing Stealth specialization and Speed/Agility as attributes, if possible. Otherwise fall back to first class found.
MWWorld::SharedIterator<ESM::Class> it = world->getStore().get<ESM::Class>().begin();
for(; it != world->getStore().get<ESM::Class>().end(); ++it)
Expand Down Expand Up @@ -173,6 +172,7 @@ namespace MWGui
if (pcStats.getAttribute(i).getBase() < 100)
{
mAttributes[i]->setEnabled(true);
mAttributeValues[i]->setEnabled(true);
availableAttributes++;

int mult = pcStats.getLevelupAttributeMultiplier (i);
Expand All @@ -182,6 +182,7 @@ namespace MWGui
else
{
mAttributes[i]->setEnabled(false);
mAttributeValues[i]->setEnabled(false);

text->setCaption("");
}
Expand Down
16 changes: 8 additions & 8 deletions files/mygui/openmw_levelup_dialog.layout
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_strength.dds"/>
<Property key="Caption" value="#{sAttributeStrength}"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="SandText" name="AttribVal1">
<Widget type="AutoSizedTextBox" skin="SandTextButton" name="AttribVal1">
</Widget>
</Widget>

Expand All @@ -64,7 +64,7 @@
<UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_int.dds"/>
<Property key="Caption" value="#{sAttributeIntelligence}"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="SandText" name="AttribVal2">
<Widget type="AutoSizedTextBox" skin="SandTextButton" name="AttribVal2">
</Widget>
</Widget>

Expand All @@ -78,7 +78,7 @@
<UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_wilpower.dds"/>
<Property key="Caption" value="#{sAttributeWillpower}"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="SandText" name="AttribVal3">
<Widget type="AutoSizedTextBox" skin="SandTextButton" name="AttribVal3">
</Widget>
</Widget>

Expand All @@ -92,7 +92,7 @@
<UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_agility.dds"/>
<Property key="Caption" value="#{sAttributeAgility}"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="SandText" name="AttribVal4">
<Widget type="AutoSizedTextBox" skin="SandTextButton" name="AttribVal4">
</Widget>
</Widget>

Expand All @@ -107,7 +107,7 @@
<UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_speed.dds"/>
<Property key="Caption" value="#{sAttributeSpeed}"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="SandText" name="AttribVal5">
<Widget type="AutoSizedTextBox" skin="SandTextButton" name="AttribVal5">
</Widget>
</Widget>

Expand All @@ -121,7 +121,7 @@
<UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_endurance.dds"/>
<Property key="Caption" value="#{sAttributeEndurance}"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="SandText" name="AttribVal6">
<Widget type="AutoSizedTextBox" skin="SandTextButton" name="AttribVal6">
</Widget>
</Widget>

Expand All @@ -135,7 +135,7 @@
<UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_personality.dds"/>
<Property key="Caption" value="#{sAttributePersonality}"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="SandText" name="AttribVal7">
<Widget type="AutoSizedTextBox" skin="SandTextButton" name="AttribVal7">
</Widget>
</Widget>

Expand All @@ -149,7 +149,7 @@
<UserString key="ImageTexture_AttributeImage" value="icons\k\attribute_luck.dds"/>
<Property key="Caption" value="#{sAttributeLuck}"/>
</Widget>
<Widget type="AutoSizedTextBox" skin="SandText" name="AttribVal8">
<Widget type="AutoSizedTextBox" skin="SandTextButton" name="AttribVal8">
</Widget>
</Widget>
</Widget>
Expand Down

0 comments on commit 9ce3e4b

Please sign in to comment.