From 81eb22614662d3d6230dfd94874e1b4f7c50f2d9 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 13 Apr 2016 14:39:53 +0200 Subject: [PATCH] Abort event-handling when TomahawkWindow's event-filter caught and handled a mouse event. --- src/tomahawk/TomahawkWindow.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 2f2c63289..f8ab49de6 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -1,6 +1,6 @@ /* === This file is part of Tomahawk Player - === * - * Copyright 2010-2015, Christian Muehlhaeuser + * Copyright 2010-2016, Christian Muehlhaeuser * Copyright 2010-2012, Leo Franchi * Copyright 2010-2012, Jeff Mitchell * Copyright 2012, Teo Mrnjavac @@ -722,11 +722,13 @@ TomahawkWindow::eventFilter( QObject* obj, QEvent* event ) { case Qt::XButton1: m_backAction->trigger(); - break; + event->accept(); + return true; case Qt::XButton2: m_forwardAction->trigger(); - break; + event->accept(); + return true; default: break; @@ -890,6 +892,7 @@ TomahawkWindow::audioStateChanged( AudioState newState, AudioState oldState ) #endif//Q_OS_WIN } + void TomahawkWindow::onHistoryBackAvailable( bool avail ) {