From 92b5fac7ba9f6a2edd19cece0025044eabc0bc4b Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Wed, 18 Sep 2013 15:28:46 +0400 Subject: [PATCH] Don't add actions without icons to the file history toolbar An example of such actions is SelectRevisionInGitLogAction, which doesn't have an icon yet. --- .../intellij/openapi/vcs/history/FileHistoryPanelImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java index c2933fddf6aa..71081cc60543 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java @@ -782,7 +782,9 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton { }); if (additionalActions != null) { for (AnAction additionalAction : additionalActions) { - result.add(additionalAction); + if (popup || additionalAction.getTemplatePresentation().getIcon() != null) { + result.add(additionalAction); + } } } result.add(new RefreshFileHistoryAction());