ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix challenges screen

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8081 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-03-27 01:10:06 +00:00
parent e37780572e
commit f3f58cc297
2 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/gui/challenges.stkgui
View File

@ -6,15 +6,15 @@
<header I18N="Title for challenges screen" text="Challenges : Trophy Room" text_align="center" align="center" width="80%" />
<spacer proportion="1" width="100%"/>
<spacer height="5" width="100%"/>
<box id="animated_area" width="100%" height="5" layout="vertical-row">
<box width="100%" proportion="5" layout="vertical-row">
<ribbon_grid id="challenges" proportion="3" width="100%"
<ribbon_grid id="challenges" proportion="8" width="100%"
label_location="bottom" align="center" child_width="128" child_height="128" />
<spacer proportion="1" width="100%"/>
</box>
</div>
</stkgui>

65
src/guiengine/widgets/dynamic_ribbon_widget.cpp
View File

@ -76,6 +76,7 @@ void estimateIconAreaFor(const int rowCount, const int wantedIconWidth,
const float iconAspectRatio,
int* visibleItems, int* takenArea, int* itemHeight)
{
assert(height > 0);
const int row_height = height / rowCount;
float icon_height = (float)row_height;
@ -190,36 +191,44 @@ void DynamicRibbonWidget::add()
m_row_amount = -1;
int max_score_so_far = -1;
for (int row_count = 1; row_count < 10; row_count++)
if (m_h - m_label_height < 0)
{
int visible_items;
int taken_area;
int item_height;
estimateIconAreaFor(row_count, m_child_width, m_w, m_h - m_label_height,
aspect_ratio, &visible_items, &taken_area, &item_height);
// FIXME: this system to determine the best number of columns is really complicated!
// the score is computed from taken screen area AND visible item count.
// A number of rows that allows for the screen space to be used a lot will
// get a better score. A number of rows that allows showing very few items
// will be penalized. A configuration that makes items much smaller than
// requested in the XML file will also be penalized.
const int score = int(log(2.0f*visible_items) *
std::min((float)item_height / (float)m_child_height, 1.0f) *
taken_area);
//std::cout << " " << row_count << " rows : " << visible_items << " visible items; area = "
// << taken_area << "; size penalty = " << std::min((float)item_height / (float)m_child_height, 1.0f)
// << "; score = " << score << "\n";
if (score > max_score_so_far)
{
m_row_amount = row_count;
max_score_so_far = score;
}
fprintf(stderr, "[DynamicRibbonWidget] WARNING: the widget is too small for anything to fit in it!!\n");
m_row_amount = 1;
}
else
{
for (int row_count = 1; row_count < 10; row_count++)
{
int visible_items;
int taken_area;
int item_height;
estimateIconAreaFor(row_count, m_child_width, m_w, m_h - m_label_height,
aspect_ratio, &visible_items, &taken_area, &item_height);
// FIXME: this system to determine the best number of columns is really complicated!
// the score is computed from taken screen area AND visible item count.
// A number of rows that allows for the screen space to be used a lot will
// get a better score. A number of rows that allows showing very few items
// will be penalized. A configuration that makes items much smaller than
// requested in the XML file will also be penalized.
const int score = int(log(2.0f*visible_items) *
std::min((float)item_height / (float)m_child_height, 1.0f) *
taken_area);
//std::cout << " " << row_count << " rows : " << visible_items << " visible items; area = "
// << taken_area << "; size penalty = " << std::min((float)item_height / (float)m_child_height, 1.0f)
// << "; score = " << score << "\n";
if (score > max_score_so_far)
{
m_row_amount = row_count;
max_score_so_far = score;
}
}
assert(m_row_amount != -1);
}
assert(m_row_amount != -1);
// m_row_amount = (int)round((m_h - m_label_height) / (float)m_child_height);