aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <[email protected]>2015-04-16 18:04:17 +0200
committerUlf Hermann <[email protected]>2015-05-18 11:20:12 +0000
commitaa7805397448d8ff753d44ebbc23855a77fe6e28 (patch)
tree38269f8ad66f8e8aaa53f40edc3671c03db20a5e
parent69bc92d1ccd11ff0ad5cfba8301bb160aad7a0db (diff)
Timeline: Reset selection on clear() and emit rangeChanged() only once
Change-Id: Ia4ca2fa6fac874ac66837e5c9d807a4e89b3b40e Reviewed-by: Joerg Bornemann <[email protected]>
-rw-r--r--src/libs/timeline/timelinezoomcontrol.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libs/timeline/timelinezoomcontrol.cpp b/src/libs/timeline/timelinezoomcontrol.cpp
index fc4985cc65f..7e087c60908 100644
--- a/src/libs/timeline/timelinezoomcontrol.cpp
+++ b/src/libs/timeline/timelinezoomcontrol.cpp
@@ -43,8 +43,8 @@ void TimelineZoomControl::clear()
{
m_timer.stop();
setWindowLocked(false);
- setRange(-1, -1);
- setTrace(-1, -1);
+ setTrace(-1, -1); // automatically sets window and range
+ setSelection(-1, -1);
}
void TimelineZoomControl::setTrace(qint64 start, qint64 end)
@@ -66,7 +66,9 @@ void TimelineZoomControl::setRange(qint64 start, qint64 end)
m_rangeStart = start;
m_rangeEnd = end;
rebuildWindow();
- emit rangeChanged(start, end);
+ if (m_rangeStart == start && m_rangeEnd == end)
+ emit rangeChanged(m_rangeStart, m_rangeEnd);
+ // otherwise rebuildWindow() has changed it again.
}
}