From c769f419b08b13b1446f434606ccc2d2dcee41b6 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Thu, 6 Apr 2017 13:54:52 +0300 Subject: [PATCH] IDEA-169924 fix typo and care of null color from scheme --- .../xml/breadcrumbs/BreadcrumbsXmlWrapper.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java index 4b52791b8107..8e5a45b8391c 100644 --- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java +++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java @@ -110,16 +110,20 @@ public class BreadcrumbsXmlWrapper extends JComponent implements Disposable { @Override public Color getForeground() { - return isForegroundSet() - ? super.getForeground() - : EditorColorsManager.getInstance().getGlobalScheme().getColor(EditorColors.LINE_NUMBERS_COLOR); + if (!isForegroundSet()) { + Color foreground = EditorColorsManager.getInstance().getGlobalScheme().getColor(EditorColors.LINE_NUMBERS_COLOR); + if (foreground != null) return foreground; + } + return super.getForeground(); } @Override public Color getBackground() { - return isForegroundSet() - ? super.getForeground() - : EditorColorsManager.getInstance().getGlobalScheme().getColor(EditorColors.GUTTER_BACKGROUND); + if (!isBackgroundSet()) { + Color background = EditorColorsManager.getInstance().getGlobalScheme().getColor(EditorColors.GUTTER_BACKGROUND); + if (background != null) return background; + } + return super.getBackground(); } @Override