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

Fixed problem in dynamic ribbon widgets which contain animations, labels and more than one row.

Browse Source 
Thanks to marcoll.
This commit is contained in:
Deve 2014-12-13 12:45:55 +01:00
parent 91f6fbbb43
commit 1a4f6e51ee
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -985,6 +985,8 @@ void DynamicRibbonWidget::updateItemDisplay()
icon->setImage( "textures/transparence.png", IconButtonWidget::ICON_PATH_TYPE_RELATIVE ); icon->setImage( "textures/transparence.png", IconButtonWidget::ICON_PATH_TYPE_RELATIVE );
icon->resetAllBadges(); icon->resetAllBadges();
icon->m_properties[PROP_ID] = RibbonWidget::NO_ITEM_ID; icon->m_properties[PROP_ID] = RibbonWidget::NO_ITEM_ID;
icon->setLabel(L"");
icon->m_text = L"";
//std::cout << " item " << i << " is a FILLER\n"; //std::cout << " item " << i << " is a FILLER\n";
} }
} }
@ -1006,14 +1008,10 @@ void DynamicRibbonWidget::update(float dt)
{ {
int col_scroll = i + m_scroll_offset; int col_scroll = i + m_scroll_offset;
int item_id = (col_scroll)*row_amount + n; int item_id = (col_scroll)*row_amount + n;
if (item_id >= (int)m_items.size()) item_id -= (int)m_items.size();
assert(item_id >= 0); assert(item_id >= 0);
assert(item_id < (int)m_items.size());
//m_items[icon_id]. if (item_id < (int)m_items.size() && m_items[item_id].m_animated)
if (m_items[item_id].m_animated)
{ {
const int frameBefore = (int)(m_items[item_id].m_curr_time / m_items[item_id].m_time_per_frame); const int frameBefore = (int)(m_items[item_id].m_curr_time / m_items[item_id].m_time_per_frame);