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

Fixed crash when pressing left/right on an empty row of a ribbon (more work later to avoid letting the user focus ever go on an empty row...)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5322 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2010-04-30 01:28:57 +00:00
parent 73e425fd6a
commit baabc572aa
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/guiengine/widgets/ribbon_widget.cpp
View File

@ -308,7 +308,8 @@ void RibbonWidget::select(std::string item, const int mousePlayerID)
EventPropagation RibbonWidget::rightPressed(const int playerID)
{
if (m_deactivated) return EVENT_LET;
if (m_children.size() < 2) return EVENT_LET; // empty ribbon, or only one item (can't move right)
m_selection[playerID]++;
if (m_selection[playerID] >= m_children.size())
{
@ -328,11 +329,14 @@ EventPropagation RibbonWidget::rightPressed(const int playerID)
}
}
// if we reached a filler item, move again
// if we reached a filler item, move again (but don't warp)
// FIXME: why is a constant from DynamicRibbon used here??
if (getSelectionIDString(playerID) == DynamicRibbonWidget::NO_ITEM_ID)
{
rightPressed(playerID);
if (m_selection[playerID] + 1 < m_children.size())
{
rightPressed(playerID);
}
}
if (m_ribbon_type != RIBBON_TOOLBAR)
@ -349,7 +353,8 @@ EventPropagation RibbonWidget::rightPressed(const int playerID)
EventPropagation RibbonWidget::leftPressed(const int playerID)
{
if (m_deactivated) return EVENT_LET;
if (m_children.size() < 2) return EVENT_LET; // empty ribbon, or only one item (can't move left)
m_selection[playerID]--;
if (m_selection[playerID] < 0)
{
@ -369,10 +374,10 @@ EventPropagation RibbonWidget::leftPressed(const int playerID)
}
}
// if we reached a filler item, move again
// if we reached a filler item, move again (but don't warp)
if (getSelectionIDString(playerID) == DynamicRibbonWidget::NO_ITEM_ID)
{
leftPressed(playerID);
if (m_selection[playerID] > 0) leftPressed(playerID);
}
if (m_ribbon_type != RIBBON_TOOLBAR)