From 19ce15aee9f8657359fce6db83720c2f2e24f61c Mon Sep 17 00:00:00 2001 From: auria Date: Tue, 24 May 2011 01:12:21 +0000 Subject: [PATCH] More attempts at tweaking ribbon row-count decision formula git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8696 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- src/guiengine/widgets/dynamic_ribbon_widget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.cpp b/src/guiengine/widgets/dynamic_ribbon_widget.cpp index d712b6953..a5537542a 100644 --- a/src/guiengine/widgets/dynamic_ribbon_widget.cpp +++ b/src/guiengine/widgets/dynamic_ribbon_widget.cpp @@ -202,7 +202,7 @@ void DynamicRibbonWidget::add() // const int count = m_items.size(); m_row_amount = -1; - int max_score_so_far = -1; + float max_score_so_far = -1; if (m_h - m_label_height < 0) { @@ -228,8 +228,8 @@ void DynamicRibbonWidget::add() // requested in the XML file will also be penalized. float ratio = (float)item_height / (float)m_child_height; float total_area = m_w * m_h; - const int score = int(log(2.0f*visible_items) * - std::min(ratio, 1.0f) * std::min(taken_area/total_area, 1.0f)); + const float score = log(2.0f*visible_items) * + std::min(ratio, 1.0f) * std::min(taken_area/total_area, 1.0f); //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)