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

support defining fonts in FlatLaf properties files (issue #384)

Browse Source
This commit is contained in:
Karl Tauber
2021-10-08 20:23:54 +02:00
parent 5ecf19ef4f
commit b9ec382589
6 changed files with 258 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
View File

@@ -569,7 +569,7 @@ public abstract class FlatLaf
// use active value for all fonts to allow changing fonts in all components
// (similar as in Nimbus L&F) with:
// UIManager.put( "defaultFont", myFont );
Object activeFont = new ActiveFont( 1 );
Object activeFont = new ActiveFont( null, -1, 0, 0, 0, 0 );
// override fonts
for( Object key : defaults.keySet() ) {
@@ -577,9 +577,6 @@ public abstract class FlatLaf
defaults.put( key, activeFont );
}
// use smaller font for progress bar
defaults.put( "ProgressBar.font", new ActiveFont( 0.85f ) );
// set default font
defaults.put( "defaultFont", uiFont );
}
@@ -594,7 +591,7 @@ public abstract class FlatLaf
/** @since 1.1 */
public static ActiveValue createActiveFontValue( float scaleFactor ) {
return new ActiveFont( scaleFactor );
return new ActiveFont( null, -1, 0, 0, 0, scaleFactor );
}
/**
@@ -1162,17 +1159,38 @@ public abstract class FlatLaf
//---- class ActiveFont ---------------------------------------------------
private static class ActiveFont
static class ActiveFont
implements ActiveValue
{
private final float scaleFactor;
private final List<String> families;
private final int style;
private final int styleChange;
private final int absoluteSize;
private final int relativeSize;
private final float scaleSize;
// cache (scaled) font
// cache (scaled/derived) font
private Font font;
private Font lastDefaultFont;
ActiveFont( float scaleFactor ) {
this.scaleFactor = scaleFactor;
/**
* @param families list of font families, or {@code null}
* @param style new style of font, or {@code -1}
* @param styleChange derive style of base font; or {@code 0}
* (the lower 16 bits are added; the upper 16 bits are removed)
* @param absoluteSize new size of font, or {@code 0}
* @param relativeSize added to size of base font, or {@code 0}
* @param scaleSize multiply size of base font, or {@code 0}
*/
ActiveFont( List<String> families, int style, int styleChange,
int absoluteSize, int relativeSize, float scaleSize )
{
this.families = families;
this.style = style;
this.styleChange = styleChange;
this.absoluteSize = absoluteSize;
this.relativeSize = relativeSize;
this.scaleSize = scaleSize;
}
@Override
@@ -1186,20 +1204,57 @@ public abstract class FlatLaf
if( lastDefaultFont != defaultFont ) {
lastDefaultFont = defaultFont;
if( scaleFactor != 1 ) {
// scale font
int newFontSize = Math.round( defaultFont.getSize() * scaleFactor );
font = new FontUIResource( defaultFont.deriveFont( (float) newFontSize ) );
} else {
// make sure that font is a UIResource for LaF switching
font = (defaultFont instanceof UIResource)
? defaultFont
: new FontUIResource( defaultFont );
}
font = derive( defaultFont );
// make sure that font is a UIResource for LaF switching
if( !(font instanceof UIResource) )
font = new FontUIResource( font );
}
return font;
}
private Font derive( Font baseFont ) {
int baseStyle = baseFont.getStyle();
int baseSize = baseFont.getSize();
// new style
int newStyle = (style != -1)
? style
: (styleChange != 0)
? baseStyle & ~((styleChange >> 16) & 0xffff) | (styleChange & 0xffff)
: baseStyle;
// new size
int newSize = (absoluteSize > 0)
? UIScale.scale( absoluteSize )
: (relativeSize != 0)
? (baseSize + UIScale.scale( relativeSize ))
: (scaleSize > 0)
? Math.round( baseSize * scaleSize )
: baseSize;
if( newSize <= 0 )
newSize = 1;
// create font for family
if( families != null && !families.isEmpty() ) {
for( String family : families ) {
Font font = createCompositeFont( family, newStyle, newSize );
if( !isFallbackFont( font ) || family.equalsIgnoreCase( Font.DIALOG ) )
return font;
}
}
// derive font
if( newStyle != baseStyle || newSize != baseSize )
return baseFont.deriveFont( newStyle, newSize );
else
return baseFont;
}
private boolean isFallbackFont( Font font ) {
return Font.DIALOG.equalsIgnoreCase( font.getFamily() );
}
}
//---- class ImageIconUIResource ------------------------------------------

97
flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java
View File

@@ -18,11 +18,14 @@ package com.formdev.flatlaf;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Insets;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StreamTokenizer;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -309,7 +312,7 @@ class UIDefaultsLoader
throw new IllegalArgumentException( "property value type '" + newValue.getClass().getName() + "' not supported in references" );
}
enum ValueType { UNKNOWN, STRING, BOOLEAN, CHARACTER, INTEGER, FLOAT, BORDER, ICON, INSETS, DIMENSION, COLOR,
enum ValueType { UNKNOWN, STRING, BOOLEAN, CHARACTER, INTEGER, FLOAT, BORDER, ICON, INSETS, DIMENSION, COLOR, FONT,
SCALEDINTEGER, SCALEDFLOAT, SCALEDINSETS, SCALEDDIMENSION, INSTANCE, CLASS, GRAYFILTER, NULL, LAZY }
private static ValueType[] tempResultValueType = new ValueType[1];
@@ -371,6 +374,7 @@ class UIDefaultsLoader
javaValueTypes.put( Insets.class, ValueType.INSETS );
javaValueTypes.put( Dimension.class, ValueType.DIMENSION );
javaValueTypes.put( Color.class, ValueType.COLOR );
javaValueTypes.put( Font.class, ValueType.FONT );
}
// map java value type to parser value type
@@ -428,6 +432,8 @@ class UIDefaultsLoader
(key.endsWith( ".background" ) || key.endsWith( "Background" ) || key.equals( "background" ) ||
key.endsWith( ".foreground" ) || key.endsWith( "Foreground" ) || key.equals( "foreground" ))) )
valueType = ValueType.COLOR;
else if( key.endsWith( ".font" ) || key.endsWith( "Font" ) || key.equals( "font" ) )
valueType = ValueType.FONT;
else if( key.endsWith( ".border" ) || key.endsWith( "Border" ) || key.equals( "border" ) )
valueType = ValueType.BORDER;
else if( key.endsWith( ".icon" ) || key.endsWith( "Icon" ) || key.equals( "icon" ) )
@@ -461,6 +467,7 @@ class UIDefaultsLoader
case INSETS: return parseInsets( value );
case DIMENSION: return parseDimension( value );
case COLOR: return parseColorOrFunction( value, resolver, true );
case FONT: return parseFont( value );
case SCALEDINTEGER: return parseScaledInteger( value );
case SCALEDFLOAT: return parseScaledFloat( value );
case SCALEDINSETS: return parseScaledInsets( value );
@@ -984,6 +991,94 @@ class UIDefaultsLoader
return new ColorUIResource( newColor );
}
/**
* Syntax: [normal] [bold|+bold|-bold] [italic|+italic|-italic] [<size>|+<incr>|-<decr>|<percent>%] [family[, family]]
*/
private static Object parseFont( String value ) {
int style = -1;
int styleChange = 0;
int absoluteSize = 0;
int relativeSize = 0;
float scaleSize = 0;
List<String> families = null;
// use StreamTokenizer to split string because it supports quoted strings
StreamTokenizer st = new StreamTokenizer( new StringReader( value ) );
st.resetSyntax();
st.wordChars( ' ' + 1, 255 );
st.whitespaceChars( 0, ' ' );
st.whitespaceChars( ',', ',' ); // ignore ','
st.quoteChar( '"' );
st.quoteChar( '\'' );
try {
while( st.nextToken() != StreamTokenizer.TT_EOF ) {
String param = st.sval;
switch( param ) {
// font style
case "normal":
style = 0;
break;
case "bold":
if( style == -1 )
style = 0;
style |= Font.BOLD;
break;
case "italic":
if( style == -1 )
style = 0;
style |= Font.ITALIC;
break;
case "+bold": styleChange |= Font.BOLD; break;
case "-bold": styleChange |= Font.BOLD << 16; break;
case "+italic": styleChange |= Font.ITALIC; break;
case "-italic": styleChange |= Font.ITALIC << 16; break;
default:
char firstChar = param.charAt( 0 );
if( Character.isDigit( firstChar ) || firstChar == '+' || firstChar == '-' ) {
// font size
if( absoluteSize != 0 || relativeSize != 0 || scaleSize != 0 )
throw new IllegalArgumentException( "size specified more than once in '" + value + "'" );
if( firstChar == '+' || firstChar == '-' )
relativeSize = parseInteger( param, true );
else if( param.endsWith( "%" ) )
scaleSize = parseInteger( param.substring( 0, param.length() - 1 ), true ) / 100f;
else
absoluteSize = parseInteger( param, true );
} else {
// font family
if( families == null )
families = Collections.singletonList( param );
else {
if( families.size() == 1 )
families = new ArrayList<>( families );
families.add( param );
}
}
break;
}
}
} catch( IOException ex ) {
throw new IllegalArgumentException( ex );
}
if( style != -1 && styleChange != 0 )
throw new IllegalArgumentException( "can not mix absolute style (e.g. 'bold') with derived style (e.g. '+italic') in '" + value + "'" );
if( styleChange != 0 ) {
if( (styleChange & Font.BOLD) != 0 && (styleChange & (Font.BOLD << 16)) != 0 )
throw new IllegalArgumentException( "can not use '+bold' and '-bold' in '" + value + "'" );
if( (styleChange & Font.ITALIC) != 0 && (styleChange & (Font.ITALIC << 16)) != 0 )
throw new IllegalArgumentException( "can not use '+italic' and '-italic' in '" + value + "'" );
}
return new FlatLaf.ActiveFont( families, style, styleChange, absoluteSize, relativeSize, scaleSize );
}
private static int parsePercentage( String value ) {
if( !value.endsWith( "%" ) )
throw new NumberFormatException( "invalid percentage '" + value + "'" );

1
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -449,6 +449,7 @@ ProgressBar.horizontalSize = 146,4
ProgressBar.verticalSize = 4,146
ProgressBar.cycleTime = 4000
ProgressBar.repaintInterval = 15
ProgressBar.font = -2
#---- RadioButton ----