From fd94d7a7165319769b6de1ae807acb460771a60d Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Fri, 9 Apr 2010 17:22:45 +0200
Subject: [PATCH] QmlDesigner.propertyEditor: fixes mousewheel handling in
spinboxes
See Bauhaus BAUHAUS-571
---
.../propertyeditor/basicwidgets.cpp | 44 -------------------
1 file changed, 44 deletions(-)
diff --git a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
index 3699c05065e..cc76c6183a3 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/basicwidgets.cpp
@@ -853,9 +853,6 @@ class QScrollAreaDeclarativeUI : public QObject
Q_PROPERTY(QWidget *content READ content WRITE setContent)
Q_CLASSINFO("DefaultProperty", "content")
-public slots:
- void setupProperWheelBehaviour();
-
public:
QScrollAreaDeclarativeUI(QObject *parent = 0) : QObject(parent), _content(0)
{
@@ -869,53 +866,12 @@ private:
_content = content;
sa->setWidget(content);
sa->verticalScrollBar()->show();
- setupProperWheelBehaviour();
}
QWidget *_content;
QScrollArea *sa;
};
-class MouseWheelFilter : public QObject
-{
- Q_OBJECT
-public:
- MouseWheelFilter(QObject *parent) : QObject(parent), m_target(0) { }
-
- void setTarget(QObject *target) { m_target = target; }
-
-protected:
- bool eventFilter(QObject *obj, QEvent *event);
-private:
- QObject *m_target;
-};
-
-bool MouseWheelFilter::eventFilter(QObject *obj, QEvent *event)
-{
- if (event->type() == QEvent::Wheel) {
- if (obj
- && obj->isWidgetType()
- && obj != m_target) {
- QApplication::sendEvent(m_target, event);
- return true;
- }
- }
- return QObject::eventFilter(obj, event);
-}
-
-void QScrollAreaDeclarativeUI::setupProperWheelBehaviour()
-{
-// We install here an eventfilter to avoid that scrolling in
-// in the ScrollArea changes values in editor widgets
- if (_content) {
- MouseWheelFilter *forwarder(new MouseWheelFilter(this));
- forwarder->setTarget(_content);
-
- foreach (QWidget *childWidget, _content->findChildren<QWidget*>()) {
- childWidget->installEventFilter(forwarder);
- }
- }
-}
class WidgetLoader : public QWidget
{
--
GitLab