mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2026-02-11 06:27:13 -06:00
CheckBox and RadioButton:
- added `CheckBox.icon.selectedBorderWidth` - added `CheckBox.icon.disabledSelectedBorderWidth` - added `CheckBox.icon.disabledSelectedBorderColor` - added `CheckBox.icon.disabledSelectedBackground` - changed `CheckBox.icon.focusWidth` from `int` `float`
This commit is contained in:
@@ -44,8 +44,10 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
|
|||||||
* @uiDefault Component.focusWidth int
|
* @uiDefault Component.focusWidth int
|
||||||
* @uiDefault Component.borderWidth int
|
* @uiDefault Component.borderWidth int
|
||||||
* @uiDefault Component.focusColor Color
|
* @uiDefault Component.focusColor Color
|
||||||
* @uiDefault CheckBox.icon.focusWidth int optional; defaults to Component.focusWidth
|
* @uiDefault CheckBox.icon.focusWidth int or float optional; defaults to Component.focusWidth
|
||||||
* @uiDefault CheckBox.icon.borderWidth int or float optional; defaults to Component.borderWidth
|
* @uiDefault CheckBox.icon.borderWidth int or float optional; defaults to Component.borderWidth
|
||||||
|
* @uiDefault CheckBox.icon.selectedBorderWidth int or float optional; defaults to CheckBox.icon.borderWidth
|
||||||
|
* @uiDefault CheckBox.icon.disabledSelectedBorderWidth int or float optional; defaults to CheckBox.icon.selectedBorderWidth
|
||||||
* @uiDefault CheckBox.arc int
|
* @uiDefault CheckBox.arc int
|
||||||
*
|
*
|
||||||
* @uiDefault CheckBox.icon.focusColor Color optional; defaults to Component.focusColor
|
* @uiDefault CheckBox.icon.focusColor Color optional; defaults to Component.focusColor
|
||||||
@@ -57,6 +59,8 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
|
|||||||
*
|
*
|
||||||
* @uiDefault CheckBox.icon.disabledBorderColor Color
|
* @uiDefault CheckBox.icon.disabledBorderColor Color
|
||||||
* @uiDefault CheckBox.icon.disabledBackground Color
|
* @uiDefault CheckBox.icon.disabledBackground Color
|
||||||
|
* @uiDefault CheckBox.icon.disabledSelectedBorderColor Color optional; CheckBox.icon.disabledBorderColor is used if not specified
|
||||||
|
* @uiDefault CheckBox.icon.disabledSelectedBackground Color optional; CheckBox.icon.disabledBackground is used if not specified
|
||||||
* @uiDefault CheckBox.icon.disabledCheckmarkColor Color
|
* @uiDefault CheckBox.icon.disabledCheckmarkColor Color
|
||||||
*
|
*
|
||||||
* @uiDefault CheckBox.icon.focusedBorderColor Color optional
|
* @uiDefault CheckBox.icon.focusedBorderColor Color optional
|
||||||
@@ -83,12 +87,11 @@ public class FlatCheckBoxIcon
|
|||||||
extends FlatAbstractIcon
|
extends FlatAbstractIcon
|
||||||
{
|
{
|
||||||
protected final String style = UIManager.getString( "CheckBox.icon.style" );
|
protected final String style = UIManager.getString( "CheckBox.icon.style" );
|
||||||
@Styleable public int focusWidth = getUIInt( "CheckBox.icon.focusWidth",
|
@Styleable protected float focusWidth = getUIFloat( "CheckBox.icon.focusWidth", UIManager.getInt( "Component.focusWidth" ), style );
|
||||||
UIManager.getInt( "Component.focusWidth" ), style );
|
@Styleable protected Color focusColor = FlatUIUtils.getUIColor( "CheckBox.icon.focusColor", UIManager.getColor( "Component.focusColor" ) );
|
||||||
@Styleable protected Color focusColor = FlatUIUtils.getUIColor( "CheckBox.icon.focusColor",
|
/** @since 2 */ @Styleable protected float borderWidth = getUIFloat( "CheckBox.icon.borderWidth", FlatUIUtils.getUIFloat( "Component.borderWidth", 1 ), style );
|
||||||
UIManager.getColor( "Component.focusColor" ) );
|
/** @since 2 */ @Styleable protected float selectedBorderWidth = getUIFloat( "CheckBox.icon.selectedBorderWidth", Float.MIN_VALUE, style );
|
||||||
/** @since 2 */ @Styleable protected float borderWidth = getUIFloat( "CheckBox.icon.borderWidth",
|
/** @since 2 */ @Styleable protected float disabledSelectedBorderWidth = getUIFloat( "CheckBox.icon.disabledSelectedBorderWidth", Float.MIN_VALUE, style );
|
||||||
FlatUIUtils.getUIFloat( "Component.borderWidth", 1 ), style );
|
|
||||||
@Styleable protected int arc = FlatUIUtils.getUIInt( "CheckBox.arc", 2 );
|
@Styleable protected int arc = FlatUIUtils.getUIInt( "CheckBox.arc", 2 );
|
||||||
|
|
||||||
// enabled
|
// enabled
|
||||||
@@ -101,6 +104,8 @@ public class FlatCheckBoxIcon
|
|||||||
// disabled
|
// disabled
|
||||||
@Styleable protected Color disabledBorderColor = getUIColor( "CheckBox.icon.disabledBorderColor", style );
|
@Styleable protected Color disabledBorderColor = getUIColor( "CheckBox.icon.disabledBorderColor", style );
|
||||||
@Styleable protected Color disabledBackground = getUIColor( "CheckBox.icon.disabledBackground", style );
|
@Styleable protected Color disabledBackground = getUIColor( "CheckBox.icon.disabledBackground", style );
|
||||||
|
/** @since 2 */ @Styleable protected Color disabledSelectedBorderColor = getUIColor( "CheckBox.icon.disabledSelectedBorderColor", style );
|
||||||
|
/** @since 2 */ @Styleable protected Color disabledSelectedBackground = getUIColor( "CheckBox.icon.disabledSelectedBackground", style );
|
||||||
@Styleable protected Color disabledCheckmarkColor = getUIColor( "CheckBox.icon.disabledCheckmarkColor", style );
|
@Styleable protected Color disabledCheckmarkColor = getUIColor( "CheckBox.icon.disabledCheckmarkColor", style );
|
||||||
|
|
||||||
// focused
|
// focused
|
||||||
@@ -133,15 +138,6 @@ public class FlatCheckBoxIcon
|
|||||||
return UIManager.getColor( key );
|
return UIManager.getColor( key );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected static int getUIInt( String key, int defaultValue, String style ) {
|
|
||||||
if( style != null ) {
|
|
||||||
int value = FlatUIUtils.getUIInt( styleKey( key, style ), Integer.MIN_VALUE );
|
|
||||||
if( value != Integer.MIN_VALUE )
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
return FlatUIUtils.getUIInt( key, defaultValue );
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @since 2 */
|
/** @since 2 */
|
||||||
protected static float getUIFloat( String key, float defaultValue, String style ) {
|
protected static float getUIFloat( String key, float defaultValue, String style ) {
|
||||||
if( style != null ) {
|
if( style != null ) {
|
||||||
@@ -177,6 +173,11 @@ public class FlatCheckBoxIcon
|
|||||||
boolean indeterminate = isIndeterminate( c );
|
boolean indeterminate = isIndeterminate( c );
|
||||||
boolean selected = indeterminate || isSelected( c );
|
boolean selected = indeterminate || isSelected( c );
|
||||||
boolean isFocused = FlatUIUtils.isPermanentFocusOwner( c );
|
boolean isFocused = FlatUIUtils.isPermanentFocusOwner( c );
|
||||||
|
float bw = selected
|
||||||
|
? (disabledSelectedBorderWidth != Float.MIN_VALUE && !c.isEnabled()
|
||||||
|
? disabledSelectedBorderWidth
|
||||||
|
: (selectedBorderWidth != Float.MIN_VALUE ? selectedBorderWidth : borderWidth))
|
||||||
|
: borderWidth;
|
||||||
|
|
||||||
// paint focused border
|
// paint focused border
|
||||||
if( isFocused && focusWidth > 0 && FlatButtonUI.isFocusPainted( c ) ) {
|
if( isFocused && focusWidth > 0 && FlatButtonUI.isFocusPainted( c ) ) {
|
||||||
@@ -186,7 +187,7 @@ public class FlatCheckBoxIcon
|
|||||||
|
|
||||||
// paint border
|
// paint border
|
||||||
g.setColor( getBorderColor( c, selected ) );
|
g.setColor( getBorderColor( c, selected ) );
|
||||||
paintBorder( c, g );
|
paintBorder( c, g, bw );
|
||||||
|
|
||||||
// paint background
|
// paint background
|
||||||
Color bg = FlatUIUtils.deriveColor( getBackground( c, selected ),
|
Color bg = FlatUIUtils.deriveColor( getBackground( c, selected ),
|
||||||
@@ -194,10 +195,10 @@ public class FlatCheckBoxIcon
|
|||||||
if( bg.getAlpha() < 255 ) {
|
if( bg.getAlpha() < 255 ) {
|
||||||
// fill background with default color before filling with non-opaque background
|
// fill background with default color before filling with non-opaque background
|
||||||
g.setColor( selected ? selectedBackground : background );
|
g.setColor( selected ? selectedBackground : background );
|
||||||
paintBackground( c, g );
|
paintBackground( c, g, bw );
|
||||||
}
|
}
|
||||||
g.setColor( bg );
|
g.setColor( bg );
|
||||||
paintBackground( c, g );
|
paintBackground( c, g, bw );
|
||||||
|
|
||||||
// paint checkmark
|
// paint checkmark
|
||||||
if( selected ) {
|
if( selected ) {
|
||||||
@@ -211,20 +212,23 @@ public class FlatCheckBoxIcon
|
|||||||
|
|
||||||
protected void paintFocusBorder( Component c, Graphics2D g ) {
|
protected void paintFocusBorder( Component c, Graphics2D g ) {
|
||||||
// the outer focus border is painted outside of the icon
|
// the outer focus border is painted outside of the icon
|
||||||
int wh = ICON_SIZE - 1 + (focusWidth * 2);
|
float wh = ICON_SIZE - 1 + (focusWidth * 2);
|
||||||
int arcwh = arc + (focusWidth * 2);
|
float arcwh = arc + (focusWidth * 2);
|
||||||
g.fillRoundRect( -focusWidth + 1, -focusWidth, wh, wh, arcwh, arcwh );
|
g.fill( new RoundRectangle2D.Float( -focusWidth + 1, -focusWidth, wh, wh, arcwh, arcwh ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void paintBorder( Component c, Graphics2D g ) {
|
protected void paintBorder( Component c, Graphics2D g, float borderWidth ) {
|
||||||
|
if( borderWidth == 0 )
|
||||||
|
return;
|
||||||
|
|
||||||
int arcwh = arc;
|
int arcwh = arc;
|
||||||
g.fillRoundRect( 1, 0, 14, 14, arcwh, arcwh );
|
g.fillRoundRect( 1, 0, 14, 14, arcwh, arcwh );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void paintBackground( Component c, Graphics2D g ) {
|
protected void paintBackground( Component c, Graphics2D g, float borderWidth ) {
|
||||||
float xy = borderWidth;
|
float xy = borderWidth;
|
||||||
float wh = 14 - (borderWidth * 2);
|
float wh = 14 - (borderWidth * 2);
|
||||||
int arcwh = arc - 1;
|
float arcwh = arc - borderWidth;
|
||||||
g.fill( new RoundRectangle2D.Float( 1 + xy, xy, wh, wh, arcwh, arcwh ) );
|
g.fill( new RoundRectangle2D.Float( 1 + xy, xy, wh, wh, arcwh, arcwh ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -250,6 +254,11 @@ public class FlatCheckBoxIcon
|
|||||||
return c instanceof AbstractButton && ((AbstractButton)c).isSelected();
|
return c instanceof AbstractButton && ((AbstractButton)c).isSelected();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** @since 2 */
|
||||||
|
public float getFocusWidth() {
|
||||||
|
return focusWidth;
|
||||||
|
}
|
||||||
|
|
||||||
protected Color getFocusColor( Component c ) {
|
protected Color getFocusColor( Component c ) {
|
||||||
return focusColor;
|
return focusColor;
|
||||||
}
|
}
|
||||||
@@ -257,7 +266,7 @@ public class FlatCheckBoxIcon
|
|||||||
protected Color getBorderColor( Component c, boolean selected ) {
|
protected Color getBorderColor( Component c, boolean selected ) {
|
||||||
return FlatButtonUI.buttonStateColor( c,
|
return FlatButtonUI.buttonStateColor( c,
|
||||||
selected ? selectedBorderColor : borderColor,
|
selected ? selectedBorderColor : borderColor,
|
||||||
disabledBorderColor,
|
(selected && disabledSelectedBorderColor != null) ? disabledSelectedBorderColor : disabledBorderColor,
|
||||||
(selected && focusedSelectedBorderColor != null) ? focusedSelectedBorderColor : focusedBorderColor,
|
(selected && focusedSelectedBorderColor != null) ? focusedSelectedBorderColor : focusedBorderColor,
|
||||||
(selected && hoverSelectedBorderColor != null) ? hoverSelectedBorderColor : hoverBorderColor,
|
(selected && hoverSelectedBorderColor != null) ? hoverSelectedBorderColor : hoverBorderColor,
|
||||||
(selected && pressedSelectedBorderColor != null) ? pressedSelectedBorderColor : pressedBorderColor );
|
(selected && pressedSelectedBorderColor != null) ? pressedSelectedBorderColor : pressedBorderColor );
|
||||||
@@ -266,7 +275,7 @@ public class FlatCheckBoxIcon
|
|||||||
protected Color getBackground( Component c, boolean selected ) {
|
protected Color getBackground( Component c, boolean selected ) {
|
||||||
return FlatButtonUI.buttonStateColor( c,
|
return FlatButtonUI.buttonStateColor( c,
|
||||||
selected ? selectedBackground : background,
|
selected ? selectedBackground : background,
|
||||||
disabledBackground,
|
(selected && disabledSelectedBackground != null) ? disabledSelectedBackground : disabledBackground,
|
||||||
(selected && focusedSelectedBackground != null) ? focusedSelectedBackground : focusedBackground,
|
(selected && focusedSelectedBackground != null) ? focusedSelectedBackground : focusedBackground,
|
||||||
(selected && hoverSelectedBackground != null) ? hoverSelectedBackground : hoverBackground,
|
(selected && hoverSelectedBackground != null) ? hoverSelectedBackground : hoverBackground,
|
||||||
(selected && pressedSelectedBackground != null) ? pressedSelectedBackground : pressedBackground );
|
(selected && pressedSelectedBackground != null) ? pressedSelectedBackground : pressedBackground );
|
||||||
|
|||||||
@@ -41,17 +41,20 @@ public class FlatRadioButtonIcon
|
|||||||
@Override
|
@Override
|
||||||
protected void paintFocusBorder( Component c, Graphics2D g ) {
|
protected void paintFocusBorder( Component c, Graphics2D g ) {
|
||||||
// the outer focus border is painted outside of the icon
|
// the outer focus border is painted outside of the icon
|
||||||
int wh = ICON_SIZE + (focusWidth * 2);
|
float wh = ICON_SIZE + (focusWidth * 2);
|
||||||
g.fillOval( -focusWidth, -focusWidth, wh, wh );
|
g.fill( new Ellipse2D.Float( -focusWidth, -focusWidth, wh, wh ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void paintBorder( Component c, Graphics2D g ) {
|
protected void paintBorder( Component c, Graphics2D g, float borderWidth ) {
|
||||||
|
if( borderWidth == 0 )
|
||||||
|
return;
|
||||||
|
|
||||||
g.fillOval( 0, 0, 15, 15 );
|
g.fillOval( 0, 0, 15, 15 );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void paintBackground( Component c, Graphics2D g ) {
|
protected void paintBackground( Component c, Graphics2D g, float borderWidth ) {
|
||||||
float xy = borderWidth;
|
float xy = borderWidth;
|
||||||
float wh = 15 - (borderWidth * 2);
|
float wh = 15 - (borderWidth * 2);
|
||||||
g.fill( new Ellipse2D.Float( xy, xy, wh, wh ) );
|
g.fill( new Ellipse2D.Float( xy, xy, wh, wh ) );
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ import java.util.Map;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import javax.swing.AbstractButton;
|
import javax.swing.AbstractButton;
|
||||||
import javax.swing.CellRendererPane;
|
import javax.swing.CellRendererPane;
|
||||||
|
import javax.swing.Icon;
|
||||||
import javax.swing.JComponent;
|
import javax.swing.JComponent;
|
||||||
import javax.swing.LookAndFeel;
|
import javax.swing.LookAndFeel;
|
||||||
import javax.swing.UIManager;
|
import javax.swing.UIManager;
|
||||||
@@ -279,8 +280,12 @@ public class FlatRadioButtonUI
|
|||||||
|
|
||||||
private int getIconFocusWidth( JComponent c ) {
|
private int getIconFocusWidth( JComponent c ) {
|
||||||
AbstractButton b = (AbstractButton) c;
|
AbstractButton b = (AbstractButton) c;
|
||||||
return (b.getIcon() == null && getDefaultIcon() instanceof FlatCheckBoxIcon)
|
Icon icon = b.getIcon();
|
||||||
? UIScale.scale( ((FlatCheckBoxIcon)getDefaultIcon()).focusWidth )
|
if( icon == null )
|
||||||
|
icon = getDefaultIcon();
|
||||||
|
|
||||||
|
return (icon instanceof FlatCheckBoxIcon)
|
||||||
|
? Math.round( UIScale.scale( ((FlatCheckBoxIcon)icon).getFocusWidth() ) )
|
||||||
: 0;
|
: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -469,9 +469,11 @@ public class TestFlatStyleableInfo
|
|||||||
|
|
||||||
//---- icon ----
|
//---- icon ----
|
||||||
|
|
||||||
"icon.focusWidth", int.class,
|
"icon.focusWidth", float.class,
|
||||||
"icon.focusColor", Color.class,
|
"icon.focusColor", Color.class,
|
||||||
"icon.borderWidth", float.class,
|
"icon.borderWidth", float.class,
|
||||||
|
"icon.selectedBorderWidth", float.class,
|
||||||
|
"icon.disabledSelectedBorderWidth", float.class,
|
||||||
"icon.arc", int.class,
|
"icon.arc", int.class,
|
||||||
|
|
||||||
// enabled
|
// enabled
|
||||||
@@ -484,6 +486,8 @@ public class TestFlatStyleableInfo
|
|||||||
// disabled
|
// disabled
|
||||||
"icon.disabledBorderColor", Color.class,
|
"icon.disabledBorderColor", Color.class,
|
||||||
"icon.disabledBackground", Color.class,
|
"icon.disabledBackground", Color.class,
|
||||||
|
"icon.disabledSelectedBorderColor", Color.class,
|
||||||
|
"icon.disabledSelectedBackground", Color.class,
|
||||||
"icon.disabledCheckmarkColor", Color.class,
|
"icon.disabledCheckmarkColor", Color.class,
|
||||||
|
|
||||||
// focused
|
// focused
|
||||||
@@ -1045,9 +1049,11 @@ public class TestFlatStyleableInfo
|
|||||||
|
|
||||||
private void flatCheckBoxIcon( Map<String, Class<?>> expected ) {
|
private void flatCheckBoxIcon( Map<String, Class<?>> expected ) {
|
||||||
expectedMap( expected,
|
expectedMap( expected,
|
||||||
"focusWidth", int.class,
|
"focusWidth", float.class,
|
||||||
"focusColor", Color.class,
|
"focusColor", Color.class,
|
||||||
"borderWidth", float.class,
|
"borderWidth", float.class,
|
||||||
|
"selectedBorderWidth", float.class,
|
||||||
|
"disabledSelectedBorderWidth", float.class,
|
||||||
"arc", int.class,
|
"arc", int.class,
|
||||||
|
|
||||||
// enabled
|
// enabled
|
||||||
@@ -1060,6 +1066,8 @@ public class TestFlatStyleableInfo
|
|||||||
// disabled
|
// disabled
|
||||||
"disabledBorderColor", Color.class,
|
"disabledBorderColor", Color.class,
|
||||||
"disabledBackground", Color.class,
|
"disabledBackground", Color.class,
|
||||||
|
"disabledSelectedBorderColor", Color.class,
|
||||||
|
"disabledSelectedBackground", Color.class,
|
||||||
"disabledCheckmarkColor", Color.class,
|
"disabledCheckmarkColor", Color.class,
|
||||||
|
|
||||||
// focused
|
// focused
|
||||||
|
|||||||
@@ -608,9 +608,11 @@ public class TestFlatStyling
|
|||||||
|
|
||||||
//---- icon ----
|
//---- icon ----
|
||||||
|
|
||||||
ui.applyStyle( b, "icon.focusWidth: 2" );
|
ui.applyStyle( b, "icon.focusWidth: 1.5" );
|
||||||
ui.applyStyle( b, "icon.focusColor: #fff" );
|
ui.applyStyle( b, "icon.focusColor: #fff" );
|
||||||
ui.applyStyle( b, "icon.borderWidth: 1" );
|
ui.applyStyle( b, "icon.borderWidth: 1.5" );
|
||||||
|
ui.applyStyle( b, "icon.selectedBorderWidth: 1.5" );
|
||||||
|
ui.applyStyle( b, "icon.disabledSelectedBorderWidth: 1.5" );
|
||||||
ui.applyStyle( b, "icon.arc: 5" );
|
ui.applyStyle( b, "icon.arc: 5" );
|
||||||
|
|
||||||
// enabled
|
// enabled
|
||||||
@@ -623,6 +625,8 @@ public class TestFlatStyling
|
|||||||
// disabled
|
// disabled
|
||||||
ui.applyStyle( b, "icon.disabledBorderColor: #fff" );
|
ui.applyStyle( b, "icon.disabledBorderColor: #fff" );
|
||||||
ui.applyStyle( b, "icon.disabledBackground: #fff" );
|
ui.applyStyle( b, "icon.disabledBackground: #fff" );
|
||||||
|
ui.applyStyle( b, "icon.disabledSelectedBorderColor: #fff" );
|
||||||
|
ui.applyStyle( b, "icon.disabledSelectedBackground: #fff" );
|
||||||
ui.applyStyle( b, "icon.disabledCheckmarkColor: #fff" );
|
ui.applyStyle( b, "icon.disabledCheckmarkColor: #fff" );
|
||||||
|
|
||||||
// focused
|
// focused
|
||||||
@@ -1268,9 +1272,11 @@ public class TestFlatStyling
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void flatCheckBoxIcon( FlatCheckBoxIcon icon ) {
|
private void flatCheckBoxIcon( FlatCheckBoxIcon icon ) {
|
||||||
icon.applyStyleProperty( "focusWidth", 2 );
|
icon.applyStyleProperty( "focusWidth", 1.5f );
|
||||||
icon.applyStyleProperty( "focusColor", Color.WHITE );
|
icon.applyStyleProperty( "focusColor", Color.WHITE );
|
||||||
icon.applyStyleProperty( "borderWidth", 1.5f );
|
icon.applyStyleProperty( "borderWidth", 1.5f );
|
||||||
|
icon.applyStyleProperty( "selectedBorderWidth", 1.5f );
|
||||||
|
icon.applyStyleProperty( "disabledSelectedBorderWidth", 1.5f );
|
||||||
icon.applyStyleProperty( "arc", 5 );
|
icon.applyStyleProperty( "arc", 5 );
|
||||||
|
|
||||||
// enabled
|
// enabled
|
||||||
@@ -1283,6 +1289,8 @@ public class TestFlatStyling
|
|||||||
// disabled
|
// disabled
|
||||||
icon.applyStyleProperty( "disabledBorderColor", Color.WHITE );
|
icon.applyStyleProperty( "disabledBorderColor", Color.WHITE );
|
||||||
icon.applyStyleProperty( "disabledBackground", Color.WHITE );
|
icon.applyStyleProperty( "disabledBackground", Color.WHITE );
|
||||||
|
icon.applyStyleProperty( "disabledSelectedBorderColor", Color.WHITE );
|
||||||
|
icon.applyStyleProperty( "disabledSelectedBackground", Color.WHITE );
|
||||||
icon.applyStyleProperty( "disabledCheckmarkColor", Color.WHITE );
|
icon.applyStyleProperty( "disabledCheckmarkColor", Color.WHITE );
|
||||||
|
|
||||||
// focused
|
// focused
|
||||||
|
|||||||
@@ -49,7 +49,7 @@
|
|||||||
|
|
||||||
+ CheckBox.icon.style filled
|
+ CheckBox.icon.style filled
|
||||||
|
|
||||||
- CheckBox.icon[filled].selectedFocusedCheckmarkColor #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI]
|
- CheckBox.icon[filled].focusedCheckmarkColor #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
|
||||||
|
|
||||||
#---- ComboBox ----
|
#---- ComboBox ----
|
||||||
|
|||||||
@@ -133,6 +133,9 @@ CheckBox.icon.checkmarkColor #ffffff HSL 0 0 100 javax.swing.plaf.Colo
|
|||||||
CheckBox.icon.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI]
|
CheckBox.icon.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI]
|
||||||
CheckBox.icon.disabledBorderColor #bdbdbd HSL 0 0 74 javax.swing.plaf.ColorUIResource [UI]
|
CheckBox.icon.disabledBorderColor #bdbdbd HSL 0 0 74 javax.swing.plaf.ColorUIResource [UI]
|
||||||
CheckBox.icon.disabledCheckmarkColor #ababab HSL 0 0 67 javax.swing.plaf.ColorUIResource [UI]
|
CheckBox.icon.disabledCheckmarkColor #ababab HSL 0 0 67 javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
CheckBox.icon.disabledSelectedBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
CheckBox.icon.disabledSelectedBorderColor #dbdbdb HSL 0 0 86 javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
CheckBox.icon.disabledSelectedBorderWidth 2
|
||||||
CheckBox.icon.focusedBackground #00ffff HSL 180 100 50 javax.swing.plaf.ColorUIResource [UI]
|
CheckBox.icon.focusedBackground #00ffff HSL 180 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||||
CheckBox.icon.focusedBorderColor #7b9fc7 HSL 212 40 63 javax.swing.plaf.ColorUIResource [UI]
|
CheckBox.icon.focusedBorderColor #7b9fc7 HSL 212 40 63 javax.swing.plaf.ColorUIResource [UI]
|
||||||
CheckBox.icon.focusedSelectedBorderColor #accff7 HSL 212 82 82 javax.swing.plaf.ColorUIResource [UI]
|
CheckBox.icon.focusedSelectedBorderColor #accff7 HSL 212 82 82 javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
|||||||
@@ -110,6 +110,8 @@ Button.toolbar.selectedBackground = #ddd
|
|||||||
|
|
||||||
#---- CheckBox ----
|
#---- CheckBox ----
|
||||||
|
|
||||||
|
CheckBox.icon.disabledSelectedBorderWidth = 2
|
||||||
|
|
||||||
# enabled
|
# enabled
|
||||||
CheckBox.icon.borderColor = #878787
|
CheckBox.icon.borderColor = #878787
|
||||||
CheckBox.icon.background = #fff
|
CheckBox.icon.background = #fff
|
||||||
@@ -120,6 +122,8 @@ CheckBox.icon.checkmarkColor = #fff
|
|||||||
# disabled
|
# disabled
|
||||||
CheckBox.icon.disabledBorderColor = #BDBDBD
|
CheckBox.icon.disabledBorderColor = #BDBDBD
|
||||||
CheckBox.icon.disabledBackground = #F2F2F2
|
CheckBox.icon.disabledBackground = #F2F2F2
|
||||||
|
CheckBox.icon.disabledSelectedBorderColor = #dbdbdb
|
||||||
|
CheckBox.icon.disabledSelectedBackground = #F2F2F2
|
||||||
CheckBox.icon.disabledCheckmarkColor = #ABABAB
|
CheckBox.icon.disabledCheckmarkColor = #ABABAB
|
||||||
|
|
||||||
# focused
|
# focused
|
||||||
|
|||||||
@@ -81,6 +81,9 @@ CheckBox.icon.checkmarkColor
|
|||||||
CheckBox.icon.disabledBackground
|
CheckBox.icon.disabledBackground
|
||||||
CheckBox.icon.disabledBorderColor
|
CheckBox.icon.disabledBorderColor
|
||||||
CheckBox.icon.disabledCheckmarkColor
|
CheckBox.icon.disabledCheckmarkColor
|
||||||
|
CheckBox.icon.disabledSelectedBackground
|
||||||
|
CheckBox.icon.disabledSelectedBorderColor
|
||||||
|
CheckBox.icon.disabledSelectedBorderWidth
|
||||||
CheckBox.icon.focusColor
|
CheckBox.icon.focusColor
|
||||||
CheckBox.icon.focusWidth
|
CheckBox.icon.focusWidth
|
||||||
CheckBox.icon.focusedBackground
|
CheckBox.icon.focusedBackground
|
||||||
@@ -100,14 +103,20 @@ CheckBox.icon.pressedSelectedBackground
|
|||||||
CheckBox.icon.pressedSelectedBorderColor
|
CheckBox.icon.pressedSelectedBorderColor
|
||||||
CheckBox.icon.selectedBackground
|
CheckBox.icon.selectedBackground
|
||||||
CheckBox.icon.selectedBorderColor
|
CheckBox.icon.selectedBorderColor
|
||||||
|
CheckBox.icon.selectedBorderWidth
|
||||||
CheckBox.icon.style
|
CheckBox.icon.style
|
||||||
CheckBox.iconTextGap
|
CheckBox.iconTextGap
|
||||||
CheckBox.icon[filled].background
|
CheckBox.icon[filled].background
|
||||||
CheckBox.icon[filled].borderColor
|
CheckBox.icon[filled].borderColor
|
||||||
|
CheckBox.icon[filled].borderWidth
|
||||||
CheckBox.icon[filled].checkmarkColor
|
CheckBox.icon[filled].checkmarkColor
|
||||||
CheckBox.icon[filled].disabledBackground
|
CheckBox.icon[filled].disabledBackground
|
||||||
CheckBox.icon[filled].disabledBorderColor
|
CheckBox.icon[filled].disabledBorderColor
|
||||||
CheckBox.icon[filled].disabledCheckmarkColor
|
CheckBox.icon[filled].disabledCheckmarkColor
|
||||||
|
CheckBox.icon[filled].disabledSelectedBackground
|
||||||
|
CheckBox.icon[filled].disabledSelectedBorderColor
|
||||||
|
CheckBox.icon[filled].disabledSelectedBorderWidth
|
||||||
|
CheckBox.icon[filled].focusWidth
|
||||||
CheckBox.icon[filled].focusedBackground
|
CheckBox.icon[filled].focusedBackground
|
||||||
CheckBox.icon[filled].focusedBorderColor
|
CheckBox.icon[filled].focusedBorderColor
|
||||||
CheckBox.icon[filled].focusedCheckmarkColor
|
CheckBox.icon[filled].focusedCheckmarkColor
|
||||||
@@ -125,6 +134,7 @@ CheckBox.icon[filled].pressedSelectedBackground
|
|||||||
CheckBox.icon[filled].pressedSelectedBorderColor
|
CheckBox.icon[filled].pressedSelectedBorderColor
|
||||||
CheckBox.icon[filled].selectedBackground
|
CheckBox.icon[filled].selectedBackground
|
||||||
CheckBox.icon[filled].selectedBorderColor
|
CheckBox.icon[filled].selectedBorderColor
|
||||||
|
CheckBox.icon[filled].selectedBorderWidth
|
||||||
CheckBox.margin
|
CheckBox.margin
|
||||||
CheckBox.rollover
|
CheckBox.rollover
|
||||||
CheckBox.textIconGap
|
CheckBox.textIconGap
|
||||||
|
|||||||
Reference in New Issue
Block a user