[vcs-log] when auto-resizing columns with double click on the border, show diff should be disabled

This commit is contained in:
Julia Beliaeva
2017-03-04 00:20:18 +03:00
parent 0253fc5537
commit 36bebffae3
2 changed files with 9 additions and 3 deletions
@@ -39,6 +39,7 @@ import com.intellij.vcs.log.ui.VcsLogInternalDataKeys;
import com.intellij.vcs.log.ui.history.FileHistoryUi;
import org.jetbrains.annotations.NotNull;
import java.awt.event.MouseEvent;
import java.util.List;
public class CompareRevisionsFromHistoryAction extends AnAction implements DumbAware {
@@ -85,12 +86,17 @@ public class CompareRevisionsFromHistoryAction extends AnAction implements DumbA
@Override
public void actionPerformed(@NotNull AnActionEvent e) {
VcsLogUtil.triggerUsage(e);
Project project = e.getRequiredData(CommonDataKeys.PROJECT);
FileHistoryUi ui = e.getRequiredData(VcsLogInternalDataKeys.FILE_HISTORY_UI);
FilePath filePath = e.getRequiredData(VcsDataKeys.FILE_PATH);
if (e.getInputEvent() instanceof MouseEvent && ui.getTable().isResizingColumns()) {
// disable action during columns resize
return;
}
VcsLogUtil.triggerUsage(e);
List<CommitId> commits = ui.getVcsLog().getSelectedCommits();
if (commits.size() != 1 && commits.size() != 2) return;
@@ -653,7 +653,7 @@ public class VcsLogGraphTable extends TableWithProgress implements DataProvider,
}
}
boolean isResizingColumns() {
public boolean isResizingColumns() {
return getCursor() == Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR);
}