mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2026-02-11 06:27:13 -06:00
Merge pull request #303 from xDUDSSx/extras-svg-icon-filter
FlatSVGIcon color filters
This commit is contained in:
@@ -18,8 +18,13 @@ package com.formdev.flatlaf.demo.extras;
|
||||
|
||||
import javax.swing.*;
|
||||
import com.formdev.flatlaf.extras.*;
|
||||
import com.formdev.flatlaf.extras.FlatSVGIcon.ColorFilter;
|
||||
import com.formdev.flatlaf.extras.components.FlatTriStateCheckBox;
|
||||
import com.formdev.flatlaf.util.HSLColor;
|
||||
import net.miginfocom.swing.*;
|
||||
import java.awt.*;
|
||||
import java.awt.event.HierarchyEvent;
|
||||
import java.util.function.Function;
|
||||
|
||||
/**
|
||||
* @author Karl Tauber
|
||||
@@ -27,6 +32,9 @@ import net.miginfocom.swing.*;
|
||||
public class ExtrasPanel
|
||||
extends JPanel
|
||||
{
|
||||
private Timer rainbowIconTimer;
|
||||
private int rainbowCounter = 0;
|
||||
|
||||
public ExtrasPanel() {
|
||||
initComponents();
|
||||
|
||||
@@ -50,6 +58,34 @@ public class ExtrasPanel
|
||||
addSVGIcon( "errorDialog.svg" );
|
||||
addSVGIcon( "informationDialog.svg" );
|
||||
addSVGIcon( "warningDialog.svg" );
|
||||
|
||||
initRainbowIcon();
|
||||
}
|
||||
|
||||
private void initRainbowIcon() {
|
||||
FlatSVGIcon icon = new FlatSVGIcon( "com/formdev/flatlaf/demo/extras/svg/informationDialog.svg" );
|
||||
icon.setColorFilter( new ColorFilter( color -> {
|
||||
rainbowCounter += 1;
|
||||
rainbowCounter %= 255;
|
||||
return Color.getHSBColor( rainbowCounter / 255f, 1, 1 );
|
||||
} ) );
|
||||
rainbowIcon.setIcon( icon );
|
||||
|
||||
rainbowIconTimer = new Timer( 30, e -> {
|
||||
rainbowIcon.repaint();
|
||||
} );
|
||||
|
||||
// start rainbow timer only if panel is shown ("Extras" tab is active)
|
||||
addHierarchyListener( e -> {
|
||||
if( e.getID() == HierarchyEvent.HIERARCHY_CHANGED &&
|
||||
(e.getChangeFlags() & HierarchyEvent.SHOWING_CHANGED) != 0 )
|
||||
{
|
||||
if( isShowing() )
|
||||
rainbowIconTimer.start();
|
||||
else
|
||||
rainbowIconTimer.stop();
|
||||
}
|
||||
} );
|
||||
}
|
||||
|
||||
private void addSVGIcon( String name ) {
|
||||
@@ -60,6 +96,36 @@ public class ExtrasPanel
|
||||
triStateLabel1.setText( triStateCheckBox1.getState().toString() );
|
||||
}
|
||||
|
||||
private void redChanged() {
|
||||
brighterToggleButton.setSelected( false );
|
||||
|
||||
Function<Color, Color> mapper = null;
|
||||
if( redToggleButton.isSelected() ) {
|
||||
float[] redHSL = HSLColor.fromRGB( Color.red );
|
||||
mapper = color -> {
|
||||
float[] hsl = HSLColor.fromRGB( color );
|
||||
return HSLColor.toRGB( redHSL[0], 70, hsl[2] );
|
||||
};
|
||||
}
|
||||
FlatSVGIcon.ColorFilter.getInstance().setMapper( mapper );
|
||||
|
||||
// repaint whole application window because global color filter also affects
|
||||
// icons in menubar, toolbar, etc.
|
||||
SwingUtilities.windowForComponent( this ).repaint();
|
||||
}
|
||||
|
||||
private void brighterChanged() {
|
||||
redToggleButton.setSelected( false );
|
||||
|
||||
FlatSVGIcon.ColorFilter.getInstance().setMapper( brighterToggleButton.isSelected()
|
||||
? color -> color.brighter().brighter()
|
||||
: null );
|
||||
|
||||
// repaint whole application window because global color filter also affects
|
||||
// icons in menubar, toolbar, etc.
|
||||
SwingUtilities.windowForComponent( this ).repaint();
|
||||
}
|
||||
|
||||
private void initComponents() {
|
||||
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
|
||||
label4 = new JLabel();
|
||||
@@ -69,6 +135,13 @@ public class ExtrasPanel
|
||||
label2 = new JLabel();
|
||||
svgIconsPanel = new JPanel();
|
||||
label3 = new JLabel();
|
||||
separator1 = new JSeparator();
|
||||
label5 = new JLabel();
|
||||
label6 = new JLabel();
|
||||
rainbowIcon = new JLabel();
|
||||
label7 = new JLabel();
|
||||
redToggleButton = new JToggleButton();
|
||||
brighterToggleButton = new JToggleButton();
|
||||
|
||||
//======== this ========
|
||||
setLayout(new MigLayout(
|
||||
@@ -81,6 +154,10 @@ public class ExtrasPanel
|
||||
"[]para" +
|
||||
"[]" +
|
||||
"[]" +
|
||||
"[]" +
|
||||
"[]" +
|
||||
"[]" +
|
||||
"[]" +
|
||||
"[]"));
|
||||
|
||||
//---- label4 ----
|
||||
@@ -119,6 +196,30 @@ public class ExtrasPanel
|
||||
//---- label3 ----
|
||||
label3.setText("The icons may change colors when switching to another theme.");
|
||||
add(label3, "cell 1 3 2 1");
|
||||
add(separator1, "cell 1 4 2 1,growx");
|
||||
|
||||
//---- label5 ----
|
||||
label5.setText("Color filters can be also applied to icons. Globally or for each instance.");
|
||||
add(label5, "cell 1 5 2 1");
|
||||
|
||||
//---- label6 ----
|
||||
label6.setText("Rainbow color filter");
|
||||
add(label6, "cell 1 6 2 1");
|
||||
add(rainbowIcon, "cell 1 6 2 1");
|
||||
|
||||
//---- label7 ----
|
||||
label7.setText("Global icon color filter");
|
||||
add(label7, "cell 1 7 2 1");
|
||||
|
||||
//---- redToggleButton ----
|
||||
redToggleButton.setText("Toggle RED");
|
||||
redToggleButton.addActionListener(e -> redChanged());
|
||||
add(redToggleButton, "cell 1 7 2 1");
|
||||
|
||||
//---- brighterToggleButton ----
|
||||
brighterToggleButton.setText("Toggle brighter");
|
||||
brighterToggleButton.addActionListener(e -> brighterChanged());
|
||||
add(brighterToggleButton, "cell 1 7 2 1");
|
||||
// JFormDesigner - End of component initialization //GEN-END:initComponents
|
||||
}
|
||||
|
||||
@@ -130,5 +231,12 @@ public class ExtrasPanel
|
||||
private JLabel label2;
|
||||
private JPanel svgIconsPanel;
|
||||
private JLabel label3;
|
||||
private JSeparator separator1;
|
||||
private JLabel label5;
|
||||
private JLabel label6;
|
||||
private JLabel rainbowIcon;
|
||||
private JLabel label7;
|
||||
private JToggleButton redToggleButton;
|
||||
private JToggleButton brighterToggleButton;
|
||||
// JFormDesigner - End of variables declaration //GEN-END:variables
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
JFDML JFormDesigner: "7.0.2.0.298" Java: "14" encoding: "UTF-8"
|
||||
JFDML JFormDesigner: "7.0.3.1.342" Java: "16" encoding: "UTF-8"
|
||||
|
||||
new FormModel {
|
||||
contentType: "form/swing"
|
||||
@@ -6,7 +6,7 @@ new FormModel {
|
||||
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||
"$layoutConstraints": "insets dialog,hidemode 3"
|
||||
"$columnConstraints": "[][][left]"
|
||||
"$rowConstraints": "[]para[][][]"
|
||||
"$rowConstraints": "[]para[][][][][][][]"
|
||||
} ) {
|
||||
name: "this"
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
@@ -56,6 +56,48 @@ new FormModel {
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 3 2 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JSeparator" ) {
|
||||
name: "separator1"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 4 2 1,growx"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label5"
|
||||
"text": "Color filters can be also applied to icons. Globally or for each instance."
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 5 2 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label6"
|
||||
"text": "Rainbow color filter"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 6 2 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "rainbowIcon"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 6 2 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label7"
|
||||
"text": "Global icon color filter"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 7 2 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JToggleButton" ) {
|
||||
name: "redToggleButton"
|
||||
"text": "Toggle RED"
|
||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "redChanged", false ) )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 7 2 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JToggleButton" ) {
|
||||
name: "brighterToggleButton"
|
||||
"text": "Toggle brighter"
|
||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "brighterChanged", false ) )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 7 2 1"
|
||||
} )
|
||||
}, new FormLayoutConstraints( null ) {
|
||||
"location": new java.awt.Point( 0, 0 )
|
||||
"size": new java.awt.Dimension( 500, 300 )
|
||||
|
||||
Reference in New Issue
Block a user