diff --git a/core/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java b/core/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java
index a29b40fd..caeebef6 100644
--- a/core/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java
+++ b/core/src/main/java/com/github/weisj/darklaf/theme/HighContrastLightTheme.java
@@ -30,7 +30,7 @@ public class HighContrastLightTheme extends Theme {
@Override
protected PresetIconRule getPresetIconRule() {
- return PresetIconRule.LIGHT;
+ return PresetIconRule.NONE;
}
@Override
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/files/drive.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/files/drive.svg
index 7276f4f7..a7a31fa6 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/files/drive.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/files/drive.svg
@@ -1,8 +1,8 @@
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/files/folder.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/files/folder.svg
index 64d70e0d..feded571 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/files/folder.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/files/folder.svg
@@ -1,10 +1,10 @@
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/files/general.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/files/general.svg
index d229510e..9529048e 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/files/general.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/files/general.svg
@@ -1,12 +1,12 @@
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/files/text.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/files/text.svg
index 3057c443..c4cb2cb4 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/files/text.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/files/text.svg
@@ -1,18 +1,18 @@
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/files/upFolder.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/files/upFolder.svg
index b956bb47..aa39e25b 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/files/upFolder.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/files/upFolder.svg
@@ -1,15 +1,15 @@
\ No newline at end of file
+
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/arrowDivider.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/arrowDivider.svg
index 65fa56e9..b0cd7ebc 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/arrowDivider.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/arrowDivider.svg
@@ -1,10 +1,10 @@
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/clear.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/clear.svg
index 83b8c77c..5d21166a 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/clear.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/clear.svg
@@ -1,10 +1,10 @@
\ No newline at end of file
+
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/close.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/close.svg
index bad71305..62127474 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/close.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/close.svg
@@ -1,10 +1,10 @@
\ No newline at end of file
+
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeHovered.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeHovered.svg
index b31df34f..7a30e100 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeHovered.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeHovered.svg
@@ -1,11 +1,11 @@
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/collapse.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/collapse.svg
index b5abf35c..2d54fc89 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/collapse.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/collapse.svg
@@ -1,9 +1,9 @@
diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/moreTabs.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/moreTabs.svg
index 00c3c440..75b7998d 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/moreTabs.svg
+++ b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/moreTabs.svg
@@ -1,19 +1,17 @@
diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files.properties b/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files.properties
index 01254d3a..99446f05 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files.properties
+++ b/core/src/main/resources/com/github/weisj/darklaf/properties/icons/files.properties
@@ -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
\ No newline at end of file
+Icons.upFolder.arrowColor = %menuIconHighlight
+Icons.upFolder.opacity = %fileIconOpacity
diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation.properties b/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation.properties
index 85db1638..a7f1215e 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation.properties
+++ b/core/src/main/resources/com/github/weisj/darklaf/properties/icons/navigation.properties
@@ -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
@@ -86,4 +92,4 @@ Icons.moveToTopRightDisabled.color = %menuIconDisabled
Icons.search.color = %menuIconEnabled
Icons.searchWithHistory.color = %menuIconEnabled
-Icons.searchWithHistory.arrowColor = %menuIconEnabled
\ No newline at end of file
+Icons.searchWithHistory.arrowColor = %menuIconEnabled
diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/dark_icons.properties b/core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/dark_icons.properties
index ec514308..74639224 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/dark_icons.properties
+++ b/core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/dark_icons.properties
@@ -22,6 +22,9 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
+%menuIconOpacity = 80
+%fileIconOpacity = 80
+
%menuIconEnabled = AFB1B3
%menuIconHovered = dddddd
%menuIconSelected = AFB1B3
diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/light_icons.properties b/core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/light_icons.properties
index ca7ffac3..69ab128d 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/light_icons.properties
+++ b/core/src/main/resources/com/github/weisj/darklaf/properties/icons/presets/light_icons.properties
@@ -22,6 +22,9 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
+%menuIconOpacity = 80
+%fileIconOpacity = 80
+
%menuIconEnabled = 6E6E6E
%menuIconHovered = ECECEC
%menuIconSelected = FFFFFF
diff --git a/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_icons.properties b/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_icons.properties
index 65cd2f5f..e0fb5cbe 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_icons.properties
+++ b/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_dark/high_contrast_dark_icons.properties
@@ -22,6 +22,9 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
+%menuIconOpacity = 100
+%fileIconOpacity = 100
+
%menuIconEnabled = FFFFFF
%menuIconHovered = FFFFFF
%menuIconSelected = FFFFFF
diff --git a/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_light/high_contrast_light_icons.properties b/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_light/high_contrast_light_icons.properties
index 66d07166..233a6143 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_light/high_contrast_light_icons.properties
+++ b/core/src/main/resources/com/github/weisj/darklaf/theme/high_contrast_light/high_contrast_light_icons.properties
@@ -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
diff --git a/core/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties b/core/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties
index 1727314d..32ce25aa 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties
+++ b/core/src/main/resources/com/github/weisj/darklaf/theme/solarized_dark/solarized_dark_icons.properties
@@ -22,6 +22,9 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
+%menuIconOpacity = 80
+%fileIconOpacity = 80
+
%menuIconEnabled = 93A1A1
%menuIconHovered = E9FFFF
%menuIconSelected = 93A1A1
diff --git a/core/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties b/core/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties
index f96fcc4b..47abcf9c 100644
--- a/core/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties
+++ b/core/src/main/resources/com/github/weisj/darklaf/theme/solarized_light/solarized_light_icons.properties
@@ -22,6 +22,9 @@
# SOFTWARE.
#
# suppress inspection "UnusedProperty" for whole file
+%menuIconOpacity = 80
+%fileIconOpacity = 80
+
%menuIconEnabled = 586E75
%menuIconHovered = BDECFB
%menuIconSelected = FFFFFF
diff --git a/core/src/test/java/ui/tabFrame/TabFrameDemo.java b/core/src/test/java/ui/tabFrame/TabFrameDemo.java
index 1b692452..99213a31 100644
--- a/core/src/test/java/ui/tabFrame/TabFrameDemo.java
+++ b/core/src/test/java/ui/tabFrame/TabFrameDemo.java
@@ -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);
diff --git a/property-loader/src/main/java/com/github/weisj/darklaf/icons/ThemedSVGIcon.java b/property-loader/src/main/java/com/github/weisj/darklaf/icons/ThemedSVGIcon.java
index f0066a8c..41d23e92 100644
--- a/property-loader/src/main/java/com/github/weisj/darklaf/icons/ThemedSVGIcon.java
+++ b/property-loader/src/main/java/com/github/weisj/darklaf/icons/ThemedSVGIcon.java
@@ -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() {