MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: do not hide focused viewer if there are no more changes in a tree

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-04-18 14:44:15 +03:00
parent 8fb8436351
commit c688ac6cb4
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeViewDiffRequestProcessor.java
+12 -8
View File
@@ -143,21 +143,25 @@ public abstract class ChangeViewDiffRequestProcessor extends CacheDiffRequestPro
public void refresh() {
List<Wrapper> selectedChanges = getSelectedChanges();
Wrapper selectedChange = myCurrentChange != null ? ContainerUtil.find(selectedChanges, myCurrentChange) : null;
if (selectedChange == null &&
myCurrentChange != null &&
getContext().isWindowFocused() &&
getContext().isFocusedInWindow()) {
// Do not automatically switch focused viewer
if (selectedChanges.size() == 1 && getAllChanges().contains(myCurrentChange)) {
selectChange(myCurrentChange); // Restore selection if necessary
}
return;
}
if (selectedChanges.isEmpty()) {
myCurrentChange = null;
updateRequest();
return;
}
Wrapper selectedChange = myCurrentChange != null ? ContainerUtil.find(selectedChanges, myCurrentChange) : null;
if (selectedChange == null) {
if (myCurrentChange != null && getContext().isWindowFocused() && getContext().isFocusedInWindow()) { // Do not automatically switch file if focused
if (selectedChanges.size() == 1 && getAllChanges().contains(myCurrentChange)) {
selectChange(myCurrentChange); // Restore selection if necessary
}
return;
}
myCurrentChange = selectedChanges.get(0);
updateRequest();
return;