From 9d38b866f91e687a17c1310ddef897c71be5a72c Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@digia.com>
Date: Tue, 3 Sep 2013 14:06:31 +0200
Subject: [PATCH] QmlProfiler: Remove ScrollableQuickView
As the timeline can scroll by itself now we don't need an external
scrolling helper anymore.
Change-Id: I831eaf2302ced7649b4746e5c7d10121d83a4794
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
---
.../qmlprofiler/qmlprofilertraceview.cpp | 49 +------------------
.../qmlprofiler/qmlprofilertraceview.h | 23 ---------
2 files changed, 2 insertions(+), 70 deletions(-)
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
index ce110327a4f..645c17b60b0 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
@@ -59,19 +59,6 @@ using namespace QmlDebug;
namespace QmlProfiler {
namespace Internal {
-/////////////////////////////////////////////////////////
-bool MouseWheelResizer::eventFilter(QObject *obj, QEvent *event)
-{
- if (event->type() == QEvent::Wheel) {
- QWheelEvent *ev = static_cast<QWheelEvent *>(event);
- if (ev->modifiers() & Qt::ControlModifier) {
- emit mouseWheelMoved(ev->pos().x(), ev->pos().y(), ev->delta());
- return true;
- }
- }
- return QObject::eventFilter(obj, event);
-}
-
/////////////////////////////////////////////////////////
void ZoomControl::setRange(qint64 startTime, qint64 endTime)
{
@@ -82,25 +69,6 @@ void ZoomControl::setRange(qint64 startTime, qint64 endTime)
}
}
-/////////////////////////////////////////////////////////
-ScrollableQuickView::ScrollableQuickView(QQuickView *parent)
- : QQuickView(parent)
-{
-}
-
-ScrollableQuickView::~ScrollableQuickView()
-{
-}
-
-void ScrollableQuickView::scrollContentsBy(int /*dx*/, int dy)
-{
- // special workaround to track the scrollbar
- if (rootObject()) {
- int scrollY = rootObject()->property("scrollY").toInt();
- rootObject()->setProperty("scrollY", QVariant(scrollY - dy));
- }
-}
-
/////////////////////////////////////////////////////////
class QmlProfilerTraceView::QmlProfilerTraceViewPrivate
{
@@ -121,7 +89,7 @@ public:
QSize m_sizeHint;
- ScrollableQuickView *m_mainView;
+ QQuickView *m_mainView;
QQuickView *m_timebar;
QQuickView *m_overview;
QmlProfilerModelManager *m_modelManager;
@@ -146,13 +114,10 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, Analyzer::IAnalyzerT
groupLayout->setContentsMargins(0, 0, 0, 0);
groupLayout->setSpacing(0);
- d->m_mainView = new ScrollableQuickView();
+ d->m_mainView = new QQuickView();
d->m_mainView->setResizeMode(QQuickView::SizeRootObjectToView);
QWidget *mainViewContainer = QWidget::createWindowContainer(d->m_mainView);
- MouseWheelResizer *resizer = new MouseWheelResizer(this);
- connect(resizer,SIGNAL(mouseWheelMoved(int,int,int)), this, SLOT(mouseWheelMoved(int,int,int)));
-
QHBoxLayout *toolsLayout = new QHBoxLayout;
d->m_timebar = new QQuickView();
@@ -414,16 +379,6 @@ void QmlProfilerTraceView::updateRange()
QMetaObject::invokeMethod(d->m_mainView->rootObject()->findChild<QObject*>(QLatin1String("zoomSliderToolBar")), "updateZoomLevel");
}
-void QmlProfilerTraceView::mouseWheelMoved(int mouseX, int mouseY, int wheelDelta)
-{
- Q_UNUSED(mouseY);
- QQuickItem *rootObject = d->m_mainView->rootObject();
- if (rootObject) {
- QMetaObject::invokeMethod(rootObject, "wheelZoom",
- Q_ARG(QVariant, QVariant(mouseX)),
- Q_ARG(QVariant, QVariant(wheelDelta)));
- }
-}
////////////////////////////////////////////////////////
void QmlProfilerTraceView::updateToolTip(const QString &text)
{
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.h b/src/plugins/qmlprofiler/qmlprofilertraceview.h
index 9a956d9fe43..da8f66966a7 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.h
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.h
@@ -45,17 +45,6 @@ namespace Internal {
class QmlProfilerStateManager;
class QmlProfilerViewManager;
-// capture mouse wheel events
-class MouseWheelResizer : public QObject {
- Q_OBJECT
-public:
- MouseWheelResizer(QObject *parent=0):QObject(parent){}
-protected:
- bool eventFilter(QObject *obj, QEvent *event);
-signals:
- void mouseWheelMoved(int x, int y, int delta);
-};
-
// centralized zoom control
class ZoomControl : public QObject {
Q_OBJECT
@@ -75,17 +64,6 @@ private:
qint64 m_endTime;
};
-class ScrollableQuickView : public QQuickView
-{
- Q_OBJECT
-public:
- explicit ScrollableQuickView(QQuickView *parent = 0);
- ~ScrollableQuickView();
-protected:
- void scrollContentsBy(int dx, int dy);
-};
-
-
class QmlProfilerTraceView : public QWidget
{
Q_OBJECT
@@ -113,7 +91,6 @@ private slots:
void updateLockButton();
void updateRange();
- void mouseWheelMoved(int mouseX, int mouseY, int wheelDelta);
void updateToolTip(const QString &text);
void profilerDataModelStateChanged();
--
GitLab