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

Button: default button

Browse Source
This commit is contained in:
Karl Tauber
2019-08-20 12:21:22 +02:00
parent 2ef440a016
commit f2f4a451ac
7 changed files with 74 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java
View File

@@ -51,10 +51,11 @@ public class FlatButtonBorder
}
}
public Paint getBorderColor( Component c ) {
private Paint getBorderColor( Component c ) {
if( c.isEnabled() ) {
Color startColor = UIManager.getColor( "Button.startBorderColor" );
Color endColor = UIManager.getColor( "Button.endBorderColor" );
boolean def = FlatButtonUI.isDefaultButton( c );
Color startColor = UIManager.getColor( def ? "Button.default.startBorderColor" : "Button.startBorderColor" );
Color endColor = UIManager.getColor( def ? "Button.default.endBorderColor" : "Button.endBorderColor" );
return (startColor.equals( endColor ) )
? startColor
: new GradientPaint( 0, getFocusWidth(), startColor,

37
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java
View File

@@ -16,11 +16,14 @@
package com.formdev.flatlaf.ui;
import java.awt.Color;
import java.awt.Component;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import javax.swing.AbstractButton;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI;
@@ -43,6 +46,10 @@ public class FlatButtonUI
return instance;
}
static boolean isDefaultButton( Component c ) {
return c instanceof JButton && ((JButton)c).isDefaultButton();
}
@Override
public void update( Graphics g, JComponent c ) {
if( c.isOpaque() ) {
@@ -57,7 +64,7 @@ public class FlatButtonUI
float focusWidth = 2;
float arc = 6;
g2.setColor( c.getBackground() );
g2.setColor( getBackground( c ) );
FlatUIUtils.fillRoundRectangle( g2, 0, 0, c.getWidth(), c.getHeight(), focusWidth, arc );
} finally {
g2.dispose();
@@ -71,16 +78,22 @@ public class FlatButtonUI
@Override
protected void paintText( Graphics g, JComponent c, Rectangle textRect, String text ) {
AbstractButton b = (AbstractButton) c;
if( b.getModel().isEnabled() )
super.paintText( g, c, textRect, text );
else {
// paint disabled text
FontMetrics fm = SwingUtilities2.getFontMetrics( c, g );
int mnemonicIndex = b.getDisplayedMnemonicIndex();
g.setColor( UIManager.getColor( "Button.disabledText" ) );
SwingUtilities2.drawStringUnderlineCharAt( c, g, text, mnemonicIndex,
textRect.x + getTextShiftOffset(),
textRect.y + fm.getAscent() + getTextShiftOffset() );
}
FontMetrics fm = SwingUtilities2.getFontMetrics( c, g );
int mnemonicIndex = b.getDisplayedMnemonicIndex();
g.setColor( b.getModel().isEnabled() ? getForeground( c ) : UIManager.getColor( "Button.disabledText" ) );
SwingUtilities2.drawStringUnderlineCharAt( c, g, text, mnemonicIndex,
textRect.x + getTextShiftOffset(),
textRect.y + fm.getAscent() + getTextShiftOffset() );
}
private Color getBackground( Component c ) {
boolean def = FlatButtonUI.isDefaultButton( c );
return def ? UIManager.getColor( "Button.default.background" ) : c.getBackground();
}
private Color getForeground( Component c ) {
boolean def = FlatButtonUI.isDefaultButton( c );
return def ? UIManager.getColor( "Button.default.foreground" ) : c.getForeground();
}
}

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

@@ -51,6 +51,11 @@ Button.startBorderColor=5e6060
Button.endBorderColor=5e6060
Button.disabledBorderColor=5e6060
Button.default.background=365880
Button.default.foreground=bbbbbb
Button.default.startBorderColor=4c708c
Button.default.endBorderColor=4c708c
#---- Label ----

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

@@ -51,6 +51,11 @@ Button.startBorderColor=bfbfbf
Button.endBorderColor=b3b3b3
Button.disabledBorderColor=cfcfcf
Button.default.background=4A86C7
Button.default.foreground=f0f0f0
Button.default.startBorderColor=4779ba
Button.default.endBorderColor=3167ad
#---- Label ----