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

Typography: no longer use Consolas or Courier New as monospaced font on Windows because they have bad vertically placement

Browse Source
This commit is contained in:
Karl Tauber
2022-07-01 23:48:04 +02:00
parent b7761f4b71
commit b82ee2ef61
4 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -10,6 +10,8 @@ FlatLaf Change Log
- TableHeader: Fixed exception when changing table structure (e.g. removing - TableHeader: Fixed exception when changing table structure (e.g. removing
column) from a table header popup menu action. (issue #532) column) from a table header popup menu action. (issue #532)
- `HiDPIUtils.paintAtScale1x()` now supports rotated graphics. (issue #557) - `HiDPIUtils.paintAtScale1x()` now supports rotated graphics. (issue #557)
- Typography: No longer use `Consolas` or `Courier New` as monospaced font on
Windows because they have bad vertically placement.
## 2.3 ## 2.3

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

@@ -64,7 +64,7 @@ light.font = +0
semibold.font = +0 semibold.font = +0
# monospaced # monospaced
[win]monospaced.font = Consolas, "Courier New", Monospaced [win]monospaced.font = Monospaced
[mac]monospaced.font = Menlo, Monospaced [mac]monospaced.font = Menlo, Monospaced
[linux]monospaced.font = "Liberation Mono", "Ubuntu Mono", Monospaced [linux]monospaced.font = "Liberation Mono", "Ubuntu Mono", Monospaced
monospaced.font = Monospaced monospaced.font = Monospaced

4
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
View File

@@ -342,8 +342,8 @@ class DemoFrame
// add font families // add font families
fontMenu.addSeparator(); fontMenu.addSeparator();
ArrayList<String> families = new ArrayList<>( Arrays.asList( ArrayList<String> families = new ArrayList<>( Arrays.asList(
"Arial", "Cantarell", "Comic Sans MS", "Courier New", "DejaVu Sans", "Arial", "Cantarell", "Comic Sans MS", "DejaVu Sans",
"Dialog", "Liberation Sans", "Monospaced", "Noto Sans", "Roboto", "Dialog", "Liberation Sans", "Noto Sans", "Roboto",
"SansSerif", "Segoe UI", "Serif", "Tahoma", "Ubuntu", "Verdana" ) ); "SansSerif", "Segoe UI", "Serif", "Tahoma", "Ubuntu", "Verdana" ) );
if( !families.contains( currentFamily ) ) if( !families.contains( currentFamily ) )
families.add( currentFamily ); families.add( currentFamily );

15
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatPaintingStringTest.java
View File

@@ -68,9 +68,20 @@ public class FlatPaintingStringTest
// initialize font families combobox // initialize font families combobox
String[] families = { String[] families = {
// regular
"Arial", "Cantarell", "DejaVu Sans", "Arial", "Cantarell", "DejaVu Sans",
"Dialog", "Inter", "Liberation Sans", "Noto Sans", "Open Sans", "Roboto", "Dialog", "Helvetica Neue", "Inter", "Liberation Sans", "Noto Sans", "Open Sans", "Roboto",
"SansSerif", "Segoe UI", "Tahoma", "Ubuntu", "Verdana" }; "SansSerif", "Segoe UI", "Tahoma", "Ubuntu", "Verdana", ".SF NS Text",
// light, semibold
"Segoe UI Light", "Segoe UI Semibold",
"HelveticaNeue-Thin", "HelveticaNeue-Medium",
"Lato Light", "Ubuntu Light", "Cantarell Light",
"Lato Semibold", "Ubuntu Medium", "Montserrat SemiBold",
// monospaced
"Monospaced", "Consolas", "Courier New", "Menlo", "Liberation Mono", "Ubuntu Mono",
};
Arrays.sort( families, String.CASE_INSENSITIVE_ORDER ); Arrays.sort( families, String.CASE_INSENSITIVE_ORDER );
DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>(); DefaultComboBoxModel<String> model = new DefaultComboBoxModel<>();
model.addElement( currentFamily ); model.addElement( currentFamily );