From fdb22593fdd6f8e94c8adcb57d14dc263a494171 Mon Sep 17 00:00:00 2001 From: weisj Date: Tue, 16 Jun 2020 16:45:04 +0200 Subject: [PATCH] Enable custom selection color fur solarized themes. --- .../darklaf/ui/combobox/DarkComboBoxUI.java | 1 - .../darklaf/theme/SolarizedDarkTheme.java | 5 ++++ .../darklaf/theme/SolarizedLightTheme.java | 5 ++++ .../solarized_dark_accents.properties | 29 +++++++++++++++++++ .../solarized_light_accents.properties | 29 +++++++++++++++++++ 5 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_accents.properties create mode 100644 theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_accents.properties diff --git a/core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java b/core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java index c9e82fee..526d2318 100644 --- a/core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java +++ b/core/src/main/java/com/github/weisj/darklaf/ui/combobox/DarkComboBoxUI.java @@ -41,7 +41,6 @@ import com.github.weisj.darklaf.components.ArrowButton; import com.github.weisj.darklaf.delegate.LayoutManagerDelegate; import com.github.weisj.darklaf.graphics.PaintUtil; import com.github.weisj.darklaf.ui.list.DarkDefaultListCellRenderer; -import com.github.weisj.darklaf.ui.list.DarkListCellRendererDelegate; import com.github.weisj.darklaf.util.DarkUIUtil; import com.github.weisj.darklaf.util.PropertyKey; diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java index 8b0c4171..64fc1be8 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedDarkTheme.java @@ -58,6 +58,11 @@ public class SolarizedDarkTheme extends Theme { return ColorToneRule.DARK; } + @Override + public boolean supportsCustomSelectionColor() { + return true; + } + @Override public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { super.customizeUIProperties(properties, currentDefaults); diff --git a/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java b/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java index 6ed71072..d692570c 100644 --- a/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java +++ b/theme/src/main/java/com/github/weisj/darklaf/theme/SolarizedLightTheme.java @@ -58,6 +58,11 @@ public class SolarizedLightTheme extends Theme { return ColorToneRule.LIGHT; } + @Override + public boolean supportsCustomSelectionColor() { + return true; + } + @Override public void customizeUIProperties(final Properties properties, final UIDefaults currentDefaults) { super.customizeUIProperties(properties, currentDefaults); diff --git a/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_accents.properties b/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_accents.properties new file mode 100644 index 00000000..9d75c721 --- /dev/null +++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_accents.properties @@ -0,0 +1,29 @@ +# +# MIT License +# +# Copyright (c) 2020 Jannis Weis +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# +# suppress inspection "UnusedProperty" for whole file +# +selection.propertyList = {textCompSelectionBackground} + +selectionForeground.propertyList = {textCompSelectionBackground:textCompSelectionForeground} diff --git a/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_accents.properties b/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_accents.properties new file mode 100644 index 00000000..9d75c721 --- /dev/null +++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_accents.properties @@ -0,0 +1,29 @@ +# +# MIT License +# +# Copyright (c) 2020 Jannis Weis +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. +# +# +# suppress inspection "UnusedProperty" for whole file +# +selection.propertyList = {textCompSelectionBackground} + +selectionForeground.propertyList = {textCompSelectionBackground:textCompSelectionForeground}