Improved layout and icon of ClosableTabbedPane.

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() {

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) {

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
+    }
 }

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);

core/src/main/resources/com/github/weisj/darklaf/icons/navigation/clear.svg

@@ -1,10 +0,0 @@
-<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" 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)"
-          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>

core/src/main/resources/com/github/weisj/darklaf/icons/navigation/close.svg

@@ -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" opacity="Icons.close.opacity">
-            <stop offset="0" stop-color="#7F8B91" stop-opacity=".8"/>
-            <stop offset="1" stop-color="#7F8B91" stop-opacity=".8"/>
+            <stop offset="0" stop-color="#7F8B91" stop-opacity=".5"/>
+            <stop offset="1" stop-color="#7F8B91" stop-opacity=".5"/>
         </linearGradient>
     </defs>
     <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"/>
+          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"/>
 </svg>

core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeDisabled.svg

@@ -0,0 +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.closeDisabled.color" opacity="Icons.closeDisabled.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.closeDisabled.color)"
+          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"/>
+</svg>

core/src/main/resources/com/github/weisj/darklaf/icons/navigation/closeHovered.svg

@@ -1,11 +1,10 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="16" height="16">
     <defs id="colors">
         <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"/>
+            <stop offset="0" stop-color="#7F8B91" stop-opacity=".5"/>
+            <stop offset="1" stop-color="#7F8B91" stop-opacity=".5"/>
         </linearGradient>
     </defs>
     <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"/>
+          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"/>
 </svg>
-

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

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]

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]

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]

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

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

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

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

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

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

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