diff --git a/lib/documentview/abstractrasterimageviewtool.cpp b/lib/documentview/abstractrasterimageviewtool.cpp index 267f6a7d..8f41ba16 100644 --- a/lib/documentview/abstractrasterimageviewtool.cpp +++ b/lib/documentview/abstractrasterimageviewtool.cpp @@ -1,56 +1,62 @@ // vim: set tabstop=4 shiftwidth=4 expandtab: /* Gwenview: an image viewer Copyright 2007 Aurélien Gâteau This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ // Self #include "abstractrasterimageviewtool.h" // Qt +#include // KDE // Local #include "rasterimageview.h" namespace Gwenview { struct AbstractRasterImageViewToolPrivate { RasterImageView* mRasterImageView; }; AbstractRasterImageViewTool::AbstractRasterImageViewTool(RasterImageView* view) : QObject(view) , d(new AbstractRasterImageViewToolPrivate) { d->mRasterImageView = view; } AbstractRasterImageViewTool::~AbstractRasterImageViewTool() { delete d; } RasterImageView* AbstractRasterImageViewTool::imageView() const { return d->mRasterImageView; } +void AbstractRasterImageViewTool::wheelEvent(QGraphicsSceneWheelEvent* event) +{ + event->ignore(); +} + } // namespace diff --git a/lib/documentview/abstractrasterimageviewtool.h b/lib/documentview/abstractrasterimageviewtool.h index d49ab1f4..b2e41e6b 100644 --- a/lib/documentview/abstractrasterimageviewtool.h +++ b/lib/documentview/abstractrasterimageviewtool.h @@ -1,92 +1,91 @@ // vim: set tabstop=4 shiftwidth=4 expandtab: /* Gwenview: an image viewer Copyright 2007 Aurélien Gâteau This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef ABSTRACTRASTERIMAGEVIEWTOOL_H #define ABSTRACTRASTERIMAGEVIEWTOOL_H #include // Qt #include // KDE // Local class QKeyEvent; class QGraphicsSceneHoverEvent; class QGraphicsSceneMouseEvent; class QGraphicsSceneWheelEvent; class QPainter; namespace Gwenview { class RasterImageView; struct AbstractRasterImageViewToolPrivate; class GWENVIEWLIB_EXPORT AbstractRasterImageViewTool : public QObject { Q_OBJECT public: AbstractRasterImageViewTool(RasterImageView* view); virtual ~AbstractRasterImageViewTool(); RasterImageView* imageView() const; virtual void paint(QPainter*) {} virtual void mousePressEvent(QGraphicsSceneMouseEvent*) {} virtual void mouseMoveEvent(QGraphicsSceneMouseEvent*) {} virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent*) {} virtual void hoverMoveEvent(QGraphicsSceneHoverEvent*) {} - virtual void wheelEvent(QGraphicsSceneWheelEvent*) - {} + virtual void wheelEvent(QGraphicsSceneWheelEvent* event); virtual void keyPressEvent(QKeyEvent*) {} virtual void keyReleaseEvent(QKeyEvent*) {} virtual void toolActivated() {} virtual void toolDeactivated() {} virtual QWidget* widget() const { return nullptr; } public Q_SLOTS: virtual void onWidgetSlidedIn() {} private: AbstractRasterImageViewToolPrivate * const d; }; } // namespace #endif /* ABSTRACTRASTERIMAGEVIEWTOOL_H */