Qt5: fix deprecation warnings of QWheelEvent in Qt 5.15
This commit is contained in:
@@ -197,7 +197,11 @@ void SvgView::paintEvent(QPaintEvent *event)
|
||||
|
||||
void SvgView::wheelEvent(QWheelEvent *event)
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
|
||||
int delta = -event->angleDelta().y();
|
||||
#else
|
||||
int delta = -event->delta();
|
||||
#endif
|
||||
if (m_invertZoom)
|
||||
delta = -delta;
|
||||
qreal factor = std::pow(1.2, delta / 240.0);
|
||||
|
||||
@@ -476,11 +476,21 @@ void ImageView::wheelEvent(QWheelEvent * cEvent)
|
||||
// Mouse event coordinates are relative to top-left of image view (including toolbar!)
|
||||
// Get current cursor position relative to top-left of image box
|
||||
QPoint offset = _pGLImageBox->pos();
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5,15,0)
|
||||
QPoint pos = cEvent->position().toPoint();
|
||||
int box_x = pos.x() - offset.x();
|
||||
int box_y = pos.y() - offset.y();
|
||||
#else
|
||||
int box_x = cEvent->x() - offset.x();
|
||||
int box_y = cEvent->y() - offset.y();
|
||||
#endif
|
||||
|
||||
// Zoom around centrally displayed image point
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
|
||||
int numTicks = cEvent->angleDelta().y() / 120;
|
||||
#else
|
||||
int numTicks = cEvent->delta() / 120;
|
||||
#endif
|
||||
if (_invertZoom)
|
||||
numTicks = -numTicks;
|
||||
|
||||
|
||||
@@ -1026,7 +1026,12 @@ void QGVPage::wheelEvent(QWheelEvent *event)
|
||||
}
|
||||
|
||||
QPointF center = mapToScene(viewport()->rect().center());
|
||||
qreal factor = std::pow(mouseBase, event->delta() / mouseAdjust);
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
|
||||
int delta = event->angleDelta().y();
|
||||
#else
|
||||
int delta = event->delta();
|
||||
#endif
|
||||
qreal factor = std::pow(mouseBase, delta / mouseAdjust);
|
||||
scale(factor, factor);
|
||||
|
||||
QPointF newCenter = mapToScene(viewport()->rect().center());
|
||||
|
||||
@@ -277,7 +277,11 @@ void WebView::mousePressEvent(QMouseEvent *event)
|
||||
void WebView::wheelEvent(QWheelEvent *event)
|
||||
{
|
||||
if (QApplication::keyboardModifiers() & Qt::ControlModifier) {
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
|
||||
qreal factor = zoomFactor() + (-event->angleDelta().y() / 800.0);
|
||||
#else
|
||||
qreal factor = zoomFactor() + (-event->delta() / 800.0);
|
||||
#endif
|
||||
setZoomFactor(factor);
|
||||
event->accept();
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user