From 36bebffae3f45312be4b521f40d17535f3bde499 Mon Sep 17 00:00:00 2001 From: Julia Beliaeva Date: Wed, 1 Mar 2017 18:32:24 +0300 Subject: [PATCH] [vcs-log] when auto-resizing columns with double click on the border, show diff should be disabled --- .../history/CompareRevisionsFromHistoryAction.java | 10 ++++++++-- .../intellij/vcs/log/ui/table/VcsLogGraphTable.java | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryAction.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryAction.java index 957f6c90a5ca..e8da92267ec7 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryAction.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/actions/history/CompareRevisionsFromHistoryAction.java @@ -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 commits = ui.getVcsLog().getSelectedCommits(); if (commits.size() != 1 && commits.size() != 2) return; diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java index 0bc3176eb4a6..0acad0186ecb 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/VcsLogGraphTable.java @@ -653,7 +653,7 @@ public class VcsLogGraphTable extends TableWithProgress implements DataProvider, } } - boolean isResizingColumns() { + public boolean isResizingColumns() { return getCursor() == Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR); }