From 5e7de67487df61ec0536679550ca618df756e776 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 7 May 2018 17:03:59 +0200 Subject: [PATCH] Show branch information only when showing local changes IDEA-CR-32403 --- .../dvcs/ui/RepositoryChangesBrowserNode.kt | 16 +++++++++------- .../changes/ui/ChangesBrowserNodeRenderer.java | 4 ++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesBrowserNode.kt b/platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesBrowserNode.kt index d0be4bd0b3e9..56614398cc0e 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesBrowserNode.kt +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesBrowserNode.kt @@ -24,14 +24,16 @@ class RepositoryChangesBrowserNode(repository: Repository) : ChangesBrowserNode< override fun render(renderer: ChangesBrowserNodeRenderer, selected: Boolean, expanded: Boolean, hasFocus: Boolean) { renderer.icon = ColorIcon(ICON_SIZE, getBackgroundColor(colorManager.getRootColor(getUserObject().root))) renderer.append(" $textPresentation", REGULAR_ATTRIBUTES) - val localBranch = getUserObject().currentBranchName - if (localBranch != null) { - renderer.append(" ($localBranch", REGULAR_ATTRIBUTES) - val remoteBranch = getUserObject().currentRemoteBranchName - if (remoteBranch != null) { - renderer.append(" ${UIUtil.rightArrow()} $remoteBranch") + if (renderer.isShowingLocalChanges) { + val localBranch = getUserObject().currentBranchName + if (localBranch != null) { + renderer.append(" ($localBranch", REGULAR_ATTRIBUTES) + val remoteBranch = getUserObject().currentRemoteBranchName + if (remoteBranch != null) { + renderer.append(" ${UIUtil.rightArrow()} $remoteBranch") + } + renderer.append(")") } - renderer.append(")") } appendCount(renderer) } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserNodeRenderer.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserNodeRenderer.java index f6c774162ced..1367f409e7b6 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserNodeRenderer.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserNodeRenderer.java @@ -71,4 +71,8 @@ public class ChangesBrowserNodeRenderer extends ColoredTreeCellRenderer { Icon icon = isDirectory ? PlatformIcons.FOLDER_ICON : fileType.getIcon(); setIcon(icon); } + + public boolean isShowingLocalChanges() { + return myHighlightProblems; + } }