From c318ddb4771b13feefb54bf7817d4149df6f62c5 Mon Sep 17 00:00:00 2001 From: weisj Date: Thu, 11 Jun 2020 15:31:05 +0200 Subject: [PATCH] Improved layout and icon of ClosableTabbedPane. --- .../components/ClosableTabComponent.java | 26 ++++++++++++--- .../components/ClosableTabbedPane.java | 21 ++++++++++-- .../weisj/darklaf/components/TabEvent.java | 33 +++++++++++++++++-- .../components/loading/LoadingIndicator.java | 4 +-- .../indicator/{speaker_0.svg => speaker0.svg} | 0 ...ker_0Disabled.svg => speaker0Disabled.svg} | 0 .../indicator/{speaker_1.svg => speaker1.svg} | 0 ...ker_1Disabled.svg => speaker1Disabled.svg} | 0 .../indicator/{speaker_2.svg => speaker2.svg} | 0 ...ker_2Disabled.svg => speaker2Disabled.svg} | 0 .../indicator/{speaker_3.svg => speaker3.svg} | 0 ...ker_3Disabled.svg => speaker3Disabled.svg} | 0 .../indicator/{speaker_4.svg => speaker4.svg} | 0 ...ker_4Disabled.svg => speaker4Disabled.svg} | 0 .../weisj/darklaf/icons/navigation/clear.svg | 10 ------ .../weisj/darklaf/icons/navigation/close.svg | 6 ++-- .../icons/navigation/closeDisabled.svg | 10 ++++++ .../darklaf/icons/navigation/closeHovered.svg | 9 +++-- ...search_disabled.svg => searchDisabled.svg} | 0 .../{step_passive.svg => stepPassive.svg} | 0 .../{step_working.svg => stepWorking.svg} | 0 .../properties/icons/navigation.properties | 10 +++--- .../darklaf/properties/ui/slider.properties | 20 +++++------ .../properties/ui/tabbedPane.properties | 3 +- .../darklaf/properties/ui/text.properties | 2 +- .../high_contrast_dark_icons.properties | 1 + .../high_contrast_light_icons.properties | 1 + .../theme/icon_presets/dark_icons.properties | 1 + .../theme/icon_presets/light_icons.properties | 1 + .../theme/one_dark/one_dark_icons.properties | 1 + .../solarized_dark_icons.properties | 1 + .../solarized_light_icons.properties | 1 + 32 files changed, 114 insertions(+), 47 deletions(-) rename core/src/main/resources/com/github/weisj/darklaf/icons/indicator/{speaker_0.svg => speaker0.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/indicator/{speaker_0Disabled.svg => speaker0Disabled.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/indicator/{speaker_1.svg => speaker1.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/indicator/{speaker_1Disabled.svg => speaker1Disabled.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/indicator/{speaker_2.svg => speaker2.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/indicator/{speaker_2Disabled.svg => speaker2Disabled.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/indicator/{speaker_3.svg => speaker3.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/indicator/{speaker_3Disabled.svg => speaker3Disabled.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/indicator/{speaker_4.svg => speaker4.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/indicator/{speaker_4Disabled.svg => speaker4Disabled.svg} (100%) delete mode 100644 core/src/main/resources/com/github/weisj/darklaf/icons/navigation/clear.svg create mode 100644 core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeDisabled.svg rename core/src/main/resources/com/github/weisj/darklaf/icons/navigation/{search_disabled.svg => searchDisabled.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/progress/{step_passive.svg => stepPassive.svg} (100%) rename core/src/main/resources/com/github/weisj/darklaf/icons/progress/{step_working.svg => stepWorking.svg} (100%) diff --git a/core/src/main/java/com/github/weisj/darklaf/components/ClosableTabComponent.java b/core/src/main/java/com/github/weisj/darklaf/components/ClosableTabComponent.java index 7730397c..0bd7843f 100644 --- a/core/src/main/java/com/github/weisj/darklaf/components/ClosableTabComponent.java +++ b/core/src/main/java/com/github/weisj/darklaf/components/ClosableTabComponent.java @@ -39,16 +39,30 @@ import com.github.weisj.darklaf.ui.tabbedpane.DarkTabbedPaneUI; public class ClosableTabComponent extends JPanel { private JTabbedPane pane; + private final Component component; public ClosableTabComponent(final JTabbedPane pane) { - super(new FlowLayout(FlowLayout.LEFT, 0, 0)); + this(pane, null); + } + + public ClosableTabComponent(final JTabbedPane pane, final Component component) { + setLayout(new BoxLayout(this, BoxLayout.X_AXIS)); + this.component = component != null ? component : new TabLabel(this); if (pane == null) { throw new NullPointerException("TabbedPane is null."); } this.pane = pane; setOpaque(false); - add(new TabLabel(this)); - add(new TabButton(this)); + add(this.component); + add(new CloseButton(this)); + } + + public Component getTabComponent() { + return component; + } + + public boolean hasCustomTabComponent() { + return !(component instanceof TabLabel); } public void setTabbedPane(final JTabbedPane pane) { @@ -75,19 +89,21 @@ public class ClosableTabComponent extends JPanel { } } - protected static class TabButton extends JButton implements ActionListener { + protected static class CloseButton extends JButton implements ActionListener { private final ClosableTabComponent tabComponent; - protected TabButton(final ClosableTabComponent tabComponent) { + protected CloseButton(final ClosableTabComponent tabComponent) { this.tabComponent = tabComponent; putClientProperty(DarkButtonUI.KEY_NO_BACKGROUND, true); putClientProperty(DarkButtonUI.KEY_NO_BORDERLESS_OVERWRITE, true); putClientProperty(DarkButtonUI.KEY_VARIANT, DarkButtonUI.VARIANT_BORDERLESS_RECTANGULAR); + putClientProperty(DarkButtonUI.KEY_THIN, true); setOpaque(false); setRolloverEnabled(true); setBorderPainted(false); setIcon(UIManager.getIcon("TabbedPane.tabCloseIcon")); + setDisabledIcon(UIManager.getIcon("TabbedPane.tabCloseDisabledIcon")); setRolloverIcon(UIManager.getIcon("TabbedPane.tabCloseHoverIcon")); addActionListener(this); MouseListener mouseListener = new MouseAdapter() { diff --git a/core/src/main/java/com/github/weisj/darklaf/components/ClosableTabbedPane.java b/core/src/main/java/com/github/weisj/darklaf/components/ClosableTabbedPane.java index df01674d..4f33fe2f 100644 --- a/core/src/main/java/com/github/weisj/darklaf/components/ClosableTabbedPane.java +++ b/core/src/main/java/com/github/weisj/darklaf/components/ClosableTabbedPane.java @@ -44,26 +44,41 @@ public class ClosableTabbedPane extends JTabbedPane { } super.insertTab(title, icon, component, tip, index); setTabComponentAt(indexOfComponent(component), new ClosableTabComponent(this)); - notifyTabListeners(new TabEvent(this, TabEvent.TAB_OPENED, "tabOpened", index)); + notifyTabListeners(new TabEvent(this, TabEvent.Type.TAB_OPENED, "tabOpened", index, component)); } @Override public void removeTabAt(final int index) { checkIndex(index); + Component c = getComponentAt(index); if (notifyVetoableChangeListeners(new TabPropertyChangeEvent(this, "tabClosed", getComponentAt(index), null, index))) { return; } - notifyTabListeners(new TabEvent(this, TabEvent.TAB_CLOSED, "tabClosed", index)); + notifyTabListeners(new TabEvent(this, TabEvent.Type.TAB_CLOSING, "tabClosing", index, c)); super.removeTabAt(index); + notifyTabListeners(new TabEvent(this, TabEvent.Type.TAB_CLOSED, "tabClosed", index, c)); } @Override public void setTabComponentAt(final int index, final Component component) { if (component instanceof ClosableTabComponent) { ((ClosableTabComponent) component).setTabbedPane(this); + super.setTabComponentAt(index, component); + } else { + super.setTabComponentAt(index, new ClosableTabComponent(this, component)); } - super.setTabComponentAt(index, component); + } + + @Override + public Component getTabComponentAt(final int index) { + Component c = super.getTabComponentAt(index); + if (c instanceof ClosableTabComponent) { + if (((ClosableTabComponent) c).hasCustomTabComponent()) { + return ((ClosableTabComponent) c).getTabComponent(); + } + } + return c; } private void checkIndex(final int index) { diff --git a/core/src/main/java/com/github/weisj/darklaf/components/TabEvent.java b/core/src/main/java/com/github/weisj/darklaf/components/TabEvent.java index 9a4d0960..6a3d2ebf 100644 --- a/core/src/main/java/com/github/weisj/darklaf/components/TabEvent.java +++ b/core/src/main/java/com/github/weisj/darklaf/components/TabEvent.java @@ -24,6 +24,7 @@ */ package com.github.weisj.darklaf.components; +import java.awt.*; import java.awt.event.ActionEvent; /** @@ -33,14 +34,42 @@ public class TabEvent extends ActionEvent { public static final int TAB_OPENED = 0; public static final int TAB_CLOSED = 1; + public static final int TAB_CLOSING = 2; + private final Type type; private final int tabIndex; + private final Component component; - public TabEvent(final Object source, final int id, final String command, final int tabIndex) { - super(source, id, command); + public TabEvent(final Object source, final Type type, final String command, final int tabIndex, final Component c) { + super(source, type.ordinal(), command); + this.type = type; this.tabIndex = tabIndex; + this.component = c; + } + + public Component getComponent() { + return component; } public int getTabIndex() { return tabIndex; } + + public Type getType() { + return type; + } + + @Override + public String toString() { + return "TabEvent{" + + "type=" + type + + ", tabIndex=" + tabIndex + + ", component=" + component + + '}'; + } + + public enum Type { + TAB_OPENED, + TAB_CLOSED, + TAB_CLOSING + } } diff --git a/core/src/main/java/com/github/weisj/darklaf/components/loading/LoadingIndicator.java b/core/src/main/java/com/github/weisj/darklaf/components/loading/LoadingIndicator.java index 73e83779..366f03d7 100644 --- a/core/src/main/java/com/github/weisj/darklaf/components/loading/LoadingIndicator.java +++ b/core/src/main/java/com/github/weisj/darklaf/components/loading/LoadingIndicator.java @@ -37,8 +37,8 @@ import com.github.weisj.darklaf.util.DarkUIUtil; */ public class LoadingIndicator extends JLabel { - private final RotatableIcon loadIcon = new RotatableIcon(DarkUIUtil.ICON_LOADER.getIcon("progress/step_working.svg")); - private final Icon pausedIcon = DarkUIUtil.ICON_LOADER.getIcon("progress/step_passive.svg"); + private final RotatableIcon loadIcon = new RotatableIcon(DarkUIUtil.ICON_LOADER.getIcon("progress/stepWorking.svg")); + private final Icon pausedIcon = DarkUIUtil.ICON_LOADER.getIcon("progress/stepPassive.svg"); private final Icon emptyIcon = EmptyIcon.create(loadIcon.getIconWidth(), loadIcon.getIconHeight()); private final TwoIcon displayIcon = new TwoIcon(loadIcon, null); private final RotatableIconAnimator animator = new RotatableIconAnimator(8, loadIcon, this); diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_0.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker0.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_0.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker0.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_0Disabled.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker0Disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_0Disabled.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker0Disabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_1.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker1.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_1.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker1.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_1Disabled.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker1Disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_1Disabled.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker1Disabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_2.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker2.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_2.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker2.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_2Disabled.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker2Disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_2Disabled.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker2Disabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_3.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker3.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_3.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker3.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_3Disabled.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker3Disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_3Disabled.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker3Disabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_4.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker4.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_4.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker4.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_4Disabled.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker4Disabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker_4Disabled.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/indicator/speaker4Disabled.svg 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 deleted file mode 100644 index 5d21166a..00000000 --- a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/clear.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - 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 62127474..462ec8d3 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 @@ - - + + + d="M7.995 8.705l-3.14 3.15-.708-.708 3.148-3.142-3.148-3.148.707-.707 3.148 3.148 3.142-3.148.707.707-3.149 3.141 3.15 3.149-.708.707-3.15-3.149z"/> diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeDisabled.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeDisabled.svg new file mode 100644 index 00000000..fe1050b3 --- /dev/null +++ b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeDisabled.svg @@ -0,0 +1,10 @@ + + + + + + + + + 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 7a30e100..b7f10e0a 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,10 @@ - + - - + + + d="M8 14.25a6.25 6.25 0 1 0 0-12.5 6.25 6.25 0 0 0 0 12.5zM4.54 5.46l.92-.92L8 7.083l2.54-2.541.92.919L8.92 8l2.54 2.54-.92.92L8 8.92l-2.54 2.54-.92-.92L7.08 8 4.54 5.46z"/> - diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/search_disabled.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/navigation/searchDisabled.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/navigation/search_disabled.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/navigation/searchDisabled.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/progress/step_passive.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/progress/stepPassive.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/progress/step_passive.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/progress/stepPassive.svg diff --git a/core/src/main/resources/com/github/weisj/darklaf/icons/progress/step_working.svg b/core/src/main/resources/com/github/weisj/darklaf/icons/progress/stepWorking.svg similarity index 100% rename from core/src/main/resources/com/github/weisj/darklaf/icons/progress/step_working.svg rename to core/src/main/resources/com/github/weisj/darklaf/icons/progress/stepWorking.svg 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 2d0646df..35ec300d 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 @@ -55,12 +55,12 @@ Icons.checkmark.color = %textIconEnabled 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.close.opacity = %navigationIconOpacity +Icons.closeDisabled.color = %menuIconDisabled +Icons.closeDisabled.opacity = %menuIconOpacity +Icons.closeHovered.color = %menuIconEnabled +Icons.closeHovered.opacity = %navigationIconOpacity Icons.collapse.color = %menuIconEnabled Icons.collapse.opacity = %menuIconOpacity Icons.divider.color = %borderSecondary diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/slider.properties b/core/src/main/resources/com/github/weisj/darklaf/properties/ui/slider.properties index 65e78555..544df85d 100644 --- a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/slider.properties +++ b/core/src/main/resources/com/github/weisj/darklaf/properties/ui/slider.properties @@ -64,13 +64,13 @@ Slider.volume.enabledThumb.icon = control/volumeSlider.svg[themed](20,23) Slider.volume.disabledThumb.icon = control/volumeSliderDisabled.svg[themed](20,23) Slider.volume.focusedThumb.icon = control/volumeSliderFocused.svg[themed](20,23) -Slider.volume.enabled_level_0.icon = indicator/speaker_0.svg[themed] -Slider.volume.enabled_level_1.icon = indicator/speaker_1.svg[themed] -Slider.volume.enabled_level_2.icon = indicator/speaker_2.svg[themed] -Slider.volume.enabled_level_3.icon = indicator/speaker_3.svg[themed] -Slider.volume.enabled_level_4.icon = indicator/speaker_4.svg[themed] -Slider.volume.disabled_level_0.icon = indicator/speaker_0Disabled.svg[themed] -Slider.volume.disabled_level_1.icon = indicator/speaker_1Disabled.svg[themed] -Slider.volume.disabled_level_2.icon = indicator/speaker_2Disabled.svg[themed] -Slider.volume.disabled_level_3.icon = indicator/speaker_3Disabled.svg[themed] -Slider.volume.disabled_level_4.icon = indicator/speaker_4Disabled.svg[themed] +Slider.volume.enabled_level_0.icon = indicator/speaker0.svg[themed] +Slider.volume.enabled_level_1.icon = indicator/speaker1.svg[themed] +Slider.volume.enabled_level_2.icon = indicator/speaker2.svg[themed] +Slider.volume.enabled_level_3.icon = indicator/speaker3.svg[themed] +Slider.volume.enabled_level_4.icon = indicator/speaker4.svg[themed] +Slider.volume.disabled_level_0.icon = indicator/speaker0Disabled.svg[themed] +Slider.volume.disabled_level_1.icon = indicator/speaker1Disabled.svg[themed] +Slider.volume.disabled_level_2.icon = indicator/speaker2Disabled.svg[themed] +Slider.volume.disabled_level_3.icon = indicator/speaker3Disabled.svg[themed] +Slider.volume.disabled_level_4.icon = indicator/speaker4Disabled.svg[themed] diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/tabbedPane.properties b/core/src/main/resources/com/github/weisj/darklaf/properties/ui/tabbedPane.properties index 12e02f73..4c3c21a6 100644 --- a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/tabbedPane.properties +++ b/core/src/main/resources/com/github/weisj/darklaf/properties/ui/tabbedPane.properties @@ -25,7 +25,7 @@ # suppress inspection "UnusedProperty" for whole file # TabbedPaneUI = com.github.weisj.darklaf.ui.tabbedpane.DarkTabbedPaneUI -TabbedPane.tabInsets = 5,7,5,7 +TabbedPane.tabInsets = 5,3,5,3 TabbedPane.tabRunOverlay = 0 TabbedPane.border = com.github.weisj.darklaf.ui.tabbedpane.DarkTabbedPaneBorder @@ -62,4 +62,5 @@ TabbedPane.moreTabsButton.pad = 2 TabbedPane.newTab.icon = navigation/add.svg[themed] TabbedPane.moreTabs.icon = navigation/moreTabs.svg[themed] TabbedPane.tabCloseIcon = navigation/close.svg[themed] +TabbedPane.tabCloseDisabledIcon = navigation/closeDisabled.svg[themed] TabbedPane.tabCloseHoverIcon = navigation/closeHovered.svg[themed] diff --git a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/text.properties b/core/src/main/resources/com/github/weisj/darklaf/properties/ui/text.properties index 8eb34ba9..89f17839 100644 --- a/core/src/main/resources/com/github/weisj/darklaf/properties/ui/text.properties +++ b/core/src/main/resources/com/github/weisj/darklaf/properties/ui/text.properties @@ -111,7 +111,7 @@ PasswordField.showPressed.icon = misc/eyeHovered.svg[themed] TextField.search.searchWithHistory.icon = navigation/searchWithHistory.svg[themed] TextField.search.searchWithHistory.disabled.icon = navigation/searchWithHistory_disabled.svg[themed] TextField.search.search.icon = navigation/search.svg[themed] -TextField.search.search.disabled.icon = navigation/search_disabled.svg[themed] +TextField.search.search.disabled.icon = navigation/searchDisabled.svg[themed] TextField.search.clear.icon = navigation/close.svg[themed] TextField.search.clearHover.icon = navigation/closeHovered.svg[themed] TextComponent.cut.icon = menu/cut.svg[themed] diff --git 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 index 3df113a1..1951e0ba 100644 --- 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 @@ -25,6 +25,7 @@ # suppress inspection "UnusedProperty" for whole file # %menuIconOpacity = 100 +%navigationIconOpacity = 100 %fileIconOpacity = 100 %menuIconEnabled = FFFFFF diff --git 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 index 36733376..cd69bf5c 100644 --- 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 @@ -25,6 +25,7 @@ # suppress inspection "UnusedProperty" for whole file # %menuIconOpacity = 100 +%navigationIconOpacity = 100 %fileIconOpacity = 100 %menuIconEnabled = 000000 diff --git 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 index c26e7f86..bba31fc2 100644 --- 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 @@ -25,6 +25,7 @@ # suppress inspection "UnusedProperty" for whole file # %menuIconOpacity = 80 +%navigationIconOpacity = 50 %fileIconOpacity = 80 %menuIconEnabled = AFB1B3 diff --git 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 index 2567118f..852770b5 100644 --- 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 @@ -25,6 +25,7 @@ # suppress inspection "UnusedProperty" for whole file # %menuIconOpacity = 80 +%navigationIconOpacity = 50 %fileIconOpacity = 80 %menuIconEnabled = 6E6E6E diff --git 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 index ce51a331..91de72ff 100644 --- 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 @@ -25,6 +25,7 @@ # suppress inspection "UnusedProperty" for whole file # %menuIconOpacity = 80 +%navigationIconOpacity = 50 %fileIconOpacity = 80 %menuIconEnabled = AFB1B3 diff --git 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 index 34a67756..72096d0c 100644 --- 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 @@ -25,6 +25,7 @@ # suppress inspection "UnusedProperty" for whole file # %menuIconOpacity = 80 +%navigationIconOpacity = 50 %fileIconOpacity = 80 %menuIconEnabled = 93A1A1 diff --git 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 index 686e8898..127eeee3 100644 --- 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 @@ -25,6 +25,7 @@ # suppress inspection "UnusedProperty" for whole file # %menuIconOpacity = 80 +%navigationIconOpacity = 50 %fileIconOpacity = 80 %menuIconEnabled = 586E75