From 70901ddb1b932479d77d38564c238a9ca85f887c Mon Sep 17 00:00:00 2001 From: dismine Date: Mon, 21 Oct 2013 12:15:50 +0300 Subject: [PATCH] Wrong scaling in verticalScrollBar. --HG-- branch : develop --- widgets/vmaingraphicsview.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/widgets/vmaingraphicsview.cpp b/widgets/vmaingraphicsview.cpp index a8558bec3..7c3e78be1 100644 --- a/widgets/vmaingraphicsview.cpp +++ b/widgets/vmaingraphicsview.cpp @@ -53,14 +53,18 @@ void VMainGraphicsView::scalingTime(qreal x){ qreal factor = 1.0 + qreal(_numScheduledScalings) / 300.0; if (QApplication::keyboardModifiers() == Qt::ControlModifier){// If you press CTRL this code will execute scale(factor, factor); + emit NewFactor(factor); } else { if(_numScheduledScalings < 0){ verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() + factor*3.5)); + emit NewFactor(factor); } else { - verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() - factor*3.5)); + if(verticalScrollBar()->value() > 0){ + verticalScrollBar()->setValue(qRound(verticalScrollBar()->value() - factor*3.5)); + emit NewFactor(factor); + } } - } - emit NewFactor(factor); + } } void VMainGraphicsView::animFinished(){