From d1de79d3a213ae86a6120c4043f8941ca69cca48 Mon Sep 17 00:00:00 2001 From: Pavel Gromov Date: Thu, 9 Mar 2023 19:51:35 +0100 Subject: [PATCH] [github] Add gap between filename and discussions icon in changes tree GitOrigin-RevId: cad94839e100d141c518c77023aec888907f5588 --- .../ui/codereview/CodeReviewProgressRenderer.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/CodeReviewProgressRenderer.kt b/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/CodeReviewProgressRenderer.kt index 048be1bb72a6..64b2346866ef 100644 --- a/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/CodeReviewProgressRenderer.kt +++ b/platform/collaboration-tools/src/com/intellij/collaboration/ui/codereview/CodeReviewProgressRenderer.kt @@ -1,17 +1,14 @@ // Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.collaboration.ui.codereview -import com.intellij.openapi.editor.colors.FontPreferences.DEFAULT_FONT_NAME -import com.intellij.openapi.editor.colors.FontPreferences.DEFAULT_FONT_SIZE import com.intellij.openapi.util.NlsSafe import com.intellij.openapi.vcs.changes.ui.ChangesBrowserNode import com.intellij.ui.CellRendererPanel import com.intellij.ui.ColoredTreeCellRenderer -import com.intellij.util.ui.JBUI.Borders.emptyRight +import com.intellij.util.ui.JBUI import icons.CollaborationToolsIcons import java.awt.BorderLayout import java.awt.Component -import java.awt.Font import javax.swing.Icon import javax.swing.JLabel import javax.swing.JTree @@ -22,8 +19,7 @@ internal class CodeReviewProgressRenderer( private val codeReviewProgressStateProvider: (ChangesBrowserNode<*>) -> NodeCodeReviewProgressState ) : CellRendererPanel(), TreeCellRenderer { - private val iconLabel = JLabel().apply { border = emptyRight(10) } - private val discussionsCountFont = Font(DEFAULT_FONT_NAME, Font.PLAIN, DEFAULT_FONT_SIZE) + private val iconLabel = JLabel().apply { border = JBUI.Borders.empty(0, TEXT_ICON_GAP, 0, ICON_BORDER) } init { buildLayout() @@ -76,4 +72,9 @@ internal class CodeReviewProgressRenderer( require(discussionsCount > 0) return if (!isRead) CollaborationToolsIcons.Review.CommentUnread else CollaborationToolsIcons.Review.CommentUnresolved } + + companion object { + private const val TEXT_ICON_GAP = 4 + private const val ICON_BORDER = 10 + } } \ No newline at end of file