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

Block event for one-element ribbon widget in the same way as multi-element widget.

Browse Source 
This fixes problem with pressing left and right arrow in track and GP info screen.
This commit is contained in:
Deve 2014-09-14 17:06:21 +02:00
parent 26b69ecace
commit 8ea38fe622
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,9 +474,11 @@ void RibbonWidget::select(std::string item, const int mousePlayerID)
// ----------------------------------------------------------------------------
EventPropagation RibbonWidget::rightPressed(const int playerID)
{
if (m_deactivated) return EVENT_LET;
EventPropagation result = m_ribbon_type != RIBBON_TOOLBAR ? EVENT_LET : EVENT_BLOCK;
if (m_deactivated) return result;
// empty ribbon, or only one item (can't move right)
if (m_active_children.size() < 2) return EVENT_LET;
if (m_active_children.size() < 2) return result;
m_selection[playerID]++;
@ -506,15 +508,17 @@ EventPropagation RibbonWidget::rightPressed(const int playerID)
}
}
return m_ribbon_type != RIBBON_TOOLBAR ? EVENT_LET : EVENT_BLOCK;
return result;
} // rightPressed
// ----------------------------------------------------------------------------
EventPropagation RibbonWidget::leftPressed(const int playerID)
{
if (m_deactivated) return EVENT_LET;
EventPropagation result = m_ribbon_type != RIBBON_TOOLBAR ? EVENT_LET : EVENT_BLOCK;
if (m_deactivated) return result;
// empty ribbon, or only one item (can't move left)
if (m_active_children.size() < 2) return EVENT_LET;
if (m_active_children.size() < 2) return result;
m_selection[playerID]--;
if (m_selection[playerID] < 0)
@ -543,15 +547,12 @@ EventPropagation RibbonWidget::leftPressed(const int playerID)
if (m_selection[playerID] > 0) leftPressed(playerID);
}
if (m_ribbon_type != RIBBON_TOOLBAR)
{
//if (m_ribbon_type != RIBBON_TOOLBAR)
//{
//GUIEngine::transmitEvent( this, m_properties[PROP_ID], playerID );
return EVENT_LET;
}
else
{
return EVENT_BLOCK;
}
//}
return result;
} // leftPressed
// ----------------------------------------------------------------------------