github
/
darklaf
mirror of https://github.com/weisJ/darklaf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed issue where themed icons were not correctly updated when painted directly as svg icon. 

Decoupled all icons from hard coded opacity values.
Removed opacity from icons in contrast themes.
Fixed HighContrastLightTheme using the incorrect icon theme.
pull/127/head
weisj 5 years ago
parent
4fc9f03de9
commit
a5d7545c03
22 changed files with 99 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      core/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java
  2. 10
      core/src/main/resources/com/github/weisj/darklaf/icons/files/drive.svg
  3. 8
      core/src/main/resources/com/github/weisj/darklaf/icons/files/folder.svg
  4. 10
      core/src/main/resources/com/github/weisj/darklaf/icons/files/general.svg
  5. 18
      core/src/main/resources/com/github/weisj/darklaf/icons/files/text.svg
  6. 8
      core/src/main/resources/com/github/weisj/darklaf/icons/files/upFolder.svg
  7. 8
      core/src/main/resources/com/github/weisj/darklaf/icons/navigation/arrowDivider.svg
  8. 8
      core/src/main/resources/com/github/weisj/darklaf/icons/navigation/clear.svg
  9. 8
      core/src/main/resources/com/github/weisj/darklaf/icons/navigation/close.svg
  10. 8
      core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeHovered.svg
  11. 8
      core/src/main/resources/com/github/weisj/darklaf/icons/navigation/collapse.svg
  12. 24
      core/src/main/resources/com/github/weisj/darklaf/icons/navigation/moreTabs.svg
  13. 5
      core/src/main/resources/com/github/weisj/darklaf/properties/icons/files.properties
  14. 6
      core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation.properties
  15. 3
      core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/dark_icons.properties
  16. 3
      core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/light_icons.properties
  17. 3
      core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_icons.properties
  18. 9
      core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_light/high_contrast_light_icons.properties
  19. 3
      core/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties
  20. 3
      core/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties
  21. 2
      core/src/test/java/ui/tabFrame/TabFrameDemo.java
  22. 4
      property-loader/src/main/java/com/github/weisj/darklaf/icons/ThemedSVGIcon.java

2
core/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java
Unescape View File

@ -30,7 +30,7 @@ public class HighContrastLightTheme extends Theme {
@Override
protected PresetIconRule getPresetIconRule() {
return PresetIconRule.LIGHT;
return PresetIconRule.NONE;
}
@Override

10
core/src/main/resources/com/github/weisj/darklaf/icons/files/drive.svg
Unescape View File

@ -1,8 +1,8 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs id="colors">
<linearGradient id="Icons.drive.color">
<stop offset="0" stop-color="#9AA7B0"/>
<stop offset="1" stop-color="#9AA7B0"/>
<linearGradient id="Icons.drive.color" opacity="Icons.drive.opacity">
<stop offset="0" stop-color="#9AA7B0" stop-opacity=".8"/>
<stop offset="1" stop-color="#9AA7B0" stop-opacity=".8"/>
</linearGradient>
<linearGradient id="Icons.drive.dotColor">
<stop offset="0" stop-color="#499C54"/>
@ -10,10 +10,10 @@
</linearGradient>
</defs>
<g fill="none" fill-rule="evenodd">
<rect x="2" y="9" width="12" height="4" fill="url(#Icons.drive.color)" fill-opacity=".8"/>
<rect x="2" y="9" width="12" height="4" fill="url(#Icons.drive.color)"/>
<rect x="11" y="10" width="2" height="2" fill="url(#Icons.drive.dotColor)"/>
<rect x="2" y="4" width="12" height="4" fill="url(#Icons.drive.color)" fill-opacity=".8"/>
<rect x="2" y="4" width="12" height="4" fill="url(#Icons.drive.color)"/>
<rect x="11" y="5" width="2" height="2" fill="url(#Icons.drive.dotColor)"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 902 B

After

Width:  |  Height:  |  Size: 932 B

8
core/src/main/resources/com/github/weisj/darklaf/icons/files/folder.svg
Unescape View File

@ -1,10 +1,10 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs id="colors">
<linearGradient id="Icons.folder.color">
<stop offset="0" stop-color="#9AA7B0"/>
<stop offset="1" stop-color="#9AA7B0"/>
<linearGradient id="Icons.folder.color" opacity="Icons.folder.opacity">
<stop offset="0" stop-color="#9AA7B0" stop-opacity=".8"/>
<stop offset="1" stop-color="#9AA7B0" stop-opacity=".8"/>
</linearGradient>
</defs>
<path fill="url(#Icons.folder.color)" fill-opacity=".8"
<path fill="url(#Icons.folder.color)"
d="M1,13 L15,13 L15,4 L7.98457,4 L6.69633,2.71149 C6.22161957,2.28559443 5.61570121,2.03457993 4.97888,2 L1.05128,2 C1.02295884,2 1,2.02295884 1,2.05128 L1,13 Z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 539 B

After

Width:  |  Height:  |  Size: 588 B

10
core/src/main/resources/com/github/weisj/darklaf/icons/files/general.svg
Unescape View File

@ -1,12 +1,12 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs id="colors">
<linearGradient id="Icons.generalFile.color">
<stop offset="0" stop-color="#9AA7B0"/>
<stop offset="1" stop-color="#9AA7B0"/>
<linearGradient id="Icons.generalFile.color" opacity="Icons.generalFile.opacity">
<stop offset="0" stop-color="#9AA7B0" stop-opacity=".8"/>
<stop offset="1" stop-color="#9AA7B0" stop-opacity=".8"/>
</linearGradient>
</defs>
<g fill="none" fill-rule="evenodd">
<polygon fill="url(#Icons.generalFile.color)" fill-opacity=".8" points="7 1 3 5 7 5"/>
<polygon fill="url(#Icons.generalFile.color)" fill-opacity=".8" points="8 1 8 6 3 6 3 15 13 15 13 1"/>
<polygon fill="url(#Icons.generalFile.color)" points="7 1 3 5 7 5"/>
<polygon fill="url(#Icons.generalFile.color)" points="8 1 8 6 3 6 3 15 13 15 13 1"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 565 B

After

Width:  |  Height:  |  Size: 601 B

18
core/src/main/resources/com/github/weisj/darklaf/icons/files/text.svg
Unescape View File

@ -1,18 +1,18 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs id="colors">
<linearGradient id="Icons.textFile.color">
<stop offset="0" stop-color="#9AA7B0"/>
<stop offset="1" stop-color="#9AA7B0"/>
<linearGradient id="Icons.textFile.color" opacity="Icons.textFile.opacity">
<stop offset="0" stop-color="#9AA7B0" stop-opacity=".8"/>
<stop offset="1" stop-color="#9AA7B0" stop-opacity=".8"/>
</linearGradient>
<linearGradient id="Icons.textFile.foregroundColor">
<stop offset="0" stop-color="#231F20"/>
<stop offset="1" stop-color="#231F20"/>
<linearGradient id="Icons.textFile.foregroundColor" opacity="Icons.textFile.opacity">
<stop offset="0" stop-color="#231F20" stop-opacity=".8"/>
<stop offset="1" stop-color="#231F20" stop-opacity=".8"/>
</linearGradient>
</defs>
<g fill="none" fill-rule="evenodd">
<polygon fill="url(#Icons.textFile.color)" fill-opacity=".8" points="7 1 3 5 7 5"/>
<polygon fill="url(#Icons.textFile.color)" fill-opacity=".8" points="8 1 8 6 3 6 3 15 13 15 13 1"/>
<path fill="url(#Icons.textFile.foregroundColor)" fill-opacity=".7"
<polygon fill="url(#Icons.textFile.color)" points="7 1 3 5 7 5"/>
<polygon fill="url(#Icons.textFile.color)" points="8 1 8 6 3 6 3 15 13 15 13 1"/>
<path fill="url(#Icons.textFile.foregroundColor)"
d="M5,12 L9,12 L9,11 L5,11 L5,12 Z M5,10 L11,10 L11,9 L5,9 L5,10 Z M5,8 L11,8 L11,7 L5,7 L5,8 Z"/>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 936 B

After

Width:  |  Height:  |  Size: 1020 B

8
core/src/main/resources/com/github/weisj/darklaf/icons/files/upFolder.svg
Unescape View File

@ -1,15 +1,15 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs id="colors">
<linearGradient id="Icons.upFolder.color">
<stop offset="0" stop-color="#9AA7B0"/>
<stop offset="1" stop-color="#9AA7B0"/>
<linearGradient id="Icons.upFolder.color" opacity="Icons.upFolder.opacity">
<stop offset="0" stop-color="#9AA7B0" stop-opacity=".8"/>
<stop offset="1" stop-color="#9AA7B0" stop-opacity=".8"/>
</linearGradient>
<linearGradient id="Icons.upFolder.arrowColor">
<stop offset="0" stop-color="#40B6E0"/>
<stop offset="1" stop-color="#40B6E0"/>
</linearGradient>
</defs>
<path fill="url(#Icons.upFolder.color)" fill-opacity=".8" fill-rule="evenodd"
<path fill="url(#Icons.upFolder.color)" fill-rule="evenodd"
d="M14,4 L14,9 L10,9 L10,4 L7.984,4 L6.696,2.711 C6.305,2.32 5.532,2 4.979,2 L1.051,2 C1.023,2 1,2.023 1,2.051 L1,13 L15,13 L15,4 L14,4 Z"/>
<polygon fill="url(#Icons.upFolder.arrowColor)" points="15 3 12 0 9 3 11 3 11 8 13 8 13 3" fill-rule="evenodd"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 842 B

After

Width:  |  Height:  |  Size: 894 B

8
core/src/main/resources/com/github/weisj/darklaf/icons/navigation/arrowDivider.svg
Unescape View File

@ -1,10 +1,10 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs id="colors">
<linearGradient id="Icons.arrowDivider.color">
<stop offset="0" stop-color="#AFB1B3"/>
<stop offset="1" stop-color="#AFB1B3"/>
<linearGradient id="Icons.arrowDivider.color" opacity="Icons.arrowDivider.opacity">
<stop offset="0" stop-color="#AFB1B3" stop-opacity=".8"/>
<stop offset="1" stop-color="#AFB1B3" stop-opacity=".8"/>
</linearGradient>
</defs>
<path fill="url(#Icons.arrowDivider.color)" fill-opacity=".8"
<path fill="url(#Icons.arrowDivider.color)"
d="M10.2848209,8.8267205 C10.2690992,8.86435323 10.2504724,8.90131564 10.228869,8.93732137 L7.22886896,13.9373214 C6.98734303,14.3398646 6.46522184,14.4703949 6.06267863,14.228869 C5.66013542,13.987343 5.52960512,13.4652218 5.77113104,13.0626786 L8.77113104,8.06267863 C8.78414364,8.04099097 8.79797072,8.02009288 8.81254969,8 C8.79797072,7.97990712 8.78414364,7.95900903 8.77113104,7.93732137 L5.77113104,2.93732137 C5.52960512,2.53477816 5.66013542,2.01265697 6.06267863,1.77113104 C6.46522184,1.52960512 6.98734303,1.66013542 7.22886896,2.06267863 L10.228869,7.06267863 C10.2504724,7.09868436 10.2690992,7.13564677 10.2848209,7.1732795 L10.7372112,8 L10.2848209,8.8267205 Z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

8
core/src/main/resources/com/github/weisj/darklaf/icons/navigation/clear.svg
Unescape View File

@ -1,10 +1,10 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="-2 -2 32 32" width="16" height="16">
<defs id="colors">
<linearGradient id="Icons.clear.color">
<stop offset="0" stop-color="#7F8B91"/>
<stop offset="1" stop-color="#7F8B91"/>
<linearGradient id="Icons.clear.color" opacity="Icons.clear.opacity">
<stop offset="0" stop-color="#7F8B91" stop-opacity=".8"/>
<stop offset="1" stop-color="#7F8B91" stop-opacity=".8"/>
</linearGradient>
</defs>
<path fill="url(#Icons.clear.color)" fill-opacity="0.8"
<path fill="url(#Icons.clear.color)"
d="M14,0A14,14,0,1,0,28,14,14,14,0,0,0,14,0Zm7.5,19.1L19,21.6l-5-5-5,5L6.5,19.1l5-5-5-5L9,6.6l5,5,5-5,2.5,2.5-5,5Z"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 493 B

After

Width:  |  Height:  |  Size: 541 B

8
core/src/main/resources/com/github/weisj/darklaf/icons/navigation/close.svg
Unescape View File

@ -1,10 +1,10 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs id="colors">
<linearGradient id="Icons.close.color">
<stop offset="0" stop-color="#7F8B91"/>
<stop offset="1" stop-color="#7F8B91"/>
<linearGradient id="Icons.close.color" opacity="Icons.close.opacity">
<stop offset="0" stop-color="#7F8B91" stop-opacity=".8"/>
<stop offset="1" stop-color="#7F8B91" stop-opacity=".8"/>
</linearGradient>
</defs>
<path fill="url(#Icons.close.color)" fill-opacity=".8"
<path fill="url(#Icons.close.color)"
d="M7.99494337,8.70506958 L4.85408745,11.8540874 L4.14698067,11.1469807 L7.29493214,8.00505835 L4.14698067,4.85710688 L4.85408745,4.1500001 L8.00204181,7.29795446 L11.1439612,4.1500001 L11.851068,4.85710688 L8.70204624,7.99795888 L11.851068,11.1469807 L11.1439612,11.8540874 L7.99494337,8.70506958 Z"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 675 B

After

Width:  |  Height:  |  Size: 724 B

8
core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeHovered.svg
Unescape View File

@ -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="Icons.closeHovered.color">
<stop offset="0" stop-color="#AFB1B3"/>
<stop offset="1" stop-color="#AFB1B3"/>
<linearGradient id="Icons.closeHovered.color" opacity="Icons.closeHovered.opacity">
<stop offset="0" stop-color="#AFB1B3" stop-opacity=".8"/>
<stop offset="1" stop-color="#AFB1B3" stop-opacity=".8"/>
</linearGradient>
</defs>
<path fill="url(#Icons.closeHovered.color)" fill-opacity=".8"
<path fill="url(#Icons.closeHovered.color)"
d="M7.99494337,8.70506958 L4.85408745,11.8540874 L4.14698067,11.1469807 L7.29493214,8.00505835 L4.14698067,4.85710688 L4.85408745,4.1500001 L8.00204181,7.29795446 L11.1439612,4.1500001 L11.851068,4.85710688 L8.70204624,7.99795888 L11.851068,11.1469807 L11.1439612,11.8540874 L7.99494337,8.70506958 Z"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 691 B

After

Width:  |  Height:  |  Size: 746 B

8
core/src/main/resources/com/github/weisj/darklaf/icons/navigation/collapse.svg
Unescape View File

@ -1,9 +1,9 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16">
<defs id="colors">
<linearGradient id="Icons.collapse.color">
<stop offset="0" stop-color="#AFB1B3"/>
<stop offset="1" stop-color="#AFB1B3"/>
<linearGradient id="Icons.collapse.color" opacity="Icons.collapse.opacity">
<stop offset="0" stop-color="#AFB1B3" stop-opacity=".8"/>
<stop offset="1" stop-color="#AFB1B3" stop-opacity=".8"/>
</linearGradient>
</defs>
<rect x="2" y="7" width="12" height="2" fill="url(#Icons.collapse.color)" fill-opacity=".8"/>
<rect x="2" y="7" width="12" height="2" fill="url(#Icons.collapse.color)"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 405 B

After

Width:  |  Height:  |  Size: 456 B

24
core/src/main/resources/com/github/weisj/darklaf/icons/navigation/moreTabs.svg
Unescape View File

@ -1,19 +1,17 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<defs id="colors">
<linearGradient id="Icons.moreTabs.color">
<stop offset="0" stop-color="#AFB1B3"/>
<stop offset="1" stop-color="#AFB1B3"/>
<linearGradient id="Icons.moreTabs.color" opacity="Icons.moreTabs.opacity">
<stop offset="0" stop-color="#AFB1B3" stop-opacity=".8"/>
<stop offset="1" stop-color="#AFB1B3" stop-opacity=".8"/>
</linearGradient>
<linearGradient id="Icons.moreTabs.arrowColor">
<stop offset="0" stop-color="#AFB1B3"/>
<stop offset="1" stop-color="#AFB1B3"/>
<linearGradient id="Icons.moreTabs.arrowColor" opacity="Icons.moreTabs.opacity">
<stop offset="0" stop-color="#AFB1B3" stop-opacity=".8"/>
<stop offset="1" stop-color="#AFB1B3" stop-opacity=".8"/>
</linearGradient>
</defs>
<g fill="none" fill-opacity=".8">
<rect width="8" height="1" x="8" y="4" fill="url(#Icons.moreTabs.color)"/>
<rect width="8" height="1" x="8" y="6" fill="url(#Icons.moreTabs.color)"/>
<rect width="8" height="1" x="8" y="8" fill="url(#Icons.moreTabs.color)"/>
<rect width="8" height="1" x="8" y="10" fill="url(#Icons.moreTabs.color)"/>
<polygon fill="url(#Icons.moreTabs.arrowColor)" points="3.5 7 6 10 1 10" transform="matrix(1 0 0 -1 0 17)"/>
</g>
<rect width="8" height="1" x="8" y="4" fill="url(#Icons.moreTabs.color)"/>
<rect width="8" height="1" x="8" y="6" fill="url(#Icons.moreTabs.color)"/>
<rect width="8" height="1" x="8" y="8" fill="url(#Icons.moreTabs.color)"/>
<rect width="8" height="1" x="8" y="10" fill="url(#Icons.moreTabs.color)"/>
<polygon fill="url(#Icons.moreTabs.arrowColor)" points="3.5 7 6 10 1 10" transform="matrix(1 0 0 -1 0 17)"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 990 B

After

Width:  |  Height:  |  Size: 1.0 KiB

5
core/src/main/resources/com/github/weisj/darklaf/properties/icons/files.properties
Unescape View File

@ -26,10 +26,13 @@ Icons.desktop.color = %menuIconEnabled
Icons.drive.color = %fileIconBackground
Icons.drive.dotColor = %fileIconHighlight
Icons.drive.opacity = %fileIconOpacity
Icons.folder.color = %fileIconBackground
Icons.folder.opacity = %fileIconOpacity
Icons.generalFile.color = %fileIconBackground
Icons.generalFile.opacity = %fileIconOpacity
Icons.homeFolder.color = %menuIconEnabled
@ -37,9 +40,11 @@ Icons.newFolder.color = %menuIconEnabled
Icons.textFile.color = %fileIconBackground
Icons.textFile.foregroundColor = %fileIconForeground
Icons.textFile.opacity = %fileIconOpacity
Icons.unknownFile.color = %fileIconBackground
Icons.unknownFile.questionColor = %menuIconHighlight
Icons.upFolder.color = %fileIconBackground
Icons.upFolder.arrowColor = %menuIconHighlight
Icons.upFolder.opacity = %fileIconOpacity

6
core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation.properties
Unescape View File

@ -24,6 +24,7 @@
#
Icons.add.color = %menuIconEnabled
Icons.arrowDivider.color = %menuIconEnabled
Icons.arrowDivider.opacity = %menuIconOpacity
Icons.arrowDown.color = %menuIconEnabled
Icons.arrowDownHover.color = %menuIconHovered
@ -53,12 +54,17 @@ Icons.checkmarkDisabled.color = %textIconDisabled
Icons.checkmarkSelected.color = %textIconSelected
Icons.clear.color = %menuIconEnabled
Icons.clear.opacity = %menuIconOpacity
Icons.close.color = %menuIconEnabled
Icons.close.opacity = %menuIconOpacity
Icons.closeHovered.color = %menuIconDisabled
Icons.closeHovered.opacity = %menuIconOpacity
Icons.collapse.color = %menuIconEnabled
Icons.collapse.opacity = %menuIconOpacity
Icons.divider.color = %borderSecondary
Icons.moreTabs.color = %menuIconEnabled
Icons.moreTabs.arrowColor = %menuIconEnabled
Icons.moreTabs.opacity = %menuIconOpacity
Icons.separatorH.color = %menuIconEnabled
Icons.separatorV.color = %menuIconEnabled

3
core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/dark_icons.properties
Unescape View File

@ -22,6 +22,9 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
%menuIconOpacity = 80
%fileIconOpacity = 80
%menuIconEnabled = AFB1B3
%menuIconHovered = dddddd
%menuIconSelected = AFB1B3

3
core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/light_icons.properties
Unescape View File

@ -22,6 +22,9 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
%menuIconOpacity = 80
%fileIconOpacity = 80
%menuIconEnabled = 6E6E6E
%menuIconHovered = ECECEC
%menuIconSelected = FFFFFF

3
core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_icons.properties
Unescape View File

@ -22,6 +22,9 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
%menuIconOpacity = 100
%fileIconOpacity = 100
%menuIconEnabled = FFFFFF
%menuIconHovered = FFFFFF
%menuIconSelected = FFFFFF

9
core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_light/high_contrast_light_icons.properties
Unescape View File

@ -22,10 +22,13 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
%menuIconOpacity = 100
%fileIconOpacity = 100
%menuIconEnabled = 000000
%menuIconHovered = FFFFFF
%menuIconSelected = 000000
%menuIconSelectedSecondary = 000000
%menuIconSelectedSecondary = FFFFFF
%menuIconDisabled = ea9c43
%menuIconHighlight = 00D1E5
@ -42,6 +45,6 @@
%windowCloseHovered = FFFFFF
%errorIconColor = E6194B
%informationIconColor = 26d94a
%informationIconColor = 00D1E5
%warningIconColor = CE5B0A
%questionIconColor = 26d94a
%questionIconColor = 00D1E5

3
core/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties
Unescape View File

@ -22,6 +22,9 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
%menuIconOpacity = 80
%fileIconOpacity = 80
%menuIconEnabled = 93A1A1
%menuIconHovered = E9FFFF
%menuIconSelected = 93A1A1

3
core/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties
Unescape View File

@ -22,6 +22,9 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
%menuIconOpacity = 80
%fileIconOpacity = 80
%menuIconEnabled = 586E75
%menuIconHovered = BDECFB
%menuIconSelected = FFFFFF

2
core/src/test/java/ui/tabFrame/TabFrameDemo.java
Unescape View File

@ -84,7 +84,7 @@ public class TabFrameDemo implements ComponentDemo {
panel.add(label);
tabbedPopup.getTabbedPane().addTab("Tab " + i, panel);
}
/* Activate for custom tab.
/* Activate for a custom tab.
tabFrame.setUserTabComponentAt(new JLabel("NORTH (custom tab)") {{
setBorder(new EmptyBorder(0, 5, 0, 5));
setOpaque(false);

4
property-loader/src/main/java/com/github/weisj/darklaf/icons/ThemedSVGIcon.java
Unescape View File

@ -39,9 +39,9 @@ public class ThemedSVGIcon extends DarkSVGIcon {
}
@Override
public void paintIcon(final Component c, final Graphics g, final int x, final int y) {
public void paintIcon(final Component c, final Graphics g, final int x, final int y, final double rotation) {
ensureTheme();
super.paintIcon(c, g, x, y);
super.paintIcon(c, g, x, y, rotation);
}
private void ensureTheme() {

Write Preview
Loading…
Cancel
Save