From 0bd0de485a43ce0d568b55f5fac09739262c7b64 Mon Sep 17 00:00:00 2001 From: weisj Date: Wed, 4 Nov 2020 21:33:37 +0100 Subject: [PATCH] Add accent color support to SolarizedLightTheme. Add missing accent color definitions to other themes. --- .../darklaf/theme/SolarizedLightTheme.java | 5 +++++ .../theme/darcula/darcula_accents.properties | 4 +++- .../intellij/intellij_accents.properties | 4 +++- .../one_dark/one_dark_accents.properties | 4 +++- .../solarized_dark_accents.properties | 2 +- .../solarized_light_accents.properties | 21 ++++++++++++++++++- 6 files changed, 35 insertions(+), 5 deletions(-) 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 d05ac072..900dce5a 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 @@ -64,6 +64,11 @@ public class SolarizedLightTheme extends Theme { return true; } + @Override + public boolean supportsCustomAccentColor() { + 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/darcula/darcula_accents.properties b/theme/src/main/resources/com/github/weisj/darklaf/theme/darcula/darcula_accents.properties index 6ac537e4..ea016231 100644 --- a/theme/src/main/resources/com/github/weisj/darklaf/theme/darcula/darcula_accents.properties +++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/darcula/darcula_accents.properties @@ -31,7 +31,9 @@ accent.propertyList = {widgetFillDefault:[100,100,100];\ controlBorderFocus:[100,90,116];\ controlBorderFocusSelected:[100,90,116];\ glowFocusLine:[100,90,116];\ + glowFocusLineInactive:[100,90,116];\ glowFocus:[100,120,155];\ + glowFocusInactive:[100,120,155];\ borderFocus:[100,76,122];\ highlightFill:[100,80,45];\ highlightFillFocus:[100,100,80];\ @@ -40,6 +42,6 @@ accent.propertyList = {widgetFillDefault:[100,100,100];\ controlFillHighlight:[100,100,100];\ controlFillHighlightDisabled:[100,77,50];\ hyperlink:[100,100,100]} -selection.propertyList = {textCompSelectionBackground} +selection.propertyList = {textCompSelectionBackground;textSelectionBackground} selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground} diff --git a/theme/src/main/resources/com/github/weisj/darklaf/theme/intellij/intellij_accents.properties b/theme/src/main/resources/com/github/weisj/darklaf/theme/intellij/intellij_accents.properties index 03c9e0ff..0ddc1c49 100644 --- a/theme/src/main/resources/com/github/weisj/darklaf/theme/intellij/intellij_accents.properties +++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/intellij/intellij_accents.properties @@ -31,7 +31,9 @@ accent.propertyList = {widgetFillDefault:[100,100,100];\ controlBorderFocus:[100,60,100];\ controlBorderFocusSelected:[100,50,122];\ glowFocusLine:[100,60,100];\ + glowFocusLineInactive:[100,60,100];\ glowFocus:[100,120,120];\ + glowFocusInactive:[100,120,120];\ borderFocus:[100,76,122];\ highlightFillFocus:[100,130,95];\ highlightFillFocusSecondary:[100,110,100];\ @@ -40,6 +42,6 @@ accent.propertyList = {widgetFillDefault:[100,100,100];\ widgetFillSelected:[100,100,100];\ controlFillHighlight:[100,100,100];\ hyperlink:[100,100,100]} -selection.propertyList = {textCompSelectionBackground} +selection.propertyList = {textCompSelectionBackground;textSelectionBackground} selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground} diff --git a/theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_accents.properties b/theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_accents.properties index 7ca788d3..3e863a6f 100644 --- a/theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_accents.properties +++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_accents.properties @@ -31,7 +31,9 @@ accent.propertyList = {widgetFillDefault:[100,100,100];\ controlBorderFocus:[100,90,116];\ controlBorderFocusSelected:[100,90,116];\ glowFocusLine:[100,90,116];\ + glowFocusLineInactive:[100,90,116];\ glowFocus:[100,120,155];\ + glowFocusInactive:[100,120,155];\ borderFocus:[100,76,122];\ highlightFill:[100,80,45];\ highlightFillFocus:[100,100,80];\ @@ -43,6 +45,6 @@ accent.propertyList = {widgetFillDefault:[100,100,100];\ controlFadeEnd:[100,50,30];\ controlFillHighlightDisabled:[100,77,50];\ hyperlink:[100,100,100]} -selection.propertyList = {textCompSelectionBackground} +selection.propertyList = {textCompSelectionBackground;textSelectionBackground} selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground} 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 index 29ff3ef8..eafb844f 100644 --- 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 @@ -24,6 +24,6 @@ # # suppress inspection "UnusedProperty" for whole file # -selection.propertyList = {textCompSelectionBackground} +selection.propertyList = {textCompSelectionBackground;textSelectionBackground} 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 index 29ff3ef8..e89bb43f 100644 --- 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 @@ -24,6 +24,25 @@ # # suppress inspection "UnusedProperty" for whole file # -selection.propertyList = {textCompSelectionBackground} +accent.propertyList = {widgetFillDefault:[100,100,100];\ + dropForeground:[104,73,95];\ + acceleratorForeground:[104,73,95];\ + borderFocus:[98,130,113];\ + hoverHighlightDefault:[100,89,103];\ + clickHighlightDefault:[100,80,107];\ + highlightFillFocus:[103,90,100];\ + highlightFillFocusSecondary:[100,108,103];\ + widgetBorderDefault:[102,98,94];\ + controlBorderFocus:[99,54,110];\ + controlBorderFocusSelected:[99,54,110];\ + glowFocus:[100,100,100];\ + glowFocusInactive:[100,100,100];\ + glowFocusLine:[98,43,100];\ + glowFocusLineInactive:[98,43,100];\ + controlBorderSelected:[100,100,100];\ + widgetFillSelected:[100,100,100];\ + controlFillHighlight:[100,100,100];\ + hyperlink:[100,100,100]} +selection.propertyList = {textCompSelectionBackground;textSelectionBackground} selectionForeground.propertyList = {%textCompSelectionBackground:textCompSelectionForeground}