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

Started dealing with [?] squares in ribbons

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4328 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2009-12-22 18:39:55 +00:00
parent e83edfec28
commit 509ab5934f
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,6 +187,7 @@ void DynamicRibbonWidget::setSubElements()
}
// ---- add rows
int added_item_count = 0;
for (int n=0; n<m_row_amount; n++)
{
RibbonWidget* ribbon;
@@ -230,6 +231,10 @@ void DynamicRibbonWidget::setSubElements()
// std::cout << "ribbon text = " << m_properties[PROP_TEXT].c_str() << std::endl;
ribbon->m_children.push_back( icon );
added_item_count++;
// stop adding columns when we have enough items
if (added_item_count >= item_count) break;
}
m_children.push_back( ribbon );
m_rows.push_back( ribbon );
@@ -444,6 +449,11 @@ EventPropagation DynamicRibbonWidget::focused(const int playerID)
// -----------------------------------------------------------------------------
void DynamicRibbonWidget::onRowChange(RibbonWidget* row, const int playerID)
{
if (row->m_selection[playerID] >= row->m_children.size())
{
row->m_selection[playerID] = row->m_children.size()-1;
}
updateLabel(row);
const int listenerAmount = m_hover_listeners.size();
@@ -513,7 +523,7 @@ void DynamicRibbonWidget::propagateSelection()
RibbonWidget* ribbon = m_rows.get(n);
if (ribbon != selected_ribbon)
{
ribbon->m_selection[p] = relative_selection;
ribbon->m_selection[p] = std::min(relative_selection, ribbon->m_children.size()-1);
ribbon->updateSelection();
}
}
@@ -568,7 +578,8 @@ void DynamicRibbonWidget::updateItemDisplay()
{
RibbonWidget& row = m_rows[n];
for (int i=0; i<m_col_amount; i++)
const int items_in_row = row.m_children.size();
for (int i=0; i<items_in_row; i++)
{
IconButtonWidget* icon = dynamic_cast<IconButtonWidget*>(&row.m_children[i]);
assert(icon != NULL);

2
src/states_screens/challenges.cpp
View File

@@ -78,7 +78,7 @@ namespace GUIEngine
for (int n=0; n<lockedChallengeAmount; n++)
{
w->addItem( _("Locked : solve active challenges to gain access to more!"), "locked",
file_manager->getTextureFile("gui_lock.png"));
file_manager->getGUIDir() + "/challenge.png", true);
}