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

DiffEditor: Fix double click inside commit editor

Browse Source 
The bug was that if you double-click a file
in the commit editor, then double-click another one,
the diff remains with the first one.

Change-Id: I1f49b549c9dfd3ebd4ec6950ed28dd8cbc7d0227
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2014-08-11 17:28:42 +02:00
committed by Jarek Kobus
parent d03927f373
commit afea017c80
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/gitclient.cpp
View File

@@ -968,12 +968,17 @@ void GitClient::diff(const QString &workingDirectory,
controller->setReloader(reloader); controller->setReloader(reloader);
reloader->setWorkingDirectory(workingDirectory); reloader->setWorkingDirectory(workingDirectory);
}
DiffEditor::DiffEditorController *controller = diffEditorDocument->controller();
GitDiffEditorReloader *reloader = static_cast<GitDiffEditorReloader *>(controller->reloader());
reloader->setDiffType(diffType); reloader->setDiffType(diffType);
// we force setFileList, since the lists can be different
// e.g. when double click for the second time on different file inside commit editor
if (diffType == GitDiffEditorReloader::DiffFileList) if (diffType == GitDiffEditorReloader::DiffFileList)
reloader->setFileList(stagedFileNames, unstagedFileNames); reloader->setFileList(stagedFileNames, unstagedFileNames);
else if (diffType == GitDiffEditorReloader::DiffProjectList) else if (diffType == GitDiffEditorReloader::DiffProjectList) // the same when unstaged file was clicked
reloader->setProjectList(unstagedFileNames); reloader->setProjectList(unstagedFileNames);
}
diffEditorDocument->controller()->requestReload(); diffEditorDocument->controller()->requestReload();