From 03153e629c2f3392a103aa9a4117deca2eb31d85 Mon Sep 17 00:00:00 2001 From: Vassiliy Date: Mon, 16 Jun 2014 18:13:48 +0400 Subject: [PATCH] Bookmarks: better rendering for "check" gutter icon --- .../openapi/editor/colors/EditorColors.java | 2 +- .../src/com/intellij/ide/bookmarks/Bookmark.java | 15 ++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColors.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColors.java index fe3242e47b44..29cb27933d7c 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColors.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorColors.java @@ -48,7 +48,7 @@ public interface EditorColors { TextAttributesKey FOLDED_TEXT_ATTRIBUTES = TextAttributesKey.createTextAttributesKey("FOLDED_TEXT_ATTRIBUTES"); TextAttributesKey DELETED_TEXT_ATTRIBUTES = TextAttributesKey.createTextAttributesKey("DELETED_TEXT_ATTRIBUTES"); - ColorKey GUTTER_BACKGROUND = ColorKey.createColorKey("GUTTER_BACKGROUND"); + ColorKey GUTTER_BACKGROUND = ColorKey.createColorKey("GUTTER_BACKGROUND", new JBColor(0xf0f0f0, 0x313335)); @Deprecated ColorKey LEFT_GUTTER_BACKGROUND = GUTTER_BACKGROUND; ColorKey NOTIFICATION_BACKGROUND = ColorKey.createColorKey("NOTIFICATION_BACKGROUND"); diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java index e6cd53e811f8..d22e251ed4ca 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java @@ -27,6 +27,7 @@ import com.intellij.navigation.NavigationItem; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.RangeMarker; import com.intellij.openapi.editor.colors.CodeInsightColors; +import com.intellij.openapi.editor.colors.EditorColors; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.ex.MarkupModelEx; import com.intellij.openapi.editor.ex.RangeHighlighterEx; @@ -335,11 +336,15 @@ public class Bookmark implements Navigatable { @Override public void paintIcon(Component c, Graphics g, int x, int y) { - g.setColor(ICON_BACKGROUND_COLOR); - g.fillRect(x, y, getIconWidth(), getIconHeight()); - g.setColor(JBColor.GRAY); - g.drawRect(x, y, getIconWidth(), getIconHeight()); - myIcon.paintIcon(c, g, x, y); + Graphics2D g2 = (Graphics2D)g.create(); + try { + Color gutterBackground = EditorColors.GUTTER_BACKGROUND.getDefaultColor(); + g2.setColor(gutterBackground); + g2.fillRoundRect(x, y, getIconWidth(), getIconHeight(), 4, 4); + myIcon.paintIcon(c, g2, x, y); + } finally { + g2.dispose(); + } } @Override