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

Typography: removed thin font/style because

Browse Source 
- there is no thin font available on Windows
- previously used "Segoe UI Light" for `thin.font` and "Segoe UI Semilight" for `light.font`, but "Segoe UI Semilight" is too close to regular font so that it is better to use "Segoe UI Light" for `light.font` and drop `thin.font`
- the usefulness of having thin font in addition to light font is low

on macOS use "HelveticaNeue-Thin" for `light.font` (instead of "HelveticaNeue-Light")
This commit is contained in:
Karl Tauber
2021-11-17 00:23:54 +01:00
parent 7a2808243c
commit 68897f04a2
11 changed files with 22 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,20 +47,15 @@ mini.font = -3
# font weights
# Windows
# (use Segoe UI Light because there is no thin font available on Windows)
[win]thin.font = "Segoe UI Light"
[win]light.font = "Segoe UI Semilight"
[win]light.font = "Segoe UI Light"
[win]semibold.font = "Segoe UI Semibold"
# macOS
[mac]thin.font = "HelveticaNeue-Thin"
[mac]light.font = "HelveticaNeue-Light"
[mac]light.font = "HelveticaNeue-Thin"
[mac]semibold.font = "HelveticaNeue-Medium"
# Linux
[linux]thin.font = "Lato Thin", "Ubuntu Thin", "Cantarell Thin"
[linux]light.font = "Lato Light", "Ubuntu Light", "Cantarell Light"
[linux]semibold.font = "Lato Semibold", "Ubuntu Medium"
# fallback for unknown platform
thin.font = +0
light.font = +0
semibold.font = +0
@@ -81,7 +76,6 @@ monospaced.font = Monospaced
[style].medium = font: $medium.font
[style].small = font: $small.font
[style].mini = font: $mini.font
[style].thin = font: $thin.font
[style].light = font: $light.font
[style].semibold = font: $semibold.font
[style].monospaced = font: $monospaced.font

8
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/BasicComponentsPanel.java
View File

@@ -141,7 +141,6 @@ class BasicComponentsPanel
JLabel h2Label = new JLabel();
JLabel h3Label = new JLabel();
JLabel h4Label = new JLabel();
JLabel thinLabel = new JLabel();
JLabel lightLabel = new JLabel();
JLabel semiboldLabel = new JLabel();
JLabel fontZoomLabel = new JLabel();
@@ -724,15 +723,10 @@ class BasicComponentsPanel
h4Label.putClientProperty("FlatLaf.styleClass", "h4");
add(h4Label, "cell 1 15 5 1");
//---- thinLabel ----
thinLabel.setText("thin");
thinLabel.putClientProperty("FlatLaf.style", "font: 200% $thin.font");
add(thinLabel, "cell 1 15 5 1,gapx 30");
//---- lightLabel ----
lightLabel.setText("light");
lightLabel.putClientProperty("FlatLaf.style", "font: 200% $light.font");
add(lightLabel, "cell 1 15 5 1");
add(lightLabel, "cell 1 15 5 1,gapx 30");
//---- semiboldLabel ----
semiboldLabel.setText("semibold");

9
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/BasicComponentsPanel.jfd
View File

@@ -719,19 +719,12 @@ new FormModel {
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 15 5 1"
} )
add( new FormComponent( "javax.swing.JLabel" ) {
name: "thinLabel"
"text": "thin"
"$client.FlatLaf.style": "font: 200% $thin.font"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 15 5 1,gapx 30"
} )
add( new FormComponent( "javax.swing.JLabel" ) {
name: "lightLabel"
"text": "light"
"$client.FlatLaf.style": "font: 200% $light.font"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 1 15 5 1"
"value": "cell 1 15 5 1,gapx 30"
} )
add( new FormComponent( "javax.swing.JLabel" ) {
name: "semiboldLabel"

10
flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt
View File

@@ -102,8 +102,8 @@
#---- light ----
- light.font [active] Segoe UI Semilight plain 12 javax.swing.plaf.FontUIResource [UI]
+ light.font [active] HelveticaNeue-Light plain 13 javax.swing.plaf.FontUIResource [UI]
- light.font [active] Segoe UI Light plain 12 javax.swing.plaf.FontUIResource [UI]
+ light.font [active] HelveticaNeue-Thin plain 13 javax.swing.plaf.FontUIResource [UI]
#---- medium ----
@@ -134,9 +134,3 @@
- small.font [active] Segoe UI plain 10 javax.swing.plaf.FontUIResource [UI]
+ small.font [active] Helvetica Neue plain 11 javax.swing.plaf.FontUIResource [UI]
#---- thin ----
- thin.font [active] Segoe UI Light plain 12 javax.swing.plaf.FontUIResource [UI]
+ thin.font [active] HelveticaNeue-Thin plain 13 javax.swing.plaf.FontUIResource [UI]

12
flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt
View File

@@ -1396,7 +1396,6 @@ ViewportUI com.formdev.flatlaf.ui.FlatViewportUI
[style].monospaced font: $monospaced.font
[style].semibold font: $semibold.font
[style].small font: $small.font
[style].thin font: $thin.font
#---- ----
@@ -1472,7 +1471,7 @@ large.font [active] Segoe UI plain 14 javax.swing.plaf.Fo
#---- light ----
light.font [active] Segoe UI Semilight plain 12 javax.swing.plaf.FontUIResource [UI]
light.font [active] Segoe UI Light plain 12 javax.swing.plaf.FontUIResource [UI]
#---- medium ----
@@ -1523,15 +1522,6 @@ textHighlight #4b6eaf HSL 219 40 49 javax.swing.plaf.Colo
textHighlightText #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
textInactiveText #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI]
textText #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
#---- thin ----
thin.font [active] Segoe UI Light plain 12 javax.swing.plaf.FontUIResource [UI]
#---- ----
window #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI]
windowBorder #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
windowText #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]

10
flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202-mac.txt
View File

@@ -102,8 +102,8 @@
#---- light ----
- light.font [active] Segoe UI Semilight plain 12 javax.swing.plaf.FontUIResource [UI]
+ light.font [active] HelveticaNeue-Light plain 13 javax.swing.plaf.FontUIResource [UI]
- light.font [active] Segoe UI Light plain 12 javax.swing.plaf.FontUIResource [UI]
+ light.font [active] HelveticaNeue-Thin plain 13 javax.swing.plaf.FontUIResource [UI]
#---- medium ----
@@ -134,9 +134,3 @@
- small.font [active] Segoe UI plain 10 javax.swing.plaf.FontUIResource [UI]
+ small.font [active] Helvetica Neue plain 11 javax.swing.plaf.FontUIResource [UI]
#---- thin ----
- thin.font [active] Segoe UI Light plain 12 javax.swing.plaf.FontUIResource [UI]
+ thin.font [active] HelveticaNeue-Thin plain 13 javax.swing.plaf.FontUIResource [UI]

12
flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt
View File

@@ -1401,7 +1401,6 @@ ViewportUI com.formdev.flatlaf.ui.FlatViewportUI
[style].monospaced font: $monospaced.font
[style].semibold font: $semibold.font
[style].small font: $small.font
[style].thin font: $thin.font
#---- ----
@@ -1477,7 +1476,7 @@ large.font [active] Segoe UI plain 14 javax.swing.plaf.Fo
#---- light ----
light.font [active] Segoe UI Semilight plain 12 javax.swing.plaf.FontUIResource [UI]
light.font [active] Segoe UI Light plain 12 javax.swing.plaf.FontUIResource [UI]
#---- medium ----
@@ -1528,15 +1527,6 @@ textHighlight #2675bf HSL 209 67 45 javax.swing.plaf.Colo
textHighlightText #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
textInactiveText #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI]
textText #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
#---- thin ----
thin.font [active] Segoe UI Light plain 12 javax.swing.plaf.FontUIResource [UI]
#---- ----
window #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI]
windowBorder #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
windowText #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]

12
flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt
View File

@@ -1405,7 +1405,6 @@ ViewportUI com.formdev.flatlaf.ui.FlatViewportUI
[style].monospaced font: $monospaced.font
[style].semibold font: $semibold.font
[style].small font: $small.font
[style].thin font: $thin.font
#---- ----
@@ -1481,7 +1480,7 @@ large.font [active] Segoe UI plain 14 javax.swing.plaf.Fo
#---- light ----
light.font [active] Segoe UI Semilight plain 12 javax.swing.plaf.FontUIResource [UI]
light.font [active] Segoe UI Light plain 12 javax.swing.plaf.FontUIResource [UI]
#---- medium ----
@@ -1532,15 +1531,6 @@ textHighlight #00aa00 HSL 120 100 33 javax.swing.plaf.Colo
textHighlightText #ffff00 HSL 60 100 50 javax.swing.plaf.ColorUIResource [UI]
textInactiveText #000088 HSL 240 100 27 javax.swing.plaf.ColorUIResource [UI]
textText #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
#---- thin ----
thin.font [active] Segoe UI Light plain 12 javax.swing.plaf.FontUIResource [UI]
#---- ----
window #ccffcc HSL 120 100 90 javax.swing.plaf.ColorUIResource [UI]
windowBorder #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
windowText #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]

17
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewFonts.java
View File

@@ -53,7 +53,6 @@ public class FlatThemePreviewFonts
FlatThemePreviewFonts.FontPreview mediumPreview = new FlatThemePreviewFonts.FontPreview();
FlatThemePreviewFonts.FontPreview smallPreview = new FlatThemePreviewFonts.FontPreview();
FlatThemePreviewFonts.FontPreview miniPreview = new FlatThemePreviewFonts.FontPreview();
FlatThemePreviewFonts.FontPreview thinPreview = new FlatThemePreviewFonts.FontPreview();
FlatThemePreviewFonts.FontPreview lightPreview = new FlatThemePreviewFonts.FontPreview();
FlatThemePreviewFonts.FontPreview semiboldPreview = new FlatThemePreviewFonts.FontPreview();
FlatThemePreviewFonts.FontPreview monospacedPreview = new FlatThemePreviewFonts.FontPreview();
@@ -80,7 +79,6 @@ public class FlatThemePreviewFonts
"[bottom]" +
"[bottom]para" +
"[]" +
"[]" +
"[]para" +
"[]para" +
"[]"));
@@ -149,34 +147,29 @@ public class FlatThemePreviewFonts
miniPreview.setFontStyle("mini");
add(miniPreview, "cell 0 12,gapx 12");
//---- thinPreview ----
thinPreview.setFontType("Thin");
thinPreview.setFontStyle("thin");
add(thinPreview, "cell 0 13,gapx 12");
//---- lightPreview ----
lightPreview.setFontType("Light");
lightPreview.setFontStyle("light");
add(lightPreview, "cell 0 14,gapx 12");
add(lightPreview, "cell 0 13,gapx 12");
//---- semiboldPreview ----
semiboldPreview.setFontType("Semibold");
semiboldPreview.setFontStyle("semibold");
add(semiboldPreview, "cell 0 15,gapx 12");
add(semiboldPreview, "cell 0 14,gapx 12");
//---- monospacedPreview ----
monospacedPreview.setFontType("Monospaced");
monospacedPreview.setFontStyle("monospaced");
add(monospacedPreview, "cell 0 16,gapx 12");
add(monospacedPreview, "cell 0 15,gapx 12");
//---- scaleLabel ----
scaleLabel.setText("Fonts are scaled by:");
add(scaleLabel, "cell 0 17,gapx 12");
add(scaleLabel, "cell 0 16,gapx 12");
//---- scaleValueLabel ----
scaleValueLabel.setText("1x");
scaleValueLabel.putClientProperty("FlatLaf.styleClass", "h2");
add(scaleValueLabel, "cell 0 17");
add(scaleValueLabel, "cell 0 16");
// JFormDesigner - End of component initialization //GEN-END:initComponents
}

19
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemePreviewFonts.jfd
View File

@@ -9,7 +9,7 @@ new FormModel {
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
"$layoutConstraints": "ltr,insets dialog,hidemode 3"
"$columnConstraints": "[left]unrel"
"$rowConstraints": "[][bottom][bottom][bottom][bottom][bottom][bottom]para[][bottom][bottom][bottom][bottom][bottom]para[][][]para[]para[]"
"$rowConstraints": "[][bottom][bottom][bottom][bottom][bottom][bottom]para[][bottom][bottom][bottom][bottom][bottom]para[][]para[]para[]"
} ) {
name: "this"
add( new FormComponent( "javax.swing.JLabel" ) {
@@ -105,39 +105,32 @@ new FormModel {
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 12,gapx 12"
} )
add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewFonts$FontPreview" ) {
name: "thinPreview"
"fontType": "Thin"
"fontStyle": "thin"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 13,gapx 12"
} )
add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewFonts$FontPreview" ) {
name: "lightPreview"
"fontType": "Light"
"fontStyle": "light"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 14,gapx 12"
"value": "cell 0 13,gapx 12"
} )
add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewFonts$FontPreview" ) {
name: "semiboldPreview"
"fontType": "Semibold"
"fontStyle": "semibold"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 15,gapx 12"
"value": "cell 0 14,gapx 12"
} )
add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewFonts$FontPreview" ) {
name: "monospacedPreview"
"fontType": "Monospaced"
"fontStyle": "monospaced"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 16,gapx 12"
"value": "cell 0 15,gapx 12"
} )
add( new FormComponent( "javax.swing.JLabel" ) {
name: "scaleLabel"
"text": "Fonts are scaled by:"
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 17,gapx 12"
"value": "cell 0 16,gapx 12"
} )
add( new FormComponent( "javax.swing.JLabel" ) {
name: "scaleValueLabel"
@@ -147,7 +140,7 @@ new FormModel {
"JavaCodeGenerator.variableLocal": false
}
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
"value": "cell 0 17"
"value": "cell 0 16"
} )
}, new FormLayoutConstraints( null ) {
"location": new java.awt.Point( 5, 0 )

2
flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt
View File

@@ -1077,7 +1077,6 @@ ViewportUI
[style].monospaced
[style].semibold
[style].small
[style].thin
activeCaption
activeCaptionBorder
activeCaptionText
@@ -1120,7 +1119,6 @@ textHighlight
textHighlightText
textInactiveText
textText
thin.font
window
windowBorder
windowText