mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2025-12-09 08:15:09 +03:00
Compare commits
11 Commits
fonts/jetb
...
fonts/jetb
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
45e7022deb | ||
|
|
32dce16363 | ||
|
|
e34b5eafe1 | ||
|
|
4e1e749094 | ||
|
|
ede9293377 | ||
|
|
9101324a1f | ||
|
|
4b844353ee | ||
|
|
2134c19c58 | ||
|
|
c974784ebb | ||
|
|
5eb6961023 | ||
|
|
07cbd8b97b |
1
.github/workflows/fonts.yml
vendored
1
.github/workflows/fonts.yml
vendored
@@ -22,6 +22,7 @@ jobs:
|
||||
- inter
|
||||
- jetbrains-mono
|
||||
- roboto
|
||||
- roboto-mono
|
||||
|
||||
runs-on: ubuntu-latest
|
||||
if: |
|
||||
|
||||
25
CHANGELOG.md
25
CHANGELOG.md
@@ -1,6 +1,31 @@
|
||||
FlatLaf Change Log
|
||||
==================
|
||||
|
||||
## 3.1-SNAPSHOT
|
||||
|
||||
#### New features and improvements
|
||||
|
||||
- Fonts:
|
||||
- Added **Roboto Mono** (https://fonts.google.com/specimen/Roboto+Mono). (PR
|
||||
#639, issue #638)
|
||||
- Updated **JetBrains Mono** to
|
||||
[v2.304](https://github.com/JetBrains/JetBrainsMono/releases/tag/v2.304).
|
||||
|
||||
#### Fixed bugs
|
||||
|
||||
- FlatLaf window decorations:
|
||||
- Fixed inconsistent size of glass pane depending on whether FlatLaf window
|
||||
decorations are used (e.g. Windows 10/11) or not (e.g. macOS). Now the glass
|
||||
pane no longer overlaps the FlatLaf window title bar. (issue #630)
|
||||
- Linux: Fixed broken window resizing on multi-screen setups. (issue #632)
|
||||
- IntelliJ Themes:
|
||||
- Fixed default button hover background in "Solarized Light" theme. (issue
|
||||
#628)
|
||||
- Avoid that accent color affect some colors in some IntelliJ themes. (issue
|
||||
#625)
|
||||
- Styling: Fixed resolving of UI variables in styles that use other variables.
|
||||
|
||||
|
||||
## 3.0
|
||||
|
||||
#### New features and improvements
|
||||
|
||||
@@ -15,6 +15,11 @@ IntelliJ IDEA 2019.2+ and uses almost the same colors and icons.
|
||||
|
||||

|
||||
|
||||
macOS Themes
|
||||
------------
|
||||
|
||||

|
||||
|
||||
|
||||
IntelliJ Platform Themes
|
||||
------------------------
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#Signature file v4.1
|
||||
#Version 2.6
|
||||
#Version 3.0
|
||||
|
||||
CLSS public abstract interface com.formdev.flatlaf.FlatClientProperties
|
||||
fld public final static java.lang.String BUTTON_TYPE = "JButton.buttonType"
|
||||
@@ -86,7 +86,11 @@ fld public final static java.lang.String TEXT_FIELD_TRAILING_COMPONENT = "JTextF
|
||||
fld public final static java.lang.String TEXT_FIELD_TRAILING_ICON = "JTextField.trailingIcon"
|
||||
fld public final static java.lang.String TITLE_BAR_BACKGROUND = "JRootPane.titleBarBackground"
|
||||
fld public final static java.lang.String TITLE_BAR_FOREGROUND = "JRootPane.titleBarForeground"
|
||||
fld public final static java.lang.String TITLE_BAR_SHOW_CLOSE = "JRootPane.titleBarShowClose"
|
||||
fld public final static java.lang.String TITLE_BAR_SHOW_ICON = "JRootPane.titleBarShowIcon"
|
||||
fld public final static java.lang.String TITLE_BAR_SHOW_ICONIFFY = "JRootPane.titleBarShowIconify"
|
||||
fld public final static java.lang.String TITLE_BAR_SHOW_MAXIMIZE = "JRootPane.titleBarShowMaximize"
|
||||
fld public final static java.lang.String TITLE_BAR_SHOW_TITLE = "JRootPane.titleBarShowTitle"
|
||||
fld public final static java.lang.String TREE_PAINT_SELECTION = "JTree.paintSelection"
|
||||
fld public final static java.lang.String TREE_WIDE_SELECTION = "JTree.wideSelection"
|
||||
fld public final static java.lang.String USE_WINDOW_DECORATIONS = "JRootPane.useWindowDecorations"
|
||||
@@ -195,8 +199,13 @@ meth public static boolean isUseNativeWindowDecorations()
|
||||
meth public static boolean setup(javax.swing.LookAndFeel)
|
||||
meth public static boolean supportsNativeWindowDecorations()
|
||||
meth public static java.lang.Object parseDefaultsValue(java.lang.String,java.lang.String,java.lang.Class<?>)
|
||||
meth public static java.lang.String getPreferredFontFamily()
|
||||
meth public static java.lang.String getPreferredLightFontFamily()
|
||||
meth public static java.lang.String getPreferredMonospacedFontFamily()
|
||||
meth public static java.lang.String getPreferredSemiboldFontFamily()
|
||||
meth public static java.util.Map<java.lang.String,java.lang.Class<?>> getStyleableInfos(javax.swing.JComponent)
|
||||
meth public static java.util.Map<java.lang.String,java.lang.String> getGlobalExtraDefaults()
|
||||
meth public static java.util.function.Function<java.lang.String,java.awt.Color> getSystemColorGetter()
|
||||
meth public static javax.swing.UIDefaults$ActiveValue createActiveFontValue(float)
|
||||
meth public static void hideMnemonics()
|
||||
meth public static void initIconColors(javax.swing.UIDefaults,boolean)
|
||||
@@ -209,6 +218,11 @@ meth public static void repaintAllFramesAndDialogs()
|
||||
meth public static void revalidateAndRepaintAllFramesAndDialogs()
|
||||
meth public static void runWithUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>,java.lang.Runnable)
|
||||
meth public static void setGlobalExtraDefaults(java.util.Map<java.lang.String,java.lang.String>)
|
||||
meth public static void setPreferredFontFamily(java.lang.String)
|
||||
meth public static void setPreferredLightFontFamily(java.lang.String)
|
||||
meth public static void setPreferredMonospacedFontFamily(java.lang.String)
|
||||
meth public static void setPreferredSemiboldFontFamily(java.lang.String)
|
||||
meth public static void setSystemColorGetter(java.util.function.Function<java.lang.String,java.awt.Color>)
|
||||
meth public static void setUseNativeWindowDecorations(boolean)
|
||||
meth public static void showMnemonics(java.awt.Component)
|
||||
meth public static void unregisterCustomDefaultsSource(java.io.File)
|
||||
@@ -223,7 +237,7 @@ meth public void setExtraDefaults(java.util.Map<java.lang.String,java.lang.Strin
|
||||
meth public void uninitialize()
|
||||
meth public void unregisterUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>)
|
||||
supr javax.swing.plaf.basic.BasicLookAndFeel
|
||||
hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,extraDefaults,getUIMethod,getUIMethodInitialized,globalExtraDefaults,mnemonicHandler,oldPopupFactory,postInitialization,subMenuUsabilityHelperInstalled,uiDefaultsGetters,updateUIPending
|
||||
hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,extraDefaults,getUIMethod,getUIMethodInitialized,globalExtraDefaults,mnemonicHandler,oldPopupFactory,postInitialization,preferredFontFamily,preferredLightFontFamily,preferredMonospacedFontFamily,preferredSemiboldFontFamily,subMenuUsabilityHelperInstalled,systemColorGetter,uiDefaultsGetters,updateUIPending
|
||||
hcls ActiveFont,FlatUIDefaults,ImageIconUIResource
|
||||
|
||||
CLSS public abstract interface static com.formdev.flatlaf.FlatLaf$DisabledIconProvider
|
||||
@@ -295,6 +309,26 @@ meth public java.lang.String getName()
|
||||
supr com.formdev.flatlaf.FlatLaf
|
||||
hfds theme
|
||||
|
||||
CLSS public com.formdev.flatlaf.themes.FlatMacDarkLaf
|
||||
cons public init()
|
||||
fld public final static java.lang.String NAME = "FlatLaf macOS Dark"
|
||||
meth public boolean isDark()
|
||||
meth public java.lang.String getDescription()
|
||||
meth public java.lang.String getName()
|
||||
meth public static boolean setup()
|
||||
meth public static void installLafInfo()
|
||||
supr com.formdev.flatlaf.FlatDarkLaf
|
||||
|
||||
CLSS public com.formdev.flatlaf.themes.FlatMacLightLaf
|
||||
cons public init()
|
||||
fld public final static java.lang.String NAME = "FlatLaf macOS Light"
|
||||
meth public boolean isDark()
|
||||
meth public java.lang.String getDescription()
|
||||
meth public java.lang.String getName()
|
||||
meth public static boolean setup()
|
||||
meth public static void installLafInfo()
|
||||
supr com.formdev.flatlaf.FlatLightLaf
|
||||
|
||||
CLSS public abstract interface com.formdev.flatlaf.util.AnimatedIcon
|
||||
innr public static AnimationSupport
|
||||
intf javax.swing.Icon
|
||||
@@ -362,6 +396,7 @@ meth public static float clamp(float)
|
||||
meth public static float luma(java.awt.Color)
|
||||
meth public static java.awt.Color darken(java.awt.Color,float)
|
||||
meth public static java.awt.Color desaturate(java.awt.Color,float)
|
||||
meth public static java.awt.Color fade(java.awt.Color,float)
|
||||
meth public static java.awt.Color lighten(java.awt.Color,float)
|
||||
meth public static java.awt.Color mix(java.awt.Color,java.awt.Color,float)
|
||||
meth public static java.awt.Color saturate(java.awt.Color,float)
|
||||
@@ -437,6 +472,17 @@ meth public java.lang.String toString()
|
||||
supr javax.swing.plaf.ColorUIResource
|
||||
hfds baseOfDefaultColorRGB,functions,hasBaseOfDefaultColor
|
||||
|
||||
CLSS public com.formdev.flatlaf.util.FontUtils
|
||||
cons public init()
|
||||
meth public static boolean installFont(java.net.URL)
|
||||
meth public static java.awt.Font getCompositeFont(java.lang.String,int,int)
|
||||
meth public static java.awt.Font[] getAllFonts()
|
||||
meth public static java.lang.String[] getAvailableFontFamilyNames()
|
||||
meth public static void loadFontFamily(java.lang.String)
|
||||
meth public static void registerFontFamilyLoader(java.lang.String,java.lang.Runnable)
|
||||
supr java.lang.Object
|
||||
hfds loadersMap
|
||||
|
||||
CLSS public com.formdev.flatlaf.util.Graphics2DProxy
|
||||
cons public init(java.awt.Graphics2D)
|
||||
meth public boolean drawImage(java.awt.Image,int,int,int,int,int,int,int,int,java.awt.Color,java.awt.image.ImageObserver)
|
||||
@@ -573,7 +619,7 @@ meth public static void drawStringWithYCorrection(javax.swing.JComponent,java.aw
|
||||
meth public static void paintAtScale1x(java.awt.Graphics2D,int,int,int,int,com.formdev.flatlaf.util.HiDPIUtils$Painter)
|
||||
meth public static void paintAtScale1x(java.awt.Graphics2D,javax.swing.JComponent,com.formdev.flatlaf.util.HiDPIUtils$Painter)
|
||||
supr java.lang.Object
|
||||
hfds useTextYCorrection
|
||||
hfds CORRECTION_INTER,CORRECTION_OPEN_SANS,CORRECTION_SEGOE_UI,CORRECTION_TAHOMA,SCALE_FACTORS,useDebugScaleFactor,useTextYCorrection
|
||||
|
||||
CLSS public abstract interface static com.formdev.flatlaf.util.HiDPIUtils$Painter
|
||||
outer com.formdev.flatlaf.util.HiDPIUtils
|
||||
|
||||
@@ -442,6 +442,17 @@ public interface FlatClientProperties
|
||||
*/
|
||||
String TITLE_BAR_FOREGROUND = "JRootPane.titleBarForeground";
|
||||
|
||||
/**
|
||||
* Specifies whether the glass pane should have full height and overlap the title bar,
|
||||
* if FlatLaf window decorations are enabled. Default is {@code false}.
|
||||
* <p>
|
||||
* <strong>Component</strong> {@link javax.swing.JRootPane}<br>
|
||||
* <strong>Value type</strong> {@link java.lang.Boolean}
|
||||
*
|
||||
* @since 3.1
|
||||
*/
|
||||
String GLASS_PANE_FULL_HEIGHT = "JRootPane.glassPaneFullHeight";
|
||||
|
||||
//---- JScrollBar / JScrollPane -------------------------------------------
|
||||
|
||||
/**
|
||||
|
||||
@@ -334,7 +334,7 @@ class UIDefaultsLoader
|
||||
if( newValue == null )
|
||||
throw new IllegalArgumentException( "variable '" + value + "' not found" );
|
||||
|
||||
return newValue;
|
||||
return resolveValueFromUIManager( newValue );
|
||||
}
|
||||
|
||||
if( !value.startsWith( PROPERTY_PREFIX ) )
|
||||
|
||||
@@ -362,6 +362,10 @@ public class FlatRootPaneUI
|
||||
if( titlePane != null )
|
||||
titlePane.titleBarColorsChanged();
|
||||
break;
|
||||
|
||||
case FlatClientProperties.GLASS_PANE_FULL_HEIGHT:
|
||||
rootPane.revalidate();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -442,11 +446,11 @@ public class FlatRootPaneUI
|
||||
int width = rootPane.getWidth() - insets.left - insets.right;
|
||||
int height = rootPane.getHeight() - insets.top - insets.bottom;
|
||||
|
||||
// layered pane
|
||||
if( rootPane.getLayeredPane() != null )
|
||||
rootPane.getLayeredPane().setBounds( x, y, width, height );
|
||||
if( rootPane.getGlassPane() != null )
|
||||
rootPane.getGlassPane().setBounds( x, y, width, height );
|
||||
|
||||
// title pane
|
||||
int nextY = 0;
|
||||
if( titlePane != null ) {
|
||||
int prefHeight = !isFullScreen ? titlePane.getPreferredSize().height : 0;
|
||||
@@ -454,6 +458,15 @@ public class FlatRootPaneUI
|
||||
nextY += prefHeight;
|
||||
}
|
||||
|
||||
// glass pane
|
||||
if( rootPane.getGlassPane() != null ) {
|
||||
boolean fullHeight = FlatClientProperties.clientPropertyBoolean(
|
||||
rootPane, FlatClientProperties.GLASS_PANE_FULL_HEIGHT, false );
|
||||
int offset = fullHeight ? 0 : nextY;
|
||||
rootPane.getGlassPane().setBounds( x, y + offset, width, height - offset );
|
||||
}
|
||||
|
||||
// menu bar
|
||||
JMenuBar menuBar = rootPane.getJMenuBar();
|
||||
if( menuBar != null && menuBar.isVisible() ) {
|
||||
boolean embedded = !isFullScreen && titlePane != null && titlePane.isMenuBarEmbedded();
|
||||
@@ -467,10 +480,12 @@ public class FlatRootPaneUI
|
||||
}
|
||||
}
|
||||
|
||||
// content pane
|
||||
Container contentPane = rootPane.getContentPane();
|
||||
if( contentPane != null )
|
||||
contentPane.setBounds( 0, nextY, width, Math.max( height - nextY, 0 ) );
|
||||
|
||||
// title pane
|
||||
if( titlePane != null )
|
||||
titlePane.menuBarLayouted();
|
||||
}
|
||||
|
||||
@@ -606,9 +606,10 @@ debug*/
|
||||
if( resizeDir == S_RESIZE_CURSOR || resizeDir == SW_RESIZE_CURSOR || resizeDir == SE_RESIZE_CURSOR ) {
|
||||
newBounds.height = (yOnScreen + dragBottomOffset) - newBounds.y;
|
||||
if( limitToParentBounds() ) {
|
||||
int parentHeight = getParentBounds().height;
|
||||
if( newBounds.y + newBounds.height > parentHeight )
|
||||
newBounds.height = parentHeight - newBounds.y;
|
||||
Rectangle parentBounds = getParentBounds();
|
||||
int parentBottomY = parentBounds.y + parentBounds.height;
|
||||
if( newBounds.y + newBounds.height > parentBottomY )
|
||||
newBounds.height = parentBottomY - newBounds.y;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -624,9 +625,10 @@ debug*/
|
||||
if( resizeDir == E_RESIZE_CURSOR || resizeDir == NE_RESIZE_CURSOR || resizeDir == SE_RESIZE_CURSOR ) {
|
||||
newBounds.width = (xOnScreen + dragRightOffset) - newBounds.x;
|
||||
if( limitToParentBounds() ) {
|
||||
int parentWidth = getParentBounds().width;
|
||||
if( newBounds.x + newBounds.width > parentWidth )
|
||||
newBounds.width = parentWidth - newBounds.x;
|
||||
Rectangle parentBounds = getParentBounds();
|
||||
int parentRightX = parentBounds.x + parentBounds.width;
|
||||
if( newBounds.x + newBounds.width > parentRightX )
|
||||
newBounds.width = parentRightX - newBounds.x;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -44,6 +44,12 @@ info = lazy(ToolTip.background)
|
||||
infoText = lazy(ToolTip.foreground)
|
||||
|
||||
|
||||
#---- variables ----
|
||||
|
||||
# make sure that accent color (set via FlatLaf.setSystemColorGetter()) is ignored
|
||||
@accentColor = null
|
||||
|
||||
|
||||
#---- Button ----
|
||||
|
||||
Button.startBackground = $Button.background
|
||||
@@ -213,6 +219,7 @@ ToggleButton.endBackground = $ToggleButton.background
|
||||
[Solarized_Dark---4lex4]Component.accentColor = lazy(TabbedPane.underlineColor)
|
||||
[Solarized_Dark---4lex4]Slider.focusedColor = fade($Component.focusColor,80%,derived)
|
||||
|
||||
[Solarized_Light---4lex4]Button.default.hoverBackground = darken($Button.default.background,3%,derived)
|
||||
[Solarized_Light---4lex4]Component.accentColor = lazy(TabbedPane.underlineColor)
|
||||
|
||||
[vuesion-theme]Component.accentColor = lazy(Button.default.endBackground)
|
||||
|
||||
@@ -29,6 +29,7 @@ import javax.swing.table.JTableHeader;
|
||||
import org.junit.jupiter.api.AfterAll;
|
||||
import org.junit.jupiter.api.BeforeAll;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import com.formdev.flatlaf.FlatLaf;
|
||||
import com.formdev.flatlaf.icons.*;
|
||||
import com.formdev.flatlaf.util.ColorFunctions;
|
||||
|
||||
@@ -39,12 +40,20 @@ public class TestFlatStyling
|
||||
{
|
||||
@BeforeAll
|
||||
static void setup() {
|
||||
HashMap<String, String> globalExtraDefaults = new HashMap<>();
|
||||
globalExtraDefaults.put( "@var1", "#f00" );
|
||||
globalExtraDefaults.put( "@var2", "@var1" );
|
||||
globalExtraDefaults.put( "var2Resolved", "@var2" );
|
||||
FlatLaf.setGlobalExtraDefaults( globalExtraDefaults );
|
||||
|
||||
TestUtils.setup( false );
|
||||
}
|
||||
|
||||
@AfterAll
|
||||
static void cleanup() {
|
||||
TestUtils.cleanup();
|
||||
|
||||
FlatLaf.setGlobalExtraDefaults( null );
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -171,6 +180,13 @@ public class TestFlatStyling
|
||||
"saturate(darken(@background,20%),10%)" );
|
||||
}
|
||||
|
||||
@Test
|
||||
void parseRecursiveVariables() {
|
||||
Color background = UIManager.getColor( "var2Resolved" );
|
||||
|
||||
testColorStyle( background.getRGB(), "@var2" );
|
||||
}
|
||||
|
||||
private void testColorStyle( int expectedRGB, String style ) {
|
||||
testStyle( "background", new Color( expectedRGB, (expectedRGB & 0xff000000) != 0 ), style );
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ dependencies {
|
||||
implementation( project( ":flatlaf-fonts-inter" ) )
|
||||
implementation( project( ":flatlaf-fonts-jetbrains-mono" ) )
|
||||
implementation( project( ":flatlaf-fonts-roboto" ) )
|
||||
implementation( project( ":flatlaf-fonts-roboto-mono" ) )
|
||||
implementation( project( ":flatlaf-intellij-themes" ) )
|
||||
implementation( "com.miglayout:miglayout-swing:5.3" )
|
||||
implementation( "com.jgoodies:jgoodies-forms:1.9.0" )
|
||||
@@ -38,6 +39,7 @@ tasks {
|
||||
dependsOn( ":flatlaf-fonts-inter:jar" )
|
||||
dependsOn( ":flatlaf-fonts-jetbrains-mono:jar" )
|
||||
dependsOn( ":flatlaf-fonts-roboto:jar" )
|
||||
dependsOn( ":flatlaf-fonts-roboto-mono:jar" )
|
||||
dependsOn( ":flatlaf-intellij-themes:jar" )
|
||||
// dependsOn( ":flatlaf-natives-jna:jar" )
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@ import com.formdev.flatlaf.extras.FlatUIDefaultsInspector;
|
||||
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
|
||||
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
|
||||
import com.formdev.flatlaf.fonts.roboto.FlatRobotoFont;
|
||||
import com.formdev.flatlaf.fonts.roboto_mono.FlatRobotoMonoFont;
|
||||
import com.formdev.flatlaf.util.SystemInfo;
|
||||
|
||||
/**
|
||||
@@ -75,6 +76,7 @@ public class FlatLafDemo
|
||||
FlatInterFont.installLazy();
|
||||
FlatJetBrainsMonoFont.installLazy();
|
||||
FlatRobotoFont.installLazy();
|
||||
FlatRobotoMonoFont.installLazy();
|
||||
|
||||
// use Inter font by default
|
||||
// FlatLaf.setPreferredFontFamily( FlatInterFont.FAMILY );
|
||||
@@ -89,6 +91,9 @@ public class FlatLafDemo
|
||||
// use JetBrains Mono font
|
||||
// FlatLaf.setPreferredMonospacedFontFamily( FlatJetBrainsMonoFont.FAMILY );
|
||||
|
||||
// use Roboto Mono font
|
||||
// FlatLaf.setPreferredMonospacedFontFamily( FlatRobotoMonoFont.FAMILY );
|
||||
|
||||
// application specific UI defaults
|
||||
FlatLaf.registerCustomDefaultsSource( "com.formdev.flatlaf.demo" );
|
||||
|
||||
|
||||
@@ -108,6 +108,7 @@ public class FlatInspector
|
||||
private Window window;
|
||||
|
||||
private boolean enabled;
|
||||
private Object oldGlassPaneFullHeight;
|
||||
private Component lastComponent;
|
||||
private int lastX;
|
||||
private int lastY;
|
||||
@@ -258,6 +259,14 @@ public class FlatInspector
|
||||
|
||||
this.enabled = enabled;
|
||||
|
||||
// make sure that glass pane has full height if enabled
|
||||
if( enabled ) {
|
||||
oldGlassPaneFullHeight = rootPane.getClientProperty( FlatClientProperties.GLASS_PANE_FULL_HEIGHT );
|
||||
rootPane.putClientProperty( FlatClientProperties.GLASS_PANE_FULL_HEIGHT, true );
|
||||
rootPane.validate();
|
||||
} else
|
||||
rootPane.putClientProperty( FlatClientProperties.GLASS_PANE_FULL_HEIGHT, oldGlassPaneFullHeight );
|
||||
|
||||
// make sure that glass pane is not opaque, which is not the case in WebLaF
|
||||
((JComponent)rootPane.getGlassPane()).setOpaque( false );
|
||||
|
||||
|
||||
@@ -7,3 +7,4 @@ easy-to-use and redistributable JARs.
|
||||
- [Inter](flatlaf-fonts-inter) font
|
||||
- [JetBrains Mono](flatlaf-fonts-jetbrains-mono) font
|
||||
- [Roboto](flatlaf-fonts-roboto) font
|
||||
- [Roboto Mono](flatlaf-fonts-roboto-mono) font
|
||||
|
||||
@@ -91,10 +91,6 @@ Font font = FontUtils.getCompositeFont( FlatInterFont.FAMILY, Font.PLAIN, 12 );
|
||||
Download
|
||||
--------
|
||||
|
||||
Not yet available.
|
||||
|
||||
<!--
|
||||
|
||||
FlatLaf Fonts binaries are available on **Maven Central**.
|
||||
|
||||
If you use Maven or Gradle, add a dependency with following coordinates to your
|
||||
@@ -107,5 +103,3 @@ build script:
|
||||
Otherwise download `flatlaf-fonts-inter-<version>.jar` here:
|
||||
|
||||
[](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-inter)
|
||||
|
||||
-->
|
||||
|
||||
@@ -72,10 +72,6 @@ Font font = FontUtils.getCompositeFont( FlatJetBrainsMonoFont.FAMILY, Font.PLAIN
|
||||
Download
|
||||
--------
|
||||
|
||||
Not yet available.
|
||||
|
||||
<!--
|
||||
|
||||
FlatLaf Fonts binaries are available on **Maven Central**.
|
||||
|
||||
If you use Maven or Gradle, add a dependency with following coordinates to your
|
||||
@@ -88,5 +84,3 @@ build script:
|
||||
Otherwise download `flatlaf-fonts-jetbrains-mono-<version>.jar` here:
|
||||
|
||||
[](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-jetbrains-mono)
|
||||
|
||||
-->
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
// For maven compatibility, <font-version> should be in format <major>.<minor>[.<micro>].
|
||||
// <build-number> is optional and should be incremented only if a new release is
|
||||
// necessary, but the <font-version> has not changed.
|
||||
version = "2.242"
|
||||
version = "2.304"
|
||||
|
||||
if( !rootProject.hasProperty( "release" ) )
|
||||
version = version.toString() + "-SNAPSHOT"
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,8 +1,8 @@
|
||||
Copyright 2020 The JetBrains Mono Project Authors (https://github.com/JetBrains/JetBrainsMono)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
|
||||
This license is copied below, and is also available with a FAQ at: https://scripts.sil.org/OFL
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://scripts.sil.org/OFL
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
@@ -18,7 +18,7 @@ with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
|
||||
86
flatlaf-fonts/flatlaf-fonts-roboto-mono/README.md
Normal file
86
flatlaf-fonts/flatlaf-fonts-roboto-mono/README.md
Normal file
@@ -0,0 +1,86 @@
|
||||
Roboto Mono font
|
||||
================
|
||||
|
||||
This sub-project contains fonts from the Roboto Mono font family and bundles
|
||||
them into an easy-to-use and redistributable JAR.
|
||||
|
||||
Font home page: https://fonts.google.com/specimen/Roboto+Mono
|
||||
|
||||
GitHub project: https://github.com/googlefonts/RobotoMono
|
||||
|
||||
License:
|
||||
[Apache License, Version 2.0](src/main/resources/com/formdev/flatlaf/fonts/roboto_mono/LICENSE.txt)
|
||||
|
||||
|
||||
How to install?
|
||||
---------------
|
||||
|
||||
Invoke following once (e.g. in your `main()` method; on AWT thread).
|
||||
|
||||
For lazy loading use:
|
||||
|
||||
~~~java
|
||||
FlatRobotoMonoFont.installLazy();
|
||||
~~~
|
||||
|
||||
Or load immediately with:
|
||||
|
||||
~~~java
|
||||
FlatRobotoMonoFont.install();
|
||||
~~~
|
||||
|
||||
|
||||
How to use?
|
||||
-----------
|
||||
|
||||
Use as application monospaced font (invoke before setting up FlatLaf):
|
||||
|
||||
~~~java
|
||||
FlatLaf.setPreferredMonospacedFontFamily( FlatRobotoMonoFont.FAMILY );
|
||||
~~~
|
||||
|
||||
Create single fonts:
|
||||
|
||||
~~~java
|
||||
// basic styles
|
||||
new Font( FlatRobotoMonoFont.FAMILY, Font.PLAIN, 12 );
|
||||
new Font( FlatRobotoMonoFont.FAMILY, Font.ITALIC, 12 );
|
||||
new Font( FlatRobotoMonoFont.FAMILY, Font.BOLD, 12 );
|
||||
new Font( FlatRobotoMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 12 );
|
||||
~~~
|
||||
|
||||
If using lazy loading, invoke one of following before creating the font:
|
||||
|
||||
~~~java
|
||||
FontUtils.loadFontFamily( FlatRobotoMonoFont.FAMILY );
|
||||
~~~
|
||||
|
||||
E.g.:
|
||||
|
||||
~~~java
|
||||
FontUtils.loadFontFamily( FlatRobotoMonoFont.FAMILY );
|
||||
Font font = new Font( FlatRobotoMonoFont.FAMILY, Font.PLAIN, 12 );
|
||||
~~~
|
||||
|
||||
Or use following:
|
||||
|
||||
~~~java
|
||||
Font font = FontUtils.getCompositeFont( FlatRobotoMonoFont.FAMILY, Font.PLAIN, 12 );
|
||||
~~~
|
||||
|
||||
|
||||
Download
|
||||
--------
|
||||
|
||||
FlatLaf Fonts binaries are available on **Maven Central**.
|
||||
|
||||
If you use Maven or Gradle, add a dependency with following coordinates to your
|
||||
build script:
|
||||
|
||||
groupId: com.formdev
|
||||
artifactId: flatlaf-fonts-roboto-mono
|
||||
version: (see button below)
|
||||
|
||||
Otherwise download `flatlaf-fonts-roboto-mono-<version>.jar` here:
|
||||
|
||||
[](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-roboto-mono)
|
||||
69
flatlaf-fonts/flatlaf-fonts-roboto-mono/build.gradle.kts
Normal file
69
flatlaf-fonts/flatlaf-fonts-roboto-mono/build.gradle.kts
Normal file
@@ -0,0 +1,69 @@
|
||||
/*
|
||||
* Copyright 2023 FormDev Software GmbH
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
// Version format: <font-version>[-<build-number>]
|
||||
// For maven compatibility, <font-version> should be in format <major>.<minor>[.<micro>].
|
||||
// <build-number> is optional and should be incremented only if a new release is
|
||||
// necessary, but the <font-version> has not changed.
|
||||
version = "3.000"
|
||||
|
||||
if( !rootProject.hasProperty( "release" ) )
|
||||
version = version.toString() + "-SNAPSHOT"
|
||||
|
||||
|
||||
plugins {
|
||||
`java-library`
|
||||
`flatlaf-module-info`
|
||||
`flatlaf-publish`
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation( project( ":flatlaf-core" ) )
|
||||
|
||||
testImplementation( "org.junit.jupiter:junit-jupiter-api:5.7.2" )
|
||||
testImplementation( "org.junit.jupiter:junit-jupiter-params" )
|
||||
testRuntimeOnly( "org.junit.jupiter:junit-jupiter-engine" )
|
||||
}
|
||||
|
||||
flatlafModuleInfo {
|
||||
dependsOn( ":flatlaf-core:jar" )
|
||||
}
|
||||
|
||||
java {
|
||||
withSourcesJar()
|
||||
withJavadocJar()
|
||||
}
|
||||
|
||||
tasks {
|
||||
named<Jar>( "sourcesJar" ) {
|
||||
exclude( "**/*.ttf", "**/*.otf" )
|
||||
}
|
||||
|
||||
test {
|
||||
useJUnitPlatform()
|
||||
testLogging.exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
|
||||
}
|
||||
|
||||
withType<PublishToMavenRepository>().configureEach {
|
||||
onlyIf { !rootProject.hasProperty( "skipFonts" ) }
|
||||
}
|
||||
}
|
||||
|
||||
flatlafPublish {
|
||||
artifactId = "flatlaf-fonts-roboto-mono"
|
||||
name = "FlatLaf Roboto Mono Fonts Pack"
|
||||
description = "Flat Look and Feel Roboto Mono Fonts Pack"
|
||||
}
|
||||
@@ -0,0 +1,131 @@
|
||||
/*
|
||||
* Copyright 2023 FormDev Software GmbH
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.formdev.flatlaf.fonts.roboto_mono;
|
||||
|
||||
import com.formdev.flatlaf.util.FontUtils;
|
||||
|
||||
/**
|
||||
* The Roboto Mono font family.
|
||||
* <p>
|
||||
* Font home page: <a href="https://fonts.google.com/specimen/Roboto+Mono">https://fonts.google.com/specimen/Roboto+Mono</a><br>
|
||||
* GitHub project: <a href="https://github.com/googlefonts/RobotoMono">https://github.com/googlefonts/RobotoMono</a>
|
||||
* <p>
|
||||
* To install the font, invoke following once (e.g. in your {@code main()} method; on AWT thread).
|
||||
* <p>
|
||||
* For lazy loading use:
|
||||
* <pre>{@code
|
||||
* FlatRobotoMonoFont.installLazy();
|
||||
* }</pre>
|
||||
* <p>
|
||||
* Or load immediately with:
|
||||
* <pre>{@code
|
||||
* FlatRobotoMonoFont.install();
|
||||
* }</pre>
|
||||
* <p>
|
||||
* Use as application monospaced font (invoke before setting up FlatLaf):
|
||||
* <pre>{@code
|
||||
* FlatLaf.setPreferredMonospacedFontFamily( FlatRobotoMonoFont.FAMILY );
|
||||
* }</pre>
|
||||
* <p>
|
||||
* Create single fonts:
|
||||
* <pre>{@code
|
||||
* new Font( FlatRobotoMonoFont.FAMILY, Font.PLAIN, 12 );
|
||||
* new Font( FlatRobotoMonoFont.FAMILY, Font.ITALIC, 12 );
|
||||
* new Font( FlatRobotoMonoFont.FAMILY, Font.BOLD, 12 );
|
||||
* new Font( FlatRobotoMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 12 );
|
||||
* }</pre>
|
||||
* <p>
|
||||
* If using lazy loading, invoke following before creating the font:
|
||||
* <pre>{@code
|
||||
* FontUtils.loadFontFamily( FlatRobotoMonoFont.FAMILY );
|
||||
* }</pre>
|
||||
* <p>
|
||||
* E.g.:
|
||||
* <pre>{@code
|
||||
* FontUtils.loadFontFamily( FlatRobotoMonoFont.FAMILY );
|
||||
* Font font = new Font( FlatRobotoMonoFont.FAMILY, Font.PLAIN, 12 );
|
||||
* }</pre>
|
||||
* <p>
|
||||
* Or use following:
|
||||
* <pre>{@code
|
||||
* Font font = FontUtils.getCompositeFont( FlatRobotoMonoFont.FAMILY, Font.PLAIN, 12 );
|
||||
* }</pre>
|
||||
*
|
||||
* @author Karl Tauber
|
||||
*/
|
||||
public class FlatRobotoMonoFont
|
||||
{
|
||||
/**
|
||||
* Family name for basic styles (regular, italic and bold).
|
||||
* <p>
|
||||
* Usage:
|
||||
* <pre>{@code
|
||||
* new Font( FlatRobotoMonoFont.FAMILY, Font.PLAIN, 12 );
|
||||
* new Font( FlatRobotoMonoFont.FAMILY, Font.ITALIC, 12 );
|
||||
* new Font( FlatRobotoMonoFont.FAMILY, Font.BOLD, 12 );
|
||||
* new Font( FlatRobotoMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 12 );
|
||||
* }</pre>
|
||||
*/
|
||||
public static final String FAMILY = "Roboto Mono";
|
||||
|
||||
/**
|
||||
* Use for {@link #installStyle(String)} to install single font styles.
|
||||
*/
|
||||
public static final String
|
||||
// basic styles
|
||||
STYLE_REGULAR = "RobotoMono-Regular.ttf",
|
||||
STYLE_ITALIC = "RobotoMono-Italic.ttf",
|
||||
STYLE_BOLD = "RobotoMono-Bold.ttf",
|
||||
STYLE_BOLD_ITALIC = "RobotoMono-BoldItalic.ttf";
|
||||
|
||||
|
||||
private FlatRobotoMonoFont() {}
|
||||
|
||||
/**
|
||||
* Registers the fonts for lazy loading via {@link FontUtils#registerFontFamilyLoader(String, Runnable)}.
|
||||
* <p>
|
||||
* This is the preferred method (when using FlatLaf) to avoid unnecessary loading of maybe unused fonts.
|
||||
* <p>
|
||||
* <strong>Note</strong>: When using '{@code new Font(...)}', you need to first invoke
|
||||
* {@link FontUtils#loadFontFamily(String)} to ensure that the font family is loaded.
|
||||
* When FlatLaf loads a font, or when using {@link FontUtils#getCompositeFont(String, int, int)},
|
||||
* this is done automatically.
|
||||
*/
|
||||
public static void installLazy() {
|
||||
FontUtils.registerFontFamilyLoader( FAMILY, FlatRobotoMonoFont::install );
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates and registers the fonts for all styles.
|
||||
* <p>
|
||||
* When using FlatLaf, consider using {@link #installLazy()}.
|
||||
*/
|
||||
public static void install() {
|
||||
installStyle( STYLE_REGULAR );
|
||||
installStyle( STYLE_ITALIC );
|
||||
installStyle( STYLE_BOLD );
|
||||
installStyle( STYLE_BOLD_ITALIC );
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates and registers the font for the given style.
|
||||
* See {@code STYLE_} constants.
|
||||
*/
|
||||
public static boolean installStyle( String name ) {
|
||||
return FontUtils.installFont( FlatRobotoMonoFont.class.getResource( name ) );
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
/*
|
||||
* Copyright 2023 FormDev Software GmbH
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @author Karl Tauber
|
||||
*/
|
||||
module com.formdev.flatlaf.fonts.roboto_mono {
|
||||
requires java.desktop;
|
||||
requires com.formdev.flatlaf;
|
||||
|
||||
exports com.formdev.flatlaf.fonts.roboto_mono;
|
||||
|
||||
opens com.formdev.flatlaf.fonts.roboto_mono;
|
||||
}
|
||||
@@ -0,0 +1,202 @@
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,44 @@
|
||||
/*
|
||||
* Copyright 2023 FormDev Software GmbH
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.formdev.flatlaf.fonts.roboto_mono;
|
||||
|
||||
import java.awt.Font;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
|
||||
/**
|
||||
* @author Karl Tauber
|
||||
*/
|
||||
class TestFlatRobotoMonoFont
|
||||
{
|
||||
@Test
|
||||
void testFont() {
|
||||
FlatRobotoMonoFont.install();
|
||||
|
||||
testFont( FlatRobotoMonoFont.FAMILY, Font.PLAIN, 13 );
|
||||
testFont( FlatRobotoMonoFont.FAMILY, Font.ITALIC, 13 );
|
||||
testFont( FlatRobotoMonoFont.FAMILY, Font.BOLD, 13 );
|
||||
testFont( FlatRobotoMonoFont.FAMILY, Font.BOLD | Font.ITALIC, 13 );
|
||||
}
|
||||
|
||||
private void testFont( String family, int style, int size ) {
|
||||
Font actual = new Font( family, style, size );
|
||||
assertEquals( family, actual.getFamily() );
|
||||
assertEquals( style, actual.getStyle() );
|
||||
assertEquals( size, actual.getSize() );
|
||||
}
|
||||
}
|
||||
@@ -88,10 +88,6 @@ Font font = FontUtils.getCompositeFont( FlatRobotoFont.FAMILY, Font.PLAIN, 12 );
|
||||
Download
|
||||
--------
|
||||
|
||||
Not yet available.
|
||||
|
||||
<!--
|
||||
|
||||
FlatLaf Fonts binaries are available on **Maven Central**.
|
||||
|
||||
If you use Maven or Gradle, add a dependency with following coordinates to your
|
||||
@@ -104,5 +100,3 @@ build script:
|
||||
Otherwise download `flatlaf-fonts-roboto-<version>.jar` here:
|
||||
|
||||
[](https://maven-badges.herokuapp.com/maven-central/com.formdev/flatlaf-fonts-roboto)
|
||||
|
||||
-->
|
||||
|
||||
@@ -27,6 +27,7 @@ dependencies {
|
||||
implementation( project( ":flatlaf-fonts-inter" ) )
|
||||
implementation( project( ":flatlaf-fonts-jetbrains-mono" ) )
|
||||
implementation( project( ":flatlaf-fonts-roboto" ) )
|
||||
implementation( project( ":flatlaf-fonts-roboto-mono" ) )
|
||||
implementation( project( ":flatlaf-swingx" ) )
|
||||
implementation( project( ":flatlaf-jide-oss" ) )
|
||||
implementation( project( ":flatlaf-intellij-themes" ) )
|
||||
|
||||
@@ -25,6 +25,7 @@ import javax.swing.*;
|
||||
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
|
||||
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
|
||||
import com.formdev.flatlaf.fonts.roboto.FlatRobotoFont;
|
||||
import com.formdev.flatlaf.fonts.roboto_mono.FlatRobotoMonoFont;
|
||||
import com.formdev.flatlaf.util.FontUtils;
|
||||
import com.formdev.flatlaf.util.UIScale;
|
||||
import net.miginfocom.swing.*;
|
||||
@@ -40,6 +41,7 @@ public class FlatFontsTest
|
||||
FlatInterFont.installLazy();
|
||||
FlatJetBrainsMonoFont.installLazy();
|
||||
FlatRobotoFont.installLazy();
|
||||
FlatRobotoMonoFont.installLazy();
|
||||
|
||||
FlatTestFrame frame = FlatTestFrame.create( args, "FlatFontsTest" );
|
||||
frame.showFrame( FlatFontsTest::new );
|
||||
|
||||
@@ -31,6 +31,7 @@ import com.formdev.flatlaf.FlatSystemProperties;
|
||||
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
|
||||
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
|
||||
import com.formdev.flatlaf.fonts.roboto.FlatRobotoFont;
|
||||
import com.formdev.flatlaf.fonts.roboto_mono.FlatRobotoMonoFont;
|
||||
import com.formdev.flatlaf.util.FontUtils;
|
||||
import com.formdev.flatlaf.util.Graphics2DProxy;
|
||||
import com.formdev.flatlaf.util.HiDPIUtils;
|
||||
@@ -53,6 +54,7 @@ public class FlatPaintingStringTest
|
||||
FlatInterFont.installLazy();
|
||||
FlatJetBrainsMonoFont.installLazy();
|
||||
FlatRobotoFont.installLazy();
|
||||
FlatRobotoMonoFont.installLazy();
|
||||
|
||||
FlatTestFrame frame = FlatTestFrame.create( args, "FlatPaintingStringTest" );
|
||||
|
||||
@@ -91,7 +93,7 @@ public class FlatPaintingStringTest
|
||||
|
||||
// monospaced
|
||||
"Monospaced", "Consolas", "Courier New", "Menlo", "Liberation Mono", "Ubuntu Mono",
|
||||
FlatJetBrainsMonoFont.FAMILY,
|
||||
FlatJetBrainsMonoFont.FAMILY, FlatRobotoMonoFont.FAMILY,
|
||||
};
|
||||
Arrays.sort( families, String.CASE_INSENSITIVE_ORDER );
|
||||
DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>();
|
||||
@@ -242,7 +244,7 @@ public class FlatPaintingStringTest
|
||||
panel1.add(fontLabel, "cell 0 0");
|
||||
|
||||
//---- fontField ----
|
||||
fontField.setMaximumRowCount(20);
|
||||
fontField.setMaximumRowCount(25);
|
||||
fontField.addActionListener(e -> fontChanged());
|
||||
panel1.add(fontField, "cell 1 0");
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ new FormModel {
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JComboBox" ) {
|
||||
name: "fontField"
|
||||
"maximumRowCount": 20
|
||||
"maximumRowCount": 25
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
"JavaCodeGenerator.typeParameters": "String"
|
||||
|
||||
@@ -134,6 +134,12 @@ public class UIDefaultsDump
|
||||
// ex.printStackTrace();
|
||||
// }
|
||||
|
||||
// used to test whether system color influences IntelliJ themes
|
||||
// (first run without this, save result, run with this and compare outputs)
|
||||
// FlatLaf.setSystemColorGetter( name -> {
|
||||
// return Color.red;
|
||||
// } );
|
||||
|
||||
// dumpIntelliJThemes( dir );
|
||||
|
||||
// JIDE
|
||||
|
||||
@@ -25,6 +25,7 @@ dependencies {
|
||||
implementation( project( ":flatlaf-fonts-inter" ) )
|
||||
implementation( project( ":flatlaf-fonts-jetbrains-mono" ) )
|
||||
implementation( project( ":flatlaf-fonts-roboto" ) )
|
||||
implementation( project( ":flatlaf-fonts-roboto-mono" ) )
|
||||
|
||||
implementation( "com.miglayout:miglayout-swing:5.3" )
|
||||
implementation( "com.fifesoft:rsyntaxtextarea:3.1.4" )
|
||||
@@ -38,6 +39,7 @@ tasks {
|
||||
dependsOn( ":flatlaf-fonts-inter:jar" )
|
||||
dependsOn( ":flatlaf-fonts-jetbrains-mono:jar" )
|
||||
dependsOn( ":flatlaf-fonts-roboto:jar" )
|
||||
dependsOn( ":flatlaf-fonts-roboto-mono:jar" )
|
||||
|
||||
manifest {
|
||||
attributes( "Main-Class" to "com.formdev.flatlaf.themeeditor.FlatLafThemeEditor" )
|
||||
|
||||
@@ -66,6 +66,7 @@ import com.formdev.flatlaf.extras.components.*;
|
||||
import com.formdev.flatlaf.fonts.inter.FlatInterFont;
|
||||
import com.formdev.flatlaf.fonts.jetbrains_mono.FlatJetBrainsMonoFont;
|
||||
import com.formdev.flatlaf.fonts.roboto.FlatRobotoFont;
|
||||
import com.formdev.flatlaf.fonts.roboto_mono.FlatRobotoMonoFont;
|
||||
import com.formdev.flatlaf.icons.FlatClearIcon;
|
||||
import com.formdev.flatlaf.ui.FlatUIUtils;
|
||||
import com.formdev.flatlaf.util.StringUtils;
|
||||
@@ -111,6 +112,7 @@ class FlatThemeFileEditor
|
||||
FlatInterFont.installLazy();
|
||||
FlatJetBrainsMonoFont.installLazy();
|
||||
FlatRobotoFont.installLazy();
|
||||
FlatRobotoMonoFont.installLazy();
|
||||
|
||||
FlatLaf.registerCustomDefaultsSource( "com.formdev.flatlaf.themeeditor" );
|
||||
|
||||
|
||||
BIN
images/flat_macos_dark.png
Normal file
BIN
images/flat_macos_dark.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 52 KiB |
BIN
images/flat_macos_light.png
Normal file
BIN
images/flat_macos_light.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 53 KiB |
BIN
images/flat_macos_themes.png
Normal file
BIN
images/flat_macos_themes.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 106 KiB |
@@ -28,6 +28,7 @@ include( "flatlaf-theme-editor" )
|
||||
includeProject( "flatlaf-fonts-inter", "flatlaf-fonts/flatlaf-fonts-inter" )
|
||||
includeProject( "flatlaf-fonts-jetbrains-mono", "flatlaf-fonts/flatlaf-fonts-jetbrains-mono" )
|
||||
includeProject( "flatlaf-fonts-roboto", "flatlaf-fonts/flatlaf-fonts-roboto" )
|
||||
includeProject( "flatlaf-fonts-roboto-mono", "flatlaf-fonts/flatlaf-fonts-roboto-mono" )
|
||||
|
||||
includeProject( "flatlaf-natives-windows", "flatlaf-natives/flatlaf-natives-windows" )
|
||||
includeProject( "flatlaf-natives-linux", "flatlaf-natives/flatlaf-natives-linux" )
|
||||
|
||||
Reference in New Issue
Block a user