Fixed word wrap in achievements description and make close button slightly bigger.

This commit is contained in:
Deve 2018-11-03 23:25:50 +01:00
parent 1c8f2afd28
commit 6ae89331c0
2 changed files with 7 additions and 15 deletions

View File

@ -2,28 +2,20 @@
<stkgui>
<div x="2%" y="2%" width="100%" height="96%" layout="vertical-row">
<!-- The achievement's name is filled in the header at runtime -->
<header id="title" width="96%" height="10%" text_align="center"
word_wrap="true"/>
<header id="title" width="100%" align="center" text_align="center"/>
<spacer width="20" height="1%" />
<label id="description" width="90%" height="12%" align="center"
<label id="description" width="90%" proportion="1" align="center"
text_align="center" word_wrap="true" text=""/>
<spacer width="20" height="1%" />
<box width="96%" height="64%" align="center" layout="vertical-row"
padding="6">
<box width="90%" proportion="2" align="center" layout="vertical-row">
<list id="progress-tree" x="0" y="0" width="100%" height="100%" word_wrap="true"/>
</box>
<spacer width="20" height="1%" />
<buttonbar id="options" width="90%" height="10%" align="center">
<icon-button id="ok" width="16" height="16"
<buttonbar id="options" width="90%" height="15%" align="center">
<icon-button id="ok" width="128" height="128"
icon="gui/icons/green_check.png" text="OK"
label_location="bottom"/>
</buttonbar>
<spacer width="20" height="1%" />
<spacer width="20" height="3%" />
</div>
</stkgui>

View File

@ -315,7 +315,7 @@ void AchievementProgressDialog::init()
LabelWidget* description = getWidget<LabelWidget>("description");
assert(description != NULL);
core::stringw description_text = m_achievement->getInfo()->getDescription();
description->setText(description_text, true /* expand as needed */);
description->setText(description_text, false);
} // init
// -----------------------------------------------------------------------------