View icons from jars in AllIcons.

Signed-off-by: weisj <weisj@arcor.de>

core/src/test/java/UIDemo.java

@@ -19,7 +19,6 @@ import java.util.logging.Logger;
 public final class UIDemo {
 
     public static void main(final String[] args) {
-        System.setProperty("org.apache.batik.warn_destination", "false");
         SwingUtilities.invokeLater(
                 () -> {
                     LafManager.install();

core/src/test/java/icon/AllIcons.java

@@ -35,15 +35,22 @@ import javax.swing.*;
 import javax.swing.event.ListDataListener;
 import java.awt.*;
 import java.io.File;
+import java.io.IOException;
+import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.ArrayList;
+import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
+import java.util.*;
+import java.util.stream.Stream;
 
 public class AllIcons {
 
     private static String[] FOLDERS = new String[]{
-            "control", "dialog", "files", "indicator", "menu", "misc", "navigation", "window",
+        "icons/control", "icons/dialog", "icons/files", "icons/indicator", "icons/menu", "icons/misc",
+        "icons/navigation", "platform/windows/icons/window", "platform/windows/icons"
     };
 
     public static void main(final String[] args) {
@@ -79,38 +86,51 @@ public class AllIcons {
                 frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
                 frame.setLocationRelativeTo(null);
                 frame.setVisible(true);
-            } catch (URISyntaxException e) {
+            } catch (URISyntaxException | IOException e) {
                 e.printStackTrace();
             }
         });
     }
 
 
-    private static List<Pair<String, Icon>> loadIcons() throws URISyntaxException {
+    private static List<Pair<String, Icon>> loadIcons() throws URISyntaxException, IOException {
         List<Pair<String, Icon>> list = new ArrayList<>();
         for (String folder : FOLDERS) {
-            File[] files = getResourceFolderFiles("icons/" + folder, DarkLaf.class);
-            for (File f : files) {
-                if (f.getName().endsWith(".svg")) {
+            Pair<Stream<Path>, Optional<FileSystem>> files = walk(folder, DarkLaf.class);
+            try (FileSystem fs = files.getSecond().isPresent() ? files.getSecond().get() : null) {
+                files.getFirst().forEach(p -> {
+                    if (p.getFileName().toString().endsWith(".svg")) {
                         int SIZE = 30;
-                    ThemedSVGIcon icon = (ThemedSVGIcon) IconLoader.get().loadSVGIcon(folder + "/" + f.getName(),
+                        ThemedSVGIcon icon = (ThemedSVGIcon) IconLoader.get(DarkLaf.class)
+                                                                       .loadSVGIcon(folder + "/" + p.getFileName(),
                                                                                     SIZE, SIZE, true);
                         SVGIcon svgIcon = icon.getSVGIcon();
                         int autosize = svgIcon.getAutosize();
                         svgIcon.setAutosize(SVGIcon.AUTOSIZE_NONE);
-                    icon.setDisplaySize(svgIcon.getIconWidth() * 2, svgIcon.getIconHeight() * 2);
+                        int width = Math.min(svgIcon.getIconWidth() * 2, 100);
+                        int height = (int) (((double) width / svgIcon.getIconWidth()) * svgIcon.getIconHeight());
+                        icon.setDisplaySize(width, height);
                         svgIcon.setAutosize(autosize);
-                    list.add(new Pair<>(f.getName(), icon));
+                        list.add(new Pair<>(p.getFileName().toString(), icon));
                     }
+                });
             }
         }
         return list;
     }
 
-    private static File[] getResourceFolderFiles(final String folder,
-                                                 final Class<?> clazz) throws URISyntaxException {
-        URL url = clazz.getResource(folder);
-        return new File(url.toURI()).listFiles();
+    public static Pair<Stream<Path>, Optional<FileSystem>> walk(final String path, final Class<?> clazz)
+        throws URISyntaxException, IOException {
+        URI uri = clazz.getResource(path).toURI();
+        if ("jar".equals(uri.getScheme())) {
+            FileSystem fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap());
+            Path resourcePath = fileSystem.getPath("com/github/weisj/darklaf/" + path);
+            // Get all contents of a resource (skip resource itself), if entry is a directory remove trailing /
+            return new Pair<>(Files.walk(resourcePath, 1), Optional.of(fileSystem));
+        } else {
+            return new Pair<>(Arrays.stream(Optional.ofNullable(new File(uri).listFiles())
+                                                    .orElse(new File[0])).map(File::toPath), Optional.empty());
+        }
     }
 
     private static final class IconListRenderer extends JLabel implements ListCellRenderer<Pair<String, Icon>> {

windows/src/main/resources/com/github/weisj/darklaf/platform/windows/icons/duke.svg

@@ -3,8 +3,9 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" x="0px"
      y="0px"
-     width="225.938px" height="407.407px" viewBox="0 0 225.938 407.407" enable-background="new 0 0 225.938 407.407"
+     width="16px" height="16px" viewBox="-2 0 14 16" enable-background="new 0 0 225.938 407.407"
      xml:space="preserve">
+    <g transform="scale(0.04)">
 <path fill-rule="evenodd" clip-rule="evenodd" d="M48.859,43.518c8.424,17.64,2.736,140.832-7.128,184.032
 	c-9.864,43.272-19.728,98.28-22.032,144.576c-1.008,19.728,2.016,27.504,14.904,27.504c22.752,0,51.624-47.952,87.84-46.872
 	c36.288,1.08,47.808,55.008,64.8,54.648c16.992-0.36,30.672-6.264,30.816-58.752C218.563,191.981,87.235,64.973,48.859,43.518
@@ -48,4 +49,5 @@
 		c-15.87,3.854-33.393-2.257-39.096-18.576c-2.912-8.332-2.37-16.879,2.637-24.198c4.223-6.171,11.033-11,17.779-14.066
 		c13.924-6.326,33.832-7.029,43.531,7.077C138.744,165.348,139.387,171.641,139.162,177.941"/>
 </g>
+    </g>
 </svg>

windows/src/main/resources/com/github/weisj/darklaf/platform/windows/windows_decorations.properties

@@ -21,15 +21,15 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-TitlePane.minimize.icon                        = icons/windows/minimize.svg[themed]
-TitlePane.minimizeInactive.icon                = icons/windows/minimizeInactive.svg[themed]
-TitlePane.maximize.icon                        = icons/windows/maximize.svg[themed]
-TitlePane.maximizeInactive.icon                = icons/windows/maximizeInactive.svg[themed]
-TitlePane.restore.icon                         = icons/windows/restore.svg[themed]
-TitlePane.restoreInactive.icon                 = icons/windows/restoreInactive.svg[themed]
-TitlePane.close.icon                           = icons/windows/closeActive.svg[themed]
-TitlePane.closeInactive.icon                   = icons/windows/closeInactive.svg[themed]
-TitlePane.closeHover.icon                      = icons/windows/closeHover.svg[themed]
+TitlePane.minimize.icon                        = icons/window/minimize.svg[themed]
+TitlePane.minimizeInactive.icon                = icons/window/minimizeInactive.svg[themed]
+TitlePane.maximize.icon                        = icons/window/maximize.svg[themed]
+TitlePane.maximizeInactive.icon                = icons/window/maximizeInactive.svg[themed]
+TitlePane.restore.icon                         = icons/window/restore.svg[themed]
+TitlePane.restoreInactive.icon                 = icons/window/restoreInactive.svg[themed]
+TitlePane.close.icon                           = icons/window/closeActive.svg[themed]
+TitlePane.closeInactive.icon                   = icons/window/closeInactive.svg[themed]
+TitlePane.closeHover.icon                      = icons/window/closeHover.svg[themed]
 
 TitlePane.close.clickColor                     = F1707A
 TitlePane.close.rollOverColor                  = E81123