From 10efbe4ab63732342c81c6b3dd5087f2f7df54be Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Thu, 20 Jun 2019 17:36:02 +0300 Subject: [PATCH] cleanup after review IDEA-CR-48790 GitOrigin-RevId: dfbc35fbd3ae866416fd734a956e9ff2d4f2e83e --- .../intellij/openapi/options/colors/ColorDescriptor.java | 4 ++++ .../application/options/colors/ColorAndFontOptions.java | 7 +++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/platform/lang-api/src/com/intellij/openapi/options/colors/ColorDescriptor.java b/platform/lang-api/src/com/intellij/openapi/options/colors/ColorDescriptor.java index b41d7a5d6d93..102df02a539e 100644 --- a/platform/lang-api/src/com/intellij/openapi/options/colors/ColorDescriptor.java +++ b/platform/lang-api/src/com/intellij/openapi/options/colors/ColorDescriptor.java @@ -39,6 +39,10 @@ public final class ColorDescriptor extends AbstractKeyDescriptor { public boolean isForeground() { return this == FOREGROUND || this == FOREGROUND_WITH_TRANSPARENCY; } + + public boolean isWithTransparency() { + return this == FOREGROUND_WITH_TRANSPARENCY || this == BACKGROUND_WITH_TRANSPARENCY; + } } private final Kind myKind; diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java index 5ae4e9be9f96..3cbe17e3a877 100644 --- a/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java +++ b/platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java @@ -855,7 +855,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract @Override public Color getExternalForeground() { - return myKind.isForeground() ? myColor : null; + return isForegroundEnabled() ? myColor : null; } @Override @@ -867,7 +867,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract @Override public Color getExternalBackground() { - return myKind.isBackground() ? myColor : null; + return isBackgroundEnabled() ? myColor : null; } @Override @@ -903,8 +903,7 @@ public class ColorAndFontOptions extends SearchableConfigurable.Parent.Abstract @Override public boolean isTransparencyEnabled() { - return myKind == ColorDescriptor.Kind.BACKGROUND_WITH_TRANSPARENCY || - myKind == ColorDescriptor.Kind.FOREGROUND_WITH_TRANSPARENCY; + return myKind.isWithTransparency(); } @Override