Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #2533 from petriposio/master

[mouse] reworks the order of the mouse event handling (issue #2315)
  • Loading branch information...
commit 8d90fedea224a87312c27cb90c8429248849ad81 2 parents d106ccb + 721f365
jmarshallnz jmarshallnz authored
Showing with 10 additions and 0 deletions.
  1. +10 −0 xbmc/Application.cpp
10 xbmc/Application.cpp
View
@@ -3184,6 +3184,16 @@ bool CApplication::ProcessMouse()
CKey key(mousecommand | KEY_MOUSE, (unsigned int) 0);
CAction mouseaction = CButtonTranslator::GetInstance().GetAction(iWin, key);
+ // Deactivate mouse if non-mouse action
+ if (!mouseaction.IsMouse())
+ g_Mouse.SetActive(false);
+
+ // Consume ACTION_NOOP.
+ // Some views or dialogs gets closed after any ACTION and
+ // a sensitive mouse might cause problems.
+ if (mouseaction.GetID() == ACTION_NOOP)
+ return false;
+
// If we couldn't find an action return false to indicate we have not
// handled this mouse action
if (!mouseaction.GetID())
Please sign in to comment.
Something went wrong with that request. Please try again.