kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Merge pull request #9284 from dodomorandi/fix-event-type-ub

Browse Source 
Fix wrong downcasting of QEvent
This commit is contained in:
Chris Hennes
2023-04-17 21:32:34 -05:00
committed by GitHub
parent 470a9d6911 e2e1a51790
commit 0729151e45
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Gui/Quarter/QuarterWidget.cpp
View File

@@ -936,8 +936,7 @@ bool QuarterWidget::viewportEvent(QEvent* event)
// additionally handle it by this viewer. This is e.g. needed when
// resizing a widget item because the cursor may already be outside
// this widget.
if (event->type() == QEvent::Wheel ||
event->type() == QEvent::MouseButtonDblClick ||
if (event->type() == QEvent::MouseButtonDblClick ||
event->type() == QEvent::MouseButtonPress) {
QMouseEvent* mouse = static_cast<QMouseEvent*>(event);
QGraphicsItem *item = itemAt(mouse->pos());
@@ -954,6 +953,19 @@ bool QuarterWidget::viewportEvent(QEvent* event)
return false;
}
}
else if (event->type() == QEvent::Wheel) {
auto wheel = static_cast<QWheelEvent*>(event);
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
QPoint pos = wheel->pos();
#else
QPoint pos = wheel->position().toPoint();
#endif
QGraphicsItem* item = itemAt(pos);
if (!item) {
QGraphicsView::viewportEvent(event);
return false;
}
}
return QGraphicsView::viewportEvent(event);
}