Permalink
Browse files

Merge pull request #2466 from ulion/fix_gesture_notify_action_on_full…

…screen

[Fix] ACTION_GESTURE_NOTIFY should not trigger osd.
  • Loading branch information...
Memphiz committed Mar 19, 2013
2 parents c28ead9 + e7be610 commit 44bf55cfec814e4c7f9cda9661b42ffababc8e1d
Showing with 4 additions and 0 deletions.
  1. +2 −0 xbmc/music/windows/GUIWindowVisualisation.cpp
  2. +2 −0 xbmc/video/windows/GUIWindowFullScreen.cpp
@@ -198,6 +198,8 @@ EVENT_RESULT CGUIWindowVisualisation::OnMouseEvent(const CPoint &point, const CM
OnAction(CAction(ACTION_SHOW_GUI));
return EVENT_RESULT_HANDLED;
}
+ if (event.m_id == ACTION_GESTURE_NOTIFY)
+ return EVENT_RESULT_UNHANDLED;
if (event.m_id != ACTION_MOUSE_MOVE || event.m_offsetX || event.m_offsetY)
{ // some other mouse action has occurred - bring up the OSD
CGUIDialog *pOSD = (CGUIDialog *)g_windowManager.GetWindow(WINDOW_DIALOG_MUSIC_OSD);
@@ -852,6 +852,8 @@ EVENT_RESULT CGUIWindowFullScreen::OnMouseEvent(const CPoint &point, const CMous
{
return g_application.OnAction(CAction(ACTION_ANALOG_SEEK_BACK, 0.5f)) ? EVENT_RESULT_HANDLED : EVENT_RESULT_UNHANDLED;
}
+ if (event.m_id == ACTION_GESTURE_NOTIFY)
+ return EVENT_RESULT_UNHANDLED;
if (event.m_id != ACTION_MOUSE_MOVE || event.m_offsetX || event.m_offsetY)
{ // some other mouse action has occurred - bring up the OSD
// if it is not already running

0 comments on commit 44bf55c

Please sign in to comment.