feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tracing: Fix assert when wheel zooming

Browse Source 
The wheel handling code was triggering an assert in qBound when
calculating the newStart, when using a touch pad.

Rewrite the wheel handling to get rid of the assert and make it more
similar to the text editor wheel handling.

Change-Id: I0c1306d00be6b3054fb8dba9628b7758880675b0
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Eike Ziller
2023-09-11 15:13:36 +02:00
parent 305a1a6ed1
commit 5d02b4df71
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/libs/tracing/timelinerenderer.cpp
View File

@@ -183,23 +183,28 @@ void TimelineRenderer::wheelEvent(QWheelEvent *event)
// ctrl-wheel means zoom
if (event->modifiers() & Qt::ControlModifier) {
event->setAccepted(true);
if (event->angleDelta().y() == 0)
return;
TimelineZoomControl *zoom = zoomer();
int degrees = (event->angleDelta().x() + event->angleDelta().y()) / 8;
const qint64 circle = 360;
qint64 mouseTime = event->position().toPoint().x() * zoom->windowDuration() / width() +
zoom->windowStart();
qint64 beforeMouse = (mouseTime - zoom->rangeStart()) * (circle - degrees) / circle;
qint64 afterMouse = (zoom->rangeEnd() - mouseTime) * (circle - degrees) / circle;
qint64 newStart = qBound(zoom->traceStart(), zoom->traceEnd(), mouseTime - beforeMouse);
if (newStart + zoom->minimumRangeLength() > zoom->traceEnd())
return; // too close to trace end
qint64 newEnd = qBound(newStart + zoom->minimumRangeLength(), zoom->traceEnd(),
mouseTime + afterMouse);
zoom->setRange(newStart, newEnd);
// Handle similar to text editor, but avoid floats.
// angleDelta of 120 is considered a 10% change in zoom.
const qint64 delta = event->angleDelta().y();
const qint64 newDuration = qBound(zoom->minimumRangeLength(),
zoom->rangeDuration() * 1200 / (1200 + delta),
std::max(zoom->minimumRangeLength(),
zoom->traceDuration()));
const qint64 mouseTime = event->position().toPoint().x() * zoom->windowDuration() / width()
+ zoom->windowStart();
// Try to keep mouseTime where it was in relation to the shown range,
// but keep within traceStart/End
const qint64 newStart
= qBound(zoom->traceStart(),
mouseTime
- newDuration * /*rest is mouse time position [0,1] in range:*/
(mouseTime - zoom->rangeStart()) / zoom->rangeDuration(),
std::max(zoom->traceStart(), zoom->traceEnd() - newDuration));
zoom->setRange(newStart, newStart + newDuration);
} else {
TimelineAbstractRenderer::wheelEvent(event);
}