Skip to content
GitLab
Commit e7d46636 authored by Julius Künzel's avatar Julius Künzel 💬
Browse files

[Qt6] Port away from deprecated QMouseEvent::x() and QMouseEvent::y()

parent f5c6a657
Hide whitespace changes
Inline Side-by-side
src/assets/keyframes/view/keyframeview.cpp
View file @ e7d46636
......@@ -297,12 +297,21 @@ void KeyframeView::mousePressEvent(QMouseEvent *event)
double zoomStart = m_zoomHandle.x() * (width() - 2 * m_offset);
double zoomEnd = m_zoomHandle.y() * (width() - 2 * m_offset);
double zoomFactor = (width() - 2 * m_offset) / (zoomEnd - zoomStart);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
int pos = int(((event->x() - m_offset) / zoomFactor + zoomStart) / m_scale);
#else
int pos = int(((event->position().x() - m_offset) / zoomFactor + zoomStart) / m_scale);
#endif
pos = qBound(0, pos, m_duration - 1);
m_moveKeyframeMode = false;
m_keyframeZonePress = false;
if (event->button() == Qt::LeftButton) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->y() < m_lineHeight) {
#else
if (event->position().y() < m_lineHeight) {
#endif
// mouse click in keyframes area
bool ok;
GenTime position(pos + offset, pCore->getCurrentFps());
......@@ -344,10 +353,18 @@ void KeyframeView::mousePressEvent(QMouseEvent *event)
m_model->setSelectedKeyframes({});
m_model->setActiveKeyframe(-1);
m_currentKeyframeOriginal = -1;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
} else if (event->y() > m_zoomHeight + 2) {
#else
} else if (event->position().y() > m_zoomHeight + 2) {
#endif
// click on zoom area
if (m_hoverZoom) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_clickOffset = (double(event->x()) - m_offset) / (width() - 2 * m_offset);
#else
m_clickOffset = (double(event->position().x()) - m_offset) / (width() - 2 * m_offset);
#endif
}
// When not zoomed, allow seek by clicking on zoombar
if (qFuzzyCompare(m_zoomFactor, 1.) && pos != m_position && !m_hoverZoomIn && !m_hoverZoomOut) {
......@@ -355,7 +372,11 @@ void KeyframeView::mousePressEvent(QMouseEvent *event)
}
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
} else if (event->button() == Qt::RightButton && event->y() > m_zoomHeight + 2) {
#else
} else if (event->button() == Qt::RightButton && event->position().y() > m_zoomHeight + 2) {
#endif
// Right click on zoom, switch between no zoom and last zoom status
if (m_zoomHandle == QPointF(0, 1)) {
if (!m_lastZoomHandle.isNull()) {
......@@ -382,25 +403,41 @@ void KeyframeView::mouseMoveEvent(QMouseEvent *event)
double zoomStart = m_zoomHandle.x() * (width() - 2 * m_offset);
double zoomEnd = m_zoomHandle.y() * (width() - 2 * m_offset);
double zoomFactor = (width() - 2 * m_offset) / (zoomEnd - zoomStart);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
int pos = int(((double(event->x()) - m_offset) / zoomFactor + zoomStart) / m_scale);
#else
int pos = int(((double(event->position().x()) - m_offset) / zoomFactor + zoomStart) / m_scale);
#endif
pos = qBound(0, pos, m_duration - 1);
GenTime position(pos + offset, pCore->getCurrentFps());
if ((event->buttons() & Qt::LeftButton) != 0u) {
if (m_hoverZoomIn || m_hoverZoomOut || m_hoverZoom) {
// Moving zoom handles
if (m_hoverZoomIn) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_zoomHandle.setX(qMin(qMax(0., double(event->x() - m_offset) / (width() - 2 * m_offset)), m_zoomHandle.y() - 0.015));
#else
m_zoomHandle.setX(qMin(qMax(0., double(event->position().x() - m_offset) / (width() - 2 * m_offset)), m_zoomHandle.y() - 0.015));
#endif
update();
return;
}
if (m_hoverZoomOut) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_zoomHandle.setY(qMax(qMin(1., double(event->x() - m_offset) / (width() - 2 * m_offset)), m_zoomHandle.x() + 0.015));
#else
m_zoomHandle.setY(qMax(qMin(1., double(event->position().x() - m_offset) / (width() - 2 * m_offset)), m_zoomHandle.x() + 0.015));
#endif
update();
return;
}
// moving zoom zone
if (m_hoverZoom) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
double clickOffset = (double(event->x()) - m_offset) / (width() - 2 * m_offset) - m_clickOffset;
#else
double clickOffset = (double(event->position().x()) - m_offset) / (width() - 2 * m_offset) - m_clickOffset;
#endif
double newX = m_zoomHandle.x() + clickOffset;
if (newX < 0) {
clickOffset = -m_zoomHandle.x();
......@@ -412,7 +449,11 @@ void KeyframeView::mouseMoveEvent(QMouseEvent *event)
newY = 1;
newX = m_zoomHandle.x() + clickOffset;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_clickOffset = (double(event->x()) - m_offset) / (width() - 2 * m_offset);
#else
m_clickOffset = (double(event->position().x()) - m_offset) / (width() - 2 * m_offset);
#endif
m_zoomHandle = QPointF(newX, newY);
update();
}
......@@ -485,7 +526,11 @@ void KeyframeView::mouseMoveEvent(QMouseEvent *event)
}
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->y() < m_lineHeight) {
#else
if (event->position().y() < m_lineHeight) {
#endif
bool ok;
auto keyframe = m_model->getClosestKeyframe(position, &ok);
if (ok && qAbs(((position.frames(pCore->getCurrentFps()) - keyframe.first.frames(pCore->getCurrentFps())) * m_scale) * m_zoomFactor) <
......@@ -499,9 +544,15 @@ void KeyframeView::mouseMoveEvent(QMouseEvent *event)
return;
}
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->y() > m_zoomHeight + 2) {
// Moving in zoom area
if (qAbs(event->x() - m_offset - (m_zoomHandle.x() * (width() - 2 * m_offset))) < QApplication::startDragDistance()) {
#else
if (event->position().y() > m_zoomHeight + 2) {
// Moving in zoom area
if (qAbs(event->position().x() - m_offset - (m_zoomHandle.x() * (width() - 2 * m_offset))) < QApplication::startDragDistance()) {
#endif
setCursor(Qt::SizeHorCursor);
m_hoverZoomIn = true;
m_hoverZoomOut = false;
......@@ -509,7 +560,11 @@ void KeyframeView::mouseMoveEvent(QMouseEvent *event)
update();
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (qAbs(event->x() - m_offset - (m_zoomHandle.y() * (width() - 2 * m_offset))) < QApplication::startDragDistance()) {
#else
if (qAbs(event->position().x() - m_offset - (m_zoomHandle.y() * (width() - 2 * m_offset))) < QApplication::startDragDistance()) {
#endif
setCursor(Qt::SizeHorCursor);
m_hoverZoomOut = true;
m_hoverZoomIn = false;
......@@ -517,8 +572,13 @@ void KeyframeView::mouseMoveEvent(QMouseEvent *event)
update();
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (m_zoomHandle != QPointF(0, 1) && event->x() > m_offset + (m_zoomHandle.x() * (width() - 2 * m_offset)) &&
event->x() < m_offset + (m_zoomHandle.y() * (width() - 2 * m_offset))) {
#else
if (m_zoomHandle != QPointF(0, 1) && event->position().x() > m_offset + (m_zoomHandle.x() * (width() - 2 * m_offset)) &&
event->position().x() < m_offset + (m_zoomHandle.y() * (width() - 2 * m_offset))) {
#endif
setCursor(Qt::PointingHandCursor);
m_hoverZoom = true;
m_hoverZoomIn = false;
......@@ -585,12 +645,20 @@ void KeyframeView::mouseReleaseEvent(QMouseEvent *event)
void KeyframeView::mouseDoubleClickEvent(QMouseEvent *event)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->button() == Qt::LeftButton && event->y() < m_lineHeight) {
#else
if (event->button() == Qt::LeftButton && event->position().y() < m_lineHeight) {
#endif
int offset = pCore->getItemIn(m_model->getOwnerId());
double zoomStart = m_zoomHandle.x() * (width() - 2 * m_offset);
double zoomEnd = m_zoomHandle.y() * (width() - 2 * m_offset);
double zoomFactor = (width() - 2 * m_offset) / (zoomEnd - zoomStart);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
int pos = int(((event->x() - m_offset) / zoomFactor + zoomStart) / m_scale);
#else
int pos = int(((event->position().x() - m_offset) / zoomFactor + zoomStart) / m_scale);
#endif
pos = qBound(0, pos, m_duration - 1);
GenTime position(pos + offset, pCore->getCurrentFps());
bool ok;
......
src/dialogs/timeremap.cpp
View file @ e7d46636
......@@ -346,33 +346,57 @@ void RemapView::mouseMoveEvent(QMouseEvent *event)
double snapPos = ((m_originalRange.first - m_inFrame) * m_scale) - m_zoomStart;
snapPos *= m_zoomFactor;
snapPos += m_offset;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (qAbs(snapPos - event->x()) < QApplication::startDragDistance()) {
#else
if (qAbs(snapPos - event->position().x()) < QApplication::startDragDistance()) {
#endif
pos = m_originalRange.first - m_inFrame;
} else {
snapPos = ((m_originalRange.second - m_inFrame) * m_scale) - m_zoomStart;
snapPos *= m_zoomFactor;
snapPos += m_offset;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (qAbs(snapPos - event->x()) < QApplication::startDragDistance()) {
#else
if (qAbs(snapPos - event->position().x()) < QApplication::startDragDistance()) {
#endif
pos = m_originalRange.second - m_inFrame;
}
}
if (pos == -1) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
pos = int(((event->x() - m_offset) / m_zoomFactor + m_zoomStart) / m_scale);
#else
pos = int(((event->position().x() - m_offset) / m_zoomFactor + m_zoomStart) / m_scale);
#endif
}
} else {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
pos = int(((event->x() - m_offset) / m_zoomFactor + m_zoomStart) / m_scale);
#else
pos = int(((event->position().x() - m_offset) / m_zoomFactor + m_zoomStart) / m_scale);
#endif
}
pos = qBound(0, pos, m_maxLength - 1);
GenTime position(pos, pCore->getCurrentFps());
if (event->buttons() == Qt::NoButton) {
bool hoverKeyframe = false;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->y() < 2 * m_lineHeight && event->y() > m_lineHeight) {
#else
if (event->position().y() < 2 * m_lineHeight && event->position().y() > m_lineHeight) {
#endif
// mouse move in top keyframes area
std::pair<int, int> keyframe = getClosestKeyframe(pos + m_inFrame);
if (keyframe.first > -1 && qAbs(keyframe.second - pos - m_inFrame) * m_scale * m_zoomFactor <= m_lineHeight / 2) {
hoverKeyframe = true;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
} else if (event->y() > m_bottomView - 2 * m_lineHeight && event->y() < m_bottomView - m_lineHeight) {
#else
} else if (event->position().y() > m_bottomView - 2 * m_lineHeight && event->position().y() < m_bottomView - m_lineHeight) {
#endif
// move in bottom keyframe area
std::pair<int, int> keyframe = getClosestKeyframe(pos + m_inFrame, true);
if (keyframe.first > -1 && qAbs(keyframe.first - pos - m_inFrame) * m_scale * m_zoomFactor <= m_lineHeight / 2) {
......@@ -388,7 +412,11 @@ void RemapView::mouseMoveEvent(QMouseEvent *event)
if (m_hoverZoomIn || m_hoverZoomOut || m_hoverZoom) {
// Moving zoom handles
if (m_hoverZoomIn) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_zoomHandle.setX(qMin(qMax(0., double(event->x() - m_offset) / (width() - 2 * m_offset)), m_zoomHandle.y() - 0.015));
#else
m_zoomHandle.setX(qMin(qMax(0., double(event->position().x() - m_offset) / (width() - 2 * m_offset)), m_zoomHandle.y() - 0.015));
#endif
int maxWidth = width() - (2 * m_offset);
m_zoomStart = m_zoomHandle.x() * maxWidth;
m_zoomFactor = maxWidth / (m_zoomHandle.y() * maxWidth - m_zoomStart);
......@@ -396,7 +424,11 @@ void RemapView::mouseMoveEvent(QMouseEvent *event)
return;
}
if (m_hoverZoomOut) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_zoomHandle.setY(qMax(qMin(1., double(event->x() - m_offset) / (width() - 2 * m_offset)), m_zoomHandle.x() + 0.015));
#else
m_zoomHandle.setY(qMax(qMin(1., double(event->position().x() - m_offset) / (width() - 2 * m_offset)), m_zoomHandle.x() + 0.015));
#endif
int maxWidth = width() - (2 * m_offset);
m_zoomStart = m_zoomHandle.x() * maxWidth;
m_zoomFactor = maxWidth / (m_zoomHandle.y() * maxWidth - m_zoomStart);
......@@ -405,7 +437,11 @@ void RemapView::mouseMoveEvent(QMouseEvent *event)
}
// moving zoom zone
if (m_hoverZoom) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
double clickOffset = (double(event->x()) - m_offset) / (width() - 2 * m_offset) - m_clickOffset;
#else
double clickOffset = (double(event->position().x()) - m_offset) / (width() - 2 * m_offset) - m_clickOffset;
#endif
double newX = m_zoomHandle.x() + clickOffset;
if (newX < 0) {
clickOffset = -m_zoomHandle.x();
......@@ -417,7 +453,11 @@ void RemapView::mouseMoveEvent(QMouseEvent *event)
newY = 1;
newX = m_zoomHandle.x() + clickOffset;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_clickOffset = (double(event->x()) - m_offset) / (width() - 2 * m_offset);
#else
m_clickOffset = (double(event->position().x()) - m_offset) / (width() - 2 * m_offset);
#endif
m_zoomHandle = QPointF(newX, newY);
int maxWidth = width() - (2 * m_offset);
m_zoomStart = m_zoomHandle.x() * maxWidth;
......@@ -601,9 +641,15 @@ void RemapView::mouseMoveEvent(QMouseEvent *event)
}
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->y() > m_bottomView) {
// Moving in zoom area
if (qAbs(event->x() - m_offset - (m_zoomHandle.x() * (width() - 2 * m_offset))) < QApplication::startDragDistance()) {
#else
if (event->position().y() > m_bottomView) {
// Moving in zoom area
if (qAbs(event->position().x() - m_offset - (m_zoomHandle.x() * (width() - 2 * m_offset))) < QApplication::startDragDistance()) {
#endif
setCursor(Qt::SizeHorCursor);
m_hoverZoomIn = true;
m_hoverZoomOut = false;
......@@ -611,7 +657,11 @@ void RemapView::mouseMoveEvent(QMouseEvent *event)
update();
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (qAbs(event->x() - m_offset - (m_zoomHandle.y() * (width() - 2 * m_offset))) < QApplication::startDragDistance()) {
#else
if (qAbs(event->position().x() - m_offset - (m_zoomHandle.y() * (width() - 2 * m_offset))) < QApplication::startDragDistance()) {
#endif
setCursor(Qt::SizeHorCursor);
m_hoverZoomOut = true;
m_hoverZoomIn = false;
......@@ -619,8 +669,13 @@ void RemapView::mouseMoveEvent(QMouseEvent *event)
update();
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (m_zoomHandle != QPointF(0, 1) && event->x() > m_offset + (m_zoomHandle.x() * (width() - 2 * m_offset)) &&
event->x() < m_offset + (m_zoomHandle.y() * (width() - 2 * m_offset))) {
#else
if (m_zoomHandle != QPointF(0, 1) && event->position().x() > m_offset + (m_zoomHandle.x() * (width() - 2 * m_offset)) &&
event->position().x() < m_offset + (m_zoomHandle.y() * (width() - 2 * m_offset))) {
#endif
setCursor(Qt::PointingHandCursor);
m_hoverZoom = true;
m_hoverZoomIn = false;
......@@ -775,19 +830,31 @@ void RemapView::mousePressEvent(QMouseEvent *event)
{
event->accept();
m_lastMaxDuration = remapMax();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
int pos = int(((event->x() - m_offset) / m_zoomFactor + m_zoomStart) / m_scale);
#else
int pos = int(((event->position().x() - m_offset) / m_zoomFactor + m_zoomStart) / m_scale);
#endif
pos = qBound(0, pos, m_maxLength);
m_moveKeyframeMode = NoMove;
m_keyframesOrigin = m_keyframes;
m_oldInFrame = m_inFrame;
if (event->button() == Qt::LeftButton) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->y() < m_centerPos) {
#else
if (event->position().y() < m_centerPos) {
#endif
// mouse click in top area
if (event->modifiers() & Qt::ShiftModifier) {
m_clickPoint = pos + m_inFrame;
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->y() < 2 * m_lineHeight && event->y() > m_lineHeight) {
#else
if (event->position().y() < 2 * m_lineHeight && event->y() > m_lineHeight) {
#endif
std::pair<int, int> keyframe = getClosestKeyframe(pos + m_inFrame);
if (keyframe.first > -1 && qAbs(keyframe.second - (pos + m_inFrame)) * m_scale * m_zoomFactor <= m_lineHeight / 2) {
// Clicked on a top keyframe
......@@ -844,19 +911,35 @@ void RemapView::mousePressEvent(QMouseEvent *event)
update();
}
return;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
} else if (event->y() > m_bottomView) {
#else
} else if (event->position().y() > m_bottomView) {
#endif
// click on zoom area
if (m_hoverZoom) {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
m_clickOffset = (double(event->x()) - m_offset) / (width() - 2 * m_offset);
#else
m_clickOffset = (double(event->position().x()) - m_offset) / (width() - 2 * m_offset);
#endif
}
return;
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
} else if (event->y() > m_centerPos && event->y() < m_bottomView) {
#else
} else if (event->position().y() > m_centerPos && event->position().y() < m_bottomView) {
#endif
// click in bottom area
if (event->modifiers() & Qt::ShiftModifier) {
m_clickPoint = pos + m_inFrame;
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->y() > (m_bottomView - 2 * m_lineHeight) && (event->y() < m_bottomView - m_lineHeight)) {
#else
if (event->position().y() > (m_bottomView - 2 * m_lineHeight) && (event->position().y() < m_bottomView - m_lineHeight)) {
#endif
std::pair<int, int> keyframe = getClosestKeyframe(pos + m_inFrame, true);
if (keyframe.first > -1 && qAbs(keyframe.first - (pos + m_inFrame)) * m_scale * m_zoomFactor <= m_lineHeight / 2) {
m_currentKeyframeOriginal = keyframe;
......@@ -929,7 +1012,11 @@ void RemapView::mousePressEvent(QMouseEvent *event)
}*/
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
} else if (event->button() == Qt::RightButton && event->y() > m_bottomView) {
#else
} else if (event->button() == Qt::RightButton && event->position().y() > m_bottomView) {
#endif
// Right click on zoom, switch between no zoom and last zoom status
if (m_zoomHandle == QPointF(0, 1)) {
if (!m_lastZoomHandle.isNull()) {
......
src/simplekeyframes/simpletimelinewidget.cpp
View file @ e7d46636
......@@ -139,8 +139,13 @@ void SimpleTimelineWidget::slotGoToPrev()
void SimpleTimelineWidget::mousePressEvent(QMouseEvent *event)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
int pos = int(event->x() / m_scale);
if (event->y() < m_lineHeight && event->button() == Qt::LeftButton) {
#else
int pos = int(event->position().x() / m_scale);
if (event->position().y() < m_lineHeight && event->button() == Qt::LeftButton) {
#endif
for (const int &keyframe : qAsConst(m_keyframes)) {
if (qAbs(keyframe - pos) < 5) {
m_currentKeyframeOriginal = keyframe;
......@@ -162,7 +167,11 @@ void SimpleTimelineWidget::mousePressEvent(QMouseEvent *event)
void SimpleTimelineWidget::mouseMoveEvent(QMouseEvent *event)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
int pos = qBound(0, int(event->x() / m_scale), m_duration);
#else
int pos = qBound(0, int(event->position().x() / m_scale), m_duration);
#endif
if ((event->buttons() & Qt::LeftButton) != 0u) {
if (m_currentKeyframe >= 0) {
if (!m_keyframes.contains(pos)) {
......@@ -184,7 +193,11 @@ void SimpleTimelineWidget::mouseMoveEvent(QMouseEvent *event)
update();
return;
}
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->y() < m_lineHeight) {
#else
if (event->position().y() < m_lineHeight) {
#endif
for (const int &keyframe : qAsConst(m_keyframes)) {
if (qAbs(keyframe - pos) < 5) {
m_hoverKeyframe = keyframe;
......@@ -214,8 +227,13 @@ void SimpleTimelineWidget::mouseReleaseEvent(QMouseEvent *event)
void SimpleTimelineWidget::mouseDoubleClickEvent(QMouseEvent *event)
{
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
if (event->button() == Qt::LeftButton && event->y() < m_lineHeight) {
int pos = qBound(0, int(event->x() / m_scale), m_duration);
#else
if (event->button() == Qt::LeftButton && event->position().y() < m_lineHeight) {
int pos = qBound(0, int(event->position().x() / m_scale), m_duration);
#endif
for (const int &keyframe : qAsConst(m_keyframes)) {
if (qAbs(keyframe - pos) < 5) {
m_keyframes.removeAll(keyframe);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment