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

Timeline: Check end time for sanity before setting range

Browse Source 
Change-Id: I69a3ea81b1c4e1df51663d8e5c75972f67635a26
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-03-02 15:52:32 +01:00
parent cf58a1dc15
commit 11cee807b7
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/timeline/qml/TimelineContent.qml
View File

@@ -172,12 +172,11 @@ ScrollView {
if (modelData.endTime(selectedItem) < zoomer.rangeStart || if (modelData.endTime(selectedItem) < zoomer.rangeStart ||
modelData.startTime(selectedItem) > zoomer.rangeEnd) { modelData.startTime(selectedItem) > zoomer.rangeEnd) {
var newStart = (modelData.startTime(selectedItem) + var newStart = Math.max((modelData.startTime(selectedItem) +
modelData.endTime(selectedItem) - modelData.endTime(selectedItem) -
zoomer.rangeDuration) / 2; zoomer.rangeDuration) / 2, zoomer.traceStart);
zoomer.setRange(Math.max(newStart, zoomer.traceStart), zoomer.setRange(newStart,
Math.min(newStart + zoomer.rangeDuration, Math.min(newStart + zoomer.rangeDuration, zoomer.traceEnd));
zoomer.traceEnd));
} }
var row = modelData.row(selectedItem); var row = modelData.row(selectedItem);