diff options
Diffstat (limited to 'guilib/GUIButtonScroller.cpp')
| -rw-r--r-- | guilib/GUIButtonScroller.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/guilib/GUIButtonScroller.cpp b/guilib/GUIButtonScroller.cpp index 509b9b6145..2db7e8831f 100644 --- a/guilib/GUIButtonScroller.cpp +++ b/guilib/GUIButtonScroller.cpp @@ -114,7 +114,7 @@ CGUIButtonScroller::~CGUIButtonScroller(void) bool CGUIButtonScroller::OnAction(const CAction &action) { - if (action.actionId == ACTION_SELECT_ITEM) + if (action.GetID() == ACTION_SELECT_ITEM) { // send the appropriate message to the parent window vector<CGUIActionDescriptor> actions = m_vecButtons[GetActiveButton()]->clickActions; @@ -127,15 +127,15 @@ bool CGUIButtonScroller::OnAction(const CAction &action) } return true; } - if (action.actionId == ACTION_CONTEXT_MENU) + if (action.GetID() == ACTION_CONTEXT_MENU) { // send a click message to our parent - SEND_CLICK_MESSAGE(GetID(), GetParentID(), action.actionId); + SEND_CLICK_MESSAGE(GetID(), GetParentID(), action.GetID()); return true; } // smooth scrolling (for analog controls) - if (action.actionId == ACTION_SCROLL_UP) + if (action.GetID() == ACTION_SCROLL_UP) { - m_fAnalogScrollSpeed += action.amount1 * action.amount1; + m_fAnalogScrollSpeed += action.GetAmount() * action.GetAmount(); bool handled = false; while (m_fAnalogScrollSpeed > ANALOG_SCROLL_START) { @@ -147,9 +147,9 @@ bool CGUIButtonScroller::OnAction(const CAction &action) } return handled; } - if (action.actionId == ACTION_SCROLL_DOWN) + if (action.GetID() == ACTION_SCROLL_DOWN) { - m_fAnalogScrollSpeed += action.amount1 * action.amount1; + m_fAnalogScrollSpeed += action.GetAmount() * action.GetAmount(); bool handled = false; while (m_fAnalogScrollSpeed > ANALOG_SCROLL_START) { |