From 85d59c84e12f418265610c2d97fe0bbdf717716a Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Wed, 17 Dec 2014 15:48:40 +0100 Subject: [PATCH] sometimes UIManager returns null values for Darcula colors --- .../ide/ui/laf/darcula/ui/DarculaButtonUI.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java index a34d137581f5..4bfce7268d4e 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaButtonUI.java @@ -18,12 +18,14 @@ package com.intellij.ide.ui.laf.darcula.ui; import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.openapi.util.SystemInfo; +import com.intellij.util.ObjectUtils; import com.intellij.util.ui.GraphicsUtil; import com.intellij.util.ui.UIUtil; import sun.swing.SwingUtilities2; import javax.swing.*; import javax.swing.border.Border; +import javax.swing.plaf.ColorUIResource; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.UIResource; import javax.swing.plaf.basic.BasicButtonUI; @@ -146,18 +148,18 @@ public class DarculaButtonUI extends BasicButtonUI { } protected Color getButtonColor1() { - return UIManager.getColor("Button.darcula.color1"); + return ObjectUtils.notNull(UIManager.getColor("Button.darcula.color1"), new ColorUIResource(0x555a5c)); } protected Color getButtonColor2() { - return UIManager.getColor("Button.darcula.color2"); + return ObjectUtils.notNull(UIManager.getColor("Button.darcula.color2"), new ColorUIResource(0x414648)); } protected Color getSelectedButtonColor1() { - return UIManager.getColor("Button.darcula.selection.color1"); + return ObjectUtils.notNull(UIManager.getColor("Button.darcula.selection.color1"), new ColorUIResource(0x384f6b)); } protected Color getSelectedButtonColor2() { - return UIManager.getColor("Button.darcula.selection.color2"); + return ObjectUtils.notNull(UIManager.getColor("Button.darcula.selection.color2"), new ColorUIResource(0x233143)); } }