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

Show branch information only when showing local changes

Browse Source 
IDEA-CR-32403
This commit is contained in:
Dmitry Jemerov
2018-05-07 17:11:04 +02:00
parent 771014b9b1
commit 5e7de67487
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/dvcs-impl/src/com/intellij/dvcs/ui/RepositoryChangesBrowserNode.kt
+9 -7
View File
@@ -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)
}
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesBrowserNodeRenderer.java
+4
View File
@@ -71,4 +71,8 @@ public class ChangesBrowserNodeRenderer extends ColoredTreeCellRenderer {
Icon icon = isDirectory ? PlatformIcons.FOLDER_ICON : fileType.getIcon();
setIcon(icon);
}
public boolean isShowingLocalChanges() {
return myHighlightProblems;
}
}