aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring. Smooth scrolling.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2016-01-25 15:49:37 +02:00
parent 11aae952cb
commit 387c33e9e0
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/libs/vwidgets/vmaingraphicsview.cpp
View File

@ -39,15 +39,18 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <qmath.h> #include <qmath.h>
const int GraphicsViewZoom::duration = 300;
const int GraphicsViewZoom::updateInterval = 40;
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
GraphicsViewZoom::GraphicsViewZoom(QGraphicsView* view) GraphicsViewZoom::GraphicsViewZoom(QGraphicsView* view)
: QObject(view), _view(view), _modifiers(Qt::ControlModifier), _zoom_factor_base(1.0015), : QObject(view), _view(view), _modifiers(Qt::ControlModifier), _zoom_factor_base(1.0015),
target_scene_pos(QPointF()), target_viewport_pos(QPointF()), anim(nullptr), _numScheduledScalings(0) target_scene_pos(QPointF()), target_viewport_pos(QPointF()), anim(nullptr), _numScheduledScrollings(0)
{ {
_view->viewport()->installEventFilter(this); _view->viewport()->installEventFilter(this);
_view->setMouseTracking(true); _view->setMouseTracking(true);
anim = new QTimeLine(300, this); anim = new QTimeLine(duration, this);
anim->setUpdateInterval(20); anim->setUpdateInterval(updateInterval);
connect(anim, &QTimeLine::valueChanged, this, &GraphicsViewZoom::scrollingTime, Qt::UniqueConnection); connect(anim, &QTimeLine::valueChanged, this, &GraphicsViewZoom::scrollingTime, Qt::UniqueConnection);
connect(anim, &QTimeLine::finished, this, &GraphicsViewZoom::animFinished, Qt::UniqueConnection); connect(anim, &QTimeLine::finished, this, &GraphicsViewZoom::animFinished, Qt::UniqueConnection);
} }
@ -91,9 +94,17 @@ void GraphicsViewZoom::set_zoom_factor_base(double value)
void GraphicsViewZoom::scrollingTime(qreal x) void GraphicsViewZoom::scrollingTime(qreal x)
{ {
Q_UNUSED(x); Q_UNUSED(x);
// Try to adapt scrolling to speed of rotating mouse wheel and scale factor
// Value of _numScheduledScrollings is too short, so we scale the value
qreal scroll = _view->verticalScrollBar()->pageStep()/60; qreal scroll = (qAbs(_numScheduledScrollings)*(10 + 10/_view->transform().m22()))/(duration/updateInterval);
if (_numScheduledScalings > 0)
if (qAbs(scroll) < 1)
{
scroll = 1;
}
if (_numScheduledScrollings > 0)
{ {
scroll = scroll * -1; scroll = scroll * -1;
} }
@ -103,7 +114,7 @@ void GraphicsViewZoom::scrollingTime(qreal x)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void GraphicsViewZoom::animFinished() void GraphicsViewZoom::animFinished()
{ {
_numScheduledScalings > 0 ? _numScheduledScalings-- : _numScheduledScalings++; _numScheduledScrollings = 0;
anim->stop(); anim->stop();
/* /*
@ -147,8 +158,8 @@ bool GraphicsViewZoom::eventFilter(QObject *object, QEvent *event)
{ {
if (wheel_event->orientation() == Qt::Vertical) if (wheel_event->orientation() == Qt::Vertical)
{ {
double angle = wheel_event->angleDelta().y(); const double angle = wheel_event->angleDelta().y();
double factor = qPow(_zoom_factor_base, angle); const double factor = qPow(_zoom_factor_base, angle);
gentle_zoom(factor); gentle_zoom(factor);
return true; return true;
} }
@ -172,10 +183,10 @@ bool GraphicsViewZoom::eventFilter(QObject *object, QEvent *event)
return true;//Just ignore return true;//Just ignore
} }
_numScheduledScalings += numSteps; _numScheduledScrollings += numSteps;
if (_numScheduledScalings * numSteps < 0) if (_numScheduledScrollings * numSteps < 0)
{ // if user moved the wheel in another direction, we reset { // if user moved the wheel in another direction, we reset previously scheduled scalings
_numScheduledScalings = numSteps; // previously scheduled scalings _numScheduledScrollings = numSteps;
} }
if (anim->state() != QTimeLine::Running) if (anim->state() != QTimeLine::Running)

5
src/libs/vwidgets/vmaingraphicsview.h
View File

@ -84,7 +84,10 @@ private:
QPointF target_viewport_pos; QPointF target_viewport_pos;
QTimeLine *anim; QTimeLine *anim;
/** @brief _numScheduledScalings keep number scheduled scalings. */ /** @brief _numScheduledScalings keep number scheduled scalings. */
qint32 _numScheduledScalings; qint32 _numScheduledScrollings;
static const int duration;
static const int updateInterval;
void FictiveSceneRect(QGraphicsScene *sc, QGraphicsView *view); void FictiveSceneRect(QGraphicsScene *sc, QGraphicsView *view);
}; };