From 8c80a8626674563cf17add41deaa522417e63d95 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 22 Aug 2016 19:52:20 +0200 Subject: Timeline: Fix event compression for non-default heights The "id" member of OpaqueColoredPoint2DWithSize is then used as the number of events compressed into one. To discern it from an actual id it's also negated. Thus, it needs to be updated when adding an event. This is not a problem for default height items because their top is always at 0, so that the addition of the 'y' members doesn't have an effect. Change-Id: Ibd7218954e36661d7f729465430de89821a41a7f Task-number: QTCREATORBUG-16763 Reviewed-by: Christian Kandeler Reviewed-by: Eike Ziller Reviewed-by: Ulf Hermann --- src/libs/timeline/timelineitemsrenderpass.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/libs/timeline/timelineitemsrenderpass.cpp b/src/libs/timeline/timelineitemsrenderpass.cpp index 235a338816..e7281b0101 100644 --- a/src/libs/timeline/timelineitemsrenderpass.cpp +++ b/src/libs/timeline/timelineitemsrenderpass.cpp @@ -143,8 +143,12 @@ float OpaqueColoredPoint2DWithSize::top() const void OpaqueColoredPoint2DWithSize::update(float nr, float ny) { - if (a <= MaximumDirection) + if (a <= MaximumDirection) { a += MaximumDirection; + id = -2; + } else { + --id; + } y += ny; w = nr - x; -- cgit v1.2.1