Icon folders were named the same thing in multiple modules.

andrewauclair · Dec 12, 2023 · b4f0e51 · b4f0e51
1 parent 56d963f
commit b4f0e51
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 6 deletions.
diff --git a/docking-api/resources/icons/close-16.png → docking-api/resources/api_icons/close-16.png b/docking-api/resources/icons/close-16.png → docking-api/resources/api_icons/close-16.png
diff --git a/docking-api/resources/icons/close.png → docking-api/resources/api_icons/close.png b/docking-api/resources/icons/close.png → docking-api/resources/api_icons/close.png
diff --git a/docking-api/resources/icons/settings.png → docking-api/resources/api_icons/settings.png b/docking-api/resources/icons/settings.png → docking-api/resources/api_icons/settings.png
diff --git a/docking-api/src/ModernDocking/internal/DockedTabbedPanel.java b/docking-api/src/ModernDocking/internal/DockedTabbedPanel.java
@@ -64,7 +64,7 @@ public class DockedTabbedPanel extends DockingPanel implements ChangeListener {
 	 */
 	private int selectedTab = -1;
 
-	private static Icon settingsIcon = new ImageIcon(Objects.requireNonNull(DockedTabbedPanel.class.getResource("/icons/settings.png")));
+	private static Icon settingsIcon = new ImageIcon(Objects.requireNonNull(DockedTabbedPanel.class.getResource("/api_icons/settings.png")));
 
 	/**
 	 * Create a new instance of DockedTabbedPanel

diff --git a/docking-api/src/ModernDocking/ui/DefaultHeaderUI.java b/docking-api/src/ModernDocking/ui/DefaultHeaderUI.java
@@ -118,8 +118,8 @@ protected void init() {
 		initialized = true;
 
 		try {
-			settings.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/settings.png"))));
-			close.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/icons/close.png"))));
+			settings.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/api_icons/settings.png"))));
+			close.setIcon(new ImageIcon(Objects.requireNonNull(getClass().getResource("/api_icons/close.png"))));
 		}
 		catch (Exception ignored) {
 		}

diff --git a/docking-ui/resources/icons/close.svg → docking-ui/resources/ui_ext_icons/close.svg b/docking-ui/resources/icons/close.svg → docking-ui/resources/ui_ext_icons/close.svg
diff --git a/docking-ui/resources/icons/settings.svg → ...ng-ui/resources/ui_ext_icons/settings.svg b/docking-ui/resources/icons/settings.svg → ...ng-ui/resources/ui_ext_icons/settings.svg
diff --git a/docking-ui/src/ModernDocking/ext/ui/DockingUI.java b/docking-ui/src/ModernDocking/ext/ui/DockingUI.java
@@ -42,7 +42,7 @@ public static void initialize() {
 
         DockingInternal.createHeaderUI = FlatLafHeaderUI::new;
 
-        FlatSVGIcon settingsIcon = new FlatSVGIcon("icons/settings.svg");
+        FlatSVGIcon settingsIcon = new FlatSVGIcon("ui_ext_icons/settings.svg");
 
         DockedTabbedPanel.setSettingsIcon(settingsIcon);
 

diff --git a/docking-ui/src/ModernDocking/ext/ui/FlatLafHeaderUI.java b/docking-ui/src/ModernDocking/ext/ui/FlatLafHeaderUI.java
@@ -33,12 +33,12 @@ public class FlatLafHeaderUI extends DefaultHeaderUI implements DockingHeaderUI
 	/**
 	 * Settings icon for the header. Uses an SVG icon for sharper icons
 	 */
-	private final FlatSVGIcon settingsIcon = new FlatSVGIcon("icons/settings.svg");
+	private final FlatSVGIcon settingsIcon = new FlatSVGIcon("ui_ext_icons/settings.svg");
 
 	/**
 	 * Close icon for the header. Uses an SVG icon for sharper icons
 	 */
-	private final FlatSVGIcon closeIcon = new FlatSVGIcon("icons/close.svg");
+	private final FlatSVGIcon closeIcon = new FlatSVGIcon("ui_ext_icons/close.svg");
 
 	/**
 	 * Construct a new FlatLafHeaderUI