Browse Source

Fixed foreground color generation.

pull/188/head
weisj 5 years ago
parent
commit
c133c515f9
  1. 4
      core/src/main/java/com/github/weisj/darklaf/task/ForegroundColorGenerationTask.java
  2. 2
      theme/src/main/resources/com/github/weisj/darklaf/theme/darcula/darcula_accents.properties
  3. 2
      theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_accents.properties
  4. 2
      theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_accents.properties
  5. 2
      theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_accents.properties

4
core/src/main/java/com/github/weisj/darklaf/task/ForegroundColorGenerationTask.java

@ -49,10 +49,10 @@ public class ForegroundColorGenerationTask extends ColorAdjustmentTask {
protected void runTask(final Theme currentTheme, final Properties properties) { protected void runTask(final Theme currentTheme, final Properties properties) {
Properties props = currentTheme.loadPropertyFile("accents", true); Properties props = currentTheme.loadPropertyFile("accents", true);
AccentColorRule accentColorRule = currentTheme.getAccentColorRule(); AccentColorRule accentColorRule = currentTheme.getAccentColorRule();
if (accentColorRule.getAccentColor() != null) { if (accentColorRule.getAccentColor() != null && currentTheme.supportsCustomAccentColor()) {
adjust(ACCENT_LIST_KEY, props, list -> adjustForegroundList(list, properties)); adjust(ACCENT_LIST_KEY, props, list -> adjustForegroundList(list, properties));
} }
if (accentColorRule.getSelectionColor() != null) { if (accentColorRule.getSelectionColor() != null && currentTheme.supportsCustomSelectionColor()) {
adjust(FOREGROUND_LIST_KEY, props, list -> adjustForegroundList(list, properties)); adjust(FOREGROUND_LIST_KEY, props, list -> adjustForegroundList(list, properties));
} }
} }

2
theme/src/main/resources/com/github/weisj/darklaf/theme/darcula/darcula_accents.properties

@ -42,4 +42,4 @@ accent.propertyList = {widgetFillDefault:[100,100,100];\
hyperlink:[100,100,100]} hyperlink:[100,100,100]}
selection.propertyList = {textCompSelectionBackground} selection.propertyList = {textCompSelectionBackground}
selectionForeground.propertyList = {textCompSelectionBackground:textCompSelectionForeground} selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground}

2
theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_accents.properties

@ -45,4 +45,4 @@ accent.propertyList = {widgetFillDefault:[100,100,100];\
hyperlink:[100,100,100]} hyperlink:[100,100,100]}
selection.propertyList = {textCompSelectionBackground} selection.propertyList = {textCompSelectionBackground}
selectionForeground.propertyList = {textCompSelectionBackground:textCompSelectionForeground} selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground}

2
theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_accents.properties

@ -26,4 +26,4 @@
# #
selection.propertyList = {textCompSelectionBackground} selection.propertyList = {textCompSelectionBackground}
selectionForeground.propertyList = {textCompSelectionBackground:textCompSelectionForeground} selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground}

2
theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_accents.properties

@ -26,4 +26,4 @@
# #
selection.propertyList = {textCompSelectionBackground} selection.propertyList = {textCompSelectionBackground}
selectionForeground.propertyList = {textCompSelectionBackground:textCompSelectionForeground} selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground}

Loading…
Cancel
Save