summaryrefslogtreecommitdiff
path: root/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
diff options
context:
space:
mode:
authorjkobus <jaroslaw.kobus@digia.com>2014-07-04 09:15:01 +0200
committerJarek Kobus <jaroslaw.kobus@digia.com>2014-07-04 10:27:27 +0200
commitcb0e1d040e731e96dfc9f819669edafeaab55686 (patch)
treecc0b71aaa0be06dcf2c994357a8506bac5fd8ba9 /src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
parentac31d3c67ec12a64e7b0d69179b05b950f5a8d61 (diff)
downloadqt-creator-cb0e1d040e731e96dfc9f819669edafeaab55686.tar.gz
Fix double click in left view of sidebysidediffeditor
Task-number: QTCREATORBUG-12493 Change-Id: I008cae61ce2a32f1abce56c66ee09387768fbeb8 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/sidebysidediffeditorwidget.cpp')
-rw-r--r--src/plugins/diffeditor/sidebysidediffeditorwidget.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 7ff3037a60..a8086227f6 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -1191,11 +1191,12 @@ void SideBySideDiffEditorWidget::slotLeftJumpToOriginalFileRequested(
// The same file (e.g. in git diff), jump to the line number taken from the right editor.
// Warning: git show SHA^ vs SHA or git diff HEAD vs Index
// (when Working tree has changed in meantime) will not work properly.
- int leftLineNumber = 0;
- int rightLineNumber = 0;
-
for (int i = 0; i < fileData.chunks.count(); i++) {
const ChunkData chunkData = fileData.chunks.at(i);
+
+ int leftLineNumber = chunkData.leftStartingLineNumber;
+ int rightLineNumber = chunkData.rightStartingLineNumber;
+
for (int j = 0; j < chunkData.rows.count(); j++) {
const RowData rowData = chunkData.rows.at(j);
if (rowData.leftLine.textLineType == TextLineData::TextLine)