From 3de329a332fd2be6498dcaeef386666843bd376a Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sat, 16 Nov 2019 22:27:54 +0100 Subject: [PATCH] moved ScaledSVGIcon.java from demo to flatlaf-extras and renamed to FlatSVGIcon.java --- flatlaf-demo/build.gradle.kts | 7 +++--- .../com/formdev/flatlaf/demo/DemoFrame.java | 25 ++++++++++--------- flatlaf-extras/build.gradle.kts | 5 ++-- .../formdev/flatlaf/extras/FlatSVGIcon.java | 8 +++--- 4 files changed, 24 insertions(+), 21 deletions(-) rename flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ScaledSVGIcon.java => flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java (94%) diff --git a/flatlaf-demo/build.gradle.kts b/flatlaf-demo/build.gradle.kts index 99f3cd9c..20308a34 100644 --- a/flatlaf-demo/build.gradle.kts +++ b/flatlaf-demo/build.gradle.kts @@ -23,19 +23,20 @@ plugins { dependencies { implementation( project( ":flatlaf-core" ) ) + implementation( project( ":flatlaf-extras" ) ) implementation( "com.miglayout:miglayout-swing:5.2" ) implementation( "com.jgoodies:jgoodies-forms:1.9.0" ) - implementation( "com.formdev:svgSalamander:1.1.2.1" ) } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } tasks { jar { dependsOn( ":flatlaf-core:jar" ) + dependsOn( ":flatlaf-extras:jar" ) manifest { attributes( "Main-Class" to "com.formdev.flatlaf.demo.FlatLafDemo" ) diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java index 56724428..673dcb64 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java @@ -20,6 +20,7 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; import com.formdev.flatlaf.demo.intellijthemes.*; +import com.formdev.flatlaf.extras.FlatSVGIcon; import net.miginfocom.swing.*; /** @@ -273,20 +274,20 @@ class DemoFrame buttonGroup1.add(radioButtonMenuItem3); // JFormDesigner - End of component initialization //GEN-END:initComponents - undoMenuItem.setIcon( new ScaledSVGIcon( "icons/undo.svg" ) ); - redoMenuItem.setIcon( new ScaledSVGIcon( "icons/redo.svg" ) ); + undoMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/undo.svg" ) ); + redoMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/redo.svg" ) ); - cutMenuItem.setIcon( new ScaledSVGIcon( "icons/menu-cut.svg" ) ); - copyMenuItem.setIcon( new ScaledSVGIcon( "icons/copy.svg" ) ); - pasteMenuItem.setIcon( new ScaledSVGIcon( "icons/menu-paste.svg" ) ); + cutMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/menu-cut.svg" ) ); + copyMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/copy.svg" ) ); + pasteMenuItem.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/menu-paste.svg" ) ); - backButton.setIcon( new ScaledSVGIcon( "icons/back.svg" ) ); - forwardButton.setIcon( new ScaledSVGIcon( "icons/forward.svg" ) ); - cutButton.setIcon( new ScaledSVGIcon( "icons/menu-cut.svg" ) ); - copyButton.setIcon( new ScaledSVGIcon( "icons/copy.svg" ) ); - pasteButton.setIcon( new ScaledSVGIcon( "icons/menu-paste.svg" ) ); - refreshButton.setIcon( new ScaledSVGIcon( "icons/refresh.svg" ) ); - showToggleButton.setIcon( new ScaledSVGIcon( "icons/show.svg" ) ); + backButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/back.svg" ) ); + forwardButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/forward.svg" ) ); + cutButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/menu-cut.svg" ) ); + copyButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/copy.svg" ) ); + pasteButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/menu-paste.svg" ) ); + refreshButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/refresh.svg" ) ); + showToggleButton.setIcon( new FlatSVGIcon( "com/formdev/flatlaf/demo/icons/show.svg" ) ); } // JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables diff --git a/flatlaf-extras/build.gradle.kts b/flatlaf-extras/build.gradle.kts index 00346352..4e3e4025 100644 --- a/flatlaf-extras/build.gradle.kts +++ b/flatlaf-extras/build.gradle.kts @@ -22,9 +22,10 @@ plugins { dependencies { implementation( project( ":flatlaf-core" ) ) + implementation( "com.formdev:svgSalamander:1.1.2.1" ) } java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 } diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ScaledSVGIcon.java b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java similarity index 94% rename from flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ScaledSVGIcon.java rename to flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java index c05c502e..8fb2f842 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ScaledSVGIcon.java +++ b/flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatSVGIcon.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.formdev.flatlaf.demo; +package com.formdev.flatlaf.extras; import java.awt.Component; import java.awt.Graphics; @@ -34,14 +34,14 @@ import com.kitfox.svg.app.beans.SVGIcon; /** * @author Karl Tauber */ -public class ScaledSVGIcon +public class FlatSVGIcon extends ImageIcon { private final String name; private final SVGIcon svgIcon; private boolean dark; - public ScaledSVGIcon( String name ) { + public FlatSVGIcon( String name ) { this.name = name; svgIcon = new SVGIcon(); @@ -69,7 +69,7 @@ public class ScaledSVGIcon int dotIndex = name.lastIndexOf( '.' ); name = name.substring( 0, dotIndex ) + "_dark" + name.substring( dotIndex ); } - return getClass().getResource( name ); + return FlatSVGIcon.class.getClassLoader().getResource( name ); } @Override