From d5156cbd8dc0b589772ba2d875c52950e521463a Mon Sep 17 00:00:00 2001 From: weisj Date: Mon, 30 Mar 2020 10:25:30 +0200 Subject: [PATCH] Made HighContrastDarkTheme return true on Theme#isHighContrast. Made inactive titlebar color on macOS consistent with windows on HighContrastDarkTheme. --- .../github/weisj/darklaf/theme/HighContrastDarkTheme.java | 5 +++++ .../high_contrast_dark_platform.properties | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/core/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java b/core/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java index 7767a29a..7c9b6665 100644 --- a/core/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java +++ b/core/src/main/java/com/github/weisj/darklaf/theme/HighContrastDarkTheme.java @@ -58,6 +58,11 @@ public class HighContrastDarkTheme extends Theme { return true; } + @Override + public boolean isHighContrast() { + return true; + } + @Override public void loadUIProperties(final Properties properties, final UIDefaults currentDefaults) { super.loadUIProperties(properties, currentDefaults); diff --git a/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_platform.properties b/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_platform.properties index a4f8582d..2a200d7c 100644 --- a/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_platform.properties +++ b/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_platform.properties @@ -22,7 +22,13 @@ # SOFTWARE. # # suppress inspection "UnusedProperty" for whole file + +###Windows### Windows.TitlePane.inactiveBackgroundHover = 473724 Windows.TitlePane.inactiveBackgroundClick = 594B39 Windows.TitlePane.inactiveBackground = 33210C Windows.TitlePane.inactiveForeground = %textForegroundSecondary + +###MacOS### +MacOS.TitlePane.inactiveBackground = 33210C +MacOS.TitlePane.inactiveForeground = %textForegroundSecondary