diff options
author | Ulf Hermann <[email protected]> | 2016-05-25 16:09:43 +0200 |
---|---|---|
committer | Ulf Hermann <[email protected]> | 2016-05-27 09:12:12 +0000 |
commit | b3b46667451d7ff13125360916ac556783fd266c (patch) | |
tree | 209c0cd2ae02d1c8fe86ed1d2c47c2f2445ce1cb /src/libs/timeline/timelineitemsrenderpass.cpp | |
parent | bad4bac21c7549c5947b4224dc05371722c3cc26 (diff) |
Timeline: Fix sign of height marker for timeline items geometry
The adjustment for items of small height in the vertex shader was
broken.
Change-Id: Icfaef5b1e582696240fe1ed211dbb26502cc208e
Reviewed-by: Christian Kandeler <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>
Diffstat (limited to 'src/libs/timeline/timelineitemsrenderpass.cpp')
-rw-r--r-- | src/libs/timeline/timelineitemsrenderpass.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/timeline/timelineitemsrenderpass.cpp b/src/libs/timeline/timelineitemsrenderpass.cpp index 8b7da54ed6e..8aa86b7416f 100644 --- a/src/libs/timeline/timelineitemsrenderpass.cpp +++ b/src/libs/timeline/timelineitemsrenderpass.cpp @@ -186,13 +186,13 @@ void OpaqueColoredPoint2DWithSize::setRight(const OpaqueColoredPoint2DWithSize * void OpaqueColoredPoint2DWithSize::setTop(const OpaqueColoredPoint2DWithSize *master) { y = master->id < 0 ? master->y / -master->id : master->y; - h = y - TimelineModel::defaultRowHeight(); + h = TimelineModel::defaultRowHeight() - y; } void OpaqueColoredPoint2DWithSize::setBottom(const OpaqueColoredPoint2DWithSize *master) { y = TimelineModel::defaultRowHeight(); - h = TimelineModel::defaultRowHeight() - (master->id < 0 ? master->y / -master->id : master->y); + h = (master->id < 0 ? master->y / -master->id : master->y) - TimelineModel::defaultRowHeight(); } void OpaqueColoredPoint2DWithSize::setBottomLeft(const OpaqueColoredPoint2DWithSize *master) |