Revert removal of textIcon* properties. Fixes #216

4 years ago · fa854b2dea
10 changed files with 34 additions and 7 deletions
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/checkmark.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/checkmark.svg
@ -1,11 +1,11 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
    <defs id="colors">
-        <linearGradient id="textForeground">
+        <linearGradient id="textIconEnabled">
            <stop offset="0" stop-color="#FFF"/>
            <stop offset="1" stop-color="#FFF"/>
        </linearGradient>
    </defs>
-    <polyline fill="none" stroke="url(#textForeground)" stroke-linecap="round" stroke-linejoin="round"
+    <polyline fill="none" stroke="url(#textIconEnabled)" stroke-linecap="round" stroke-linejoin="round"
              stroke-width="1.5"
              points="3.8 8.5 6.3 12 12.3 4"/>
 </svg>
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/checkmarkDisabled.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/checkmarkDisabled.svg
@ -1,11 +1,11 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
    <defs id="colors">
-        <linearGradient id="textForegroundInactive">
+        <linearGradient id="textIconDisabled">
            <stop offset="0" stop-color="#000"/>
            <stop offset="1" stop-color="#000"/>
        </linearGradient>
    </defs>
-    <polyline fill="none" stroke="url(#textForegroundInactive)" stroke-linecap="round" stroke-linejoin="round"
+    <polyline fill="none" stroke="url(#textIconDisabled)" stroke-linecap="round" stroke-linejoin="round"
              stroke-width="1.5"
              points="3.8 8.5 6.3 12 12.3 4"/>
 </svg>
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/checkmarkSelected.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/checkmarkSelected.svg
@ -1,11 +1,11 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
    <defs id="colors">
-        <linearGradient id="textSelectionForeground">
+        <linearGradient id="textIconSelected">
            <stop offset="0" stop-color="#FFF"/>
            <stop offset="1" stop-color="#FFF"/>
        </linearGradient>
    </defs>
-    <polyline fill="none" stroke="url(#textSelectionForeground)" stroke-linecap="round" stroke-linejoin="round"
+    <polyline fill="none" stroke="url(#textIconSelected)" stroke-linecap="round" stroke-linejoin="round"
              stroke-width="1.5"
              points="3.8 8.5 6.3 12 12.3 4"/>
 </svg>
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_icons.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_icons.properties
@ -39,6 +39,10 @@
 %fileIconForeground        = 000000
 %fileIconHighlight         = 00E61F

+%textIconEnabled           = %textForeground
+%textIconDisabled          = %textForegroundInactive
+%textIconSelected          = %textSelectionForeground
+
 %windowButton              = FFFFFF
 %windowButtonDisabled      = 8C8C8C
 %windowCloseHovered        = FFFFFF
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_light/high_contrast_light_icons.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_light/high_contrast_light_icons.properties
@ -39,6 +39,10 @@
 %fileIconForeground        = FFFFFF
 %fileIconHighlight         = 26d94a

+%textIconEnabled           = %textForeground
+%textIconDisabled          = %textForegroundInactive
+%textIconSelected          = %textSelectionForeground
+
 %windowButton              = 000000
 %windowButtonDisabled      = 666666
 %windowCloseHovered        = FFFFFF
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/icon_presets/dark_icons.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/icon_presets/dark_icons.properties
@ -39,6 +39,10 @@
 %fileIconForeground        = 231F20
 %fileIconHighlight         = 499C54

+%textIconEnabled           = %textForeground
+%textIconDisabled          = %textForegroundInactive
+%textIconSelected          = %textSelectionForeground
+
 %windowButton              = A9A9A9
 %windowButtonDisabled      = 8C8C8C
 %windowCloseHovered        = FFFFFF
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/icon_presets/light_icons.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/icon_presets/light_icons.properties
@ -39,6 +39,10 @@
 %fileIconForeground        = 231F20
 %fileIconHighlight         = 59A869

+%textIconEnabled           = %textForeground
+%textIconDisabled          = %textForegroundInactive
+%textIconSelected          = %textSelectionForeground
+
 %windowButton              = 050708
 %windowButtonDisabled      = 9B9C9C
 %windowCloseHovered        = FFFFFF
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_icons.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/one_dark/one_dark_icons.properties
@ -33,13 +33,16 @@
 %menuIconSelected          = F9FCFF
 %menuIconSelectedSecondary = F9FCFF
 %menuIconDisabled          = 2c313a
-#595959
 %menuIconHighlight         = 337C97

 %fileIconBackground        = 828D96
 %fileIconForeground        = 404043
 %fileIconHighlight         = 499C54

+%textIconEnabled           = %textForeground
+%textIconDisabled          = %textForegroundInactive
+%textIconSelected          = %textSelectionForeground
+
 %windowButton              = A9A9A9
 %windowButtonDisabled      = 8C8C8C
 %windowCloseHovered        = FFFFFF
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties
@ -39,6 +39,10 @@
 %fileIconForeground        = 002B36
 %fileIconHighlight         = 859900

+%textIconEnabled           = %textForeground
+%textIconDisabled          = %textForegroundInactive
+%textIconSelected          = %textSelectionForeground
+
 %windowButton              = A9A9A9
 %windowButtonDisabled      = 8C8C8C
 %windowCloseHovered        = FFFFFF
--- a/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties
+++ b/theme/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties
@ -39,6 +39,10 @@
 %fileIconForeground        = 002B36
 %fileIconHighlight         = 859900

+%textIconEnabled           = %textForeground
+%textIconDisabled          = %textForegroundInactive
+%textIconSelected          = %textSelectionForeground
+
 %windowButton              = 050708
 %windowButtonDisabled      = 9B9C9C
 %windowCloseHovered        = FFFFFF