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

More attempts at tweaking ribbon row-count decision formula

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8696 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-05-24 01:12:21 +00:00
parent ab3822242f
commit 19ce15aee9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,7 @@ void DynamicRibbonWidget::add()
// const int count = m_items.size(); // const int count = m_items.size();
m_row_amount = -1; m_row_amount = -1;
int max_score_so_far = -1; float max_score_so_far = -1;
if (m_h - m_label_height < 0) if (m_h - m_label_height < 0)
{ {
@ -228,8 +228,8 @@ void DynamicRibbonWidget::add()
// requested in the XML file will also be penalized. // requested in the XML file will also be penalized.
float ratio = (float)item_height / (float)m_child_height; float ratio = (float)item_height / (float)m_child_height;
float total_area = m_w * m_h; float total_area = m_w * m_h;
const int score = int(log(2.0f*visible_items) * const float score = log(2.0f*visible_items) *
std::min(ratio, 1.0f) * std::min(taken_area/total_area, 1.0f)); std::min(ratio, 1.0f) * std::min(taken_area/total_area, 1.0f);
//std::cout << " " << row_count << " rows : " << visible_items << " visible items; 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) // << taken_area << "; size penalty = " << std::min((float)item_height / (float)m_child_height, 1.0f)