diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2019-12-06 11:55:20 +0100 |
|---|---|---|
| committer | Knud Dollereder <knud.dollereder@qt.io> | 2019-12-06 12:49:57 +0000 |
| commit | c6ab1d8b4f43ff3d458667273955e7194ba718b5 (patch) | |
| tree | 52cb7e28e78239a52fdc4c1d68d65969fd058d3e | |
| parent | 8ebcef7b512eb09b94df1d64a08b1edb6f7e89cb (diff) | |
| download | qt-creator-c6ab1d8b4f43ff3d458667273955e7194ba718b5.tar.gz | |
QmlDesigner: fix endless loop when maxTime is 0
If there is no active timeline or maxtime is really 0
int GraphicsView::mapValueToY(double y) const was in
an endless loop
Change-Id: I42c18d9183338d2b76f1f06bab279da7f95b51d9
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Knud Dollereder <knud.dollereder@qt.io>
| -rw-r--r-- | src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp index b0f0c7637f..2f943bf495 100644 --- a/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/detail/graphicsview.cpp @@ -554,7 +554,7 @@ double GraphicsView::timeLabelInterval(QPainter *painter, double maxTime) double tickDistance = mapTimeToX(deltaTime); while (true) { - if (tickDistance == 0 && deltaTime > maxTime) + if (tickDistance == 0 && deltaTime >= maxTime) return maxTime; if (tickDistance > minTextSpacing) |