angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-14 07:47:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

IntelliJ Themes: OptionPane: use colors for error/information/question/warning icons from default color palette, which enables modification of icon colors by theme

Browse Source
This commit is contained in:
Karl Tauber
2019-11-16 21:55:28 +01:00
parent f1de65b471
commit f175c36736
8 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatOptionPaneAbstractIcon.java
View File

@@ -22,11 +22,12 @@ import java.awt.Graphics2D;
import java.awt.Shape; import java.awt.Shape;
import java.awt.geom.Path2D; import java.awt.geom.Path2D;
import javax.swing.UIManager; import javax.swing.UIManager;
import com.formdev.flatlaf.ui.FlatUIUtils;
/** /**
* Base class for icons for {@link javax.swing.JOptionPane}. * Base class for icons for {@link javax.swing.JOptionPane}.
* *
* @uiDefault OptionPane.icon.foreground Color * @uiDefault OptionPane.icon.foreground Color default is transparent
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
@@ -35,8 +36,8 @@ public abstract class FlatOptionPaneAbstractIcon
{ {
protected final Color foreground = UIManager.getColor( "OptionPane.icon.foreground" ); protected final Color foreground = UIManager.getColor( "OptionPane.icon.foreground" );
protected FlatOptionPaneAbstractIcon( String colorKey ) { protected FlatOptionPaneAbstractIcon( String colorKey, String defaultColorKey ) {
super( 32, 32, UIManager.getColor( colorKey ) ); super( 32, 32, FlatUIUtils.getUIColor( colorKey, defaultColorKey ) );
} }
@Override @Override

5
flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatOptionPaneErrorIcon.java
View File

@@ -24,7 +24,8 @@ import java.awt.geom.Rectangle2D;
/** /**
* "Error" icon for {@link javax.swing.JOptionPane}. * "Error" icon for {@link javax.swing.JOptionPane}.
* *
* @uiDefault OptionPane.icon.errorColor Color * @uiDefault OptionPane.icon.errorColor Color optional; defaults to Actions.Red
* @uiDefault Actions.Red Color
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
@@ -32,7 +33,7 @@ public class FlatOptionPaneErrorIcon
extends FlatOptionPaneAbstractIcon extends FlatOptionPaneAbstractIcon
{ {
public FlatOptionPaneErrorIcon() { public FlatOptionPaneErrorIcon() {
super( "OptionPane.icon.errorColor" ); super( "OptionPane.icon.errorColor", "Actions.Red" );
} }
/* /*

5
flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatOptionPaneInformationIcon.java
View File

@@ -24,7 +24,8 @@ import java.awt.geom.Rectangle2D;
/** /**
* "Information" icon for {@link javax.swing.JOptionPane}. * "Information" icon for {@link javax.swing.JOptionPane}.
* *
* @uiDefault OptionPane.icon.informationColor Color * @uiDefault OptionPane.icon.informationColor Color optional; defaults to Actions.Blue
* @uiDefault Actions.Blue Color
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
@@ -32,7 +33,7 @@ public class FlatOptionPaneInformationIcon
extends FlatOptionPaneAbstractIcon extends FlatOptionPaneAbstractIcon
{ {
public FlatOptionPaneInformationIcon() { public FlatOptionPaneInformationIcon() {
super( "OptionPane.icon.informationColor" ); super( "OptionPane.icon.informationColor", "Actions.Blue" );
} }
/* /*

5
flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatOptionPaneQuestionIcon.java
View File

@@ -24,7 +24,8 @@ import java.awt.geom.Rectangle2D;
/** /**
* "Question" icon for {@link javax.swing.JOptionPane}. * "Question" icon for {@link javax.swing.JOptionPane}.
* *
* @uiDefault OptionPane.icon.questionColor Color * @uiDefault OptionPane.icon.questionColor Color optional; defaults to Actions.Blue
* @uiDefault Actions.Blue Color
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
@@ -32,7 +33,7 @@ public class FlatOptionPaneQuestionIcon
extends FlatOptionPaneAbstractIcon extends FlatOptionPaneAbstractIcon
{ {
public FlatOptionPaneQuestionIcon() { public FlatOptionPaneQuestionIcon() {
super( "OptionPane.icon.questionColor" ); super( "OptionPane.icon.questionColor", "Actions.Blue" );
} }
/* /*

5
flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatOptionPaneWarningIcon.java
View File

@@ -24,7 +24,8 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
/** /**
* "Warning" icon for {@link javax.swing.JOptionPane}. * "Warning" icon for {@link javax.swing.JOptionPane}.
* *
* @uiDefault OptionPane.icon.warningColor Color * @uiDefault OptionPane.icon.warningColor Color optional; defaults to Actions.Yellow
* @uiDefault Actions.Yellow Color
* *
* @author Karl Tauber * @author Karl Tauber
*/ */
@@ -32,7 +33,7 @@ public class FlatOptionPaneWarningIcon
extends FlatOptionPaneAbstractIcon extends FlatOptionPaneAbstractIcon
{ {
public FlatOptionPaneWarningIcon() { public FlatOptionPaneWarningIcon() {
super( "OptionPane.icon.warningColor" ); super( "OptionPane.icon.warningColor", "Actions.Yellow" );
} }
/* /*

5
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java
View File

@@ -91,6 +91,11 @@ public class FlatUIUtils
return (color != null) ? color : defaultColor; return (color != null) ? color : defaultColor;
} }
public static Color getUIColor( String key, String defaultKey ) {
Color color = UIManager.getColor( key );
return (color != null) ? color : UIManager.getColor( defaultKey );
}
public static int getUIInt( String key, int defaultValue ) { public static int getUIInt( String key, int defaultValue ) {
Object value = UIManager.get( key ); Object value = UIManager.get( key );
return (value instanceof Integer) ? (Integer) value : defaultValue; return (value instanceof Integer) ? (Integer) value : defaultValue;

9
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
View File

@@ -146,15 +146,6 @@ MenuItemCheckBox.icon.checkmarkColor=A7A7A7
MenuItemCheckBox.icon.disabledCheckmarkColor=606060 MenuItemCheckBox.icon.disabledCheckmarkColor=606060
#---- OptionPane ----
OptionPane.icon.errorColor=C75450
OptionPane.icon.informationColor=3592C4
OptionPane.icon.questionColor=3592C4
OptionPane.icon.warningColor=F0A732
OptionPane.icon.foreground=null
#---- PopupMenu ---- #---- PopupMenu ----
PopupMenu.borderColor=515151 PopupMenu.borderColor=515151

9
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
View File

@@ -153,15 +153,6 @@ MenuItemCheckBox.icon.checkmarkColor=4D89C9
MenuItemCheckBox.icon.disabledCheckmarkColor=ABABAB MenuItemCheckBox.icon.disabledCheckmarkColor=ABABAB
#---- OptionPane ----
OptionPane.icon.errorColor=DB5860
OptionPane.icon.informationColor=389FD6
OptionPane.icon.questionColor=389FD6
OptionPane.icon.warningColor=EDA200
OptionPane.icon.foreground=null
#---- PopupMenu ---- #---- PopupMenu ----
PopupMenu.borderColor=cdcdcd PopupMenu.borderColor=cdcdcd