mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2026-02-13 15:27:16 -06:00
Typography: removed thin font/style because
- 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:
@@ -47,20 +47,15 @@ mini.font = -3
|
|||||||
|
|
||||||
# font weights
|
# font weights
|
||||||
# Windows
|
# Windows
|
||||||
# (use Segoe UI Light because there is no thin font available on Windows)
|
[win]light.font = "Segoe UI Light"
|
||||||
[win]thin.font = "Segoe UI Light"
|
|
||||||
[win]light.font = "Segoe UI Semilight"
|
|
||||||
[win]semibold.font = "Segoe UI Semibold"
|
[win]semibold.font = "Segoe UI Semibold"
|
||||||
# macOS
|
# macOS
|
||||||
[mac]thin.font = "HelveticaNeue-Thin"
|
[mac]light.font = "HelveticaNeue-Thin"
|
||||||
[mac]light.font = "HelveticaNeue-Light"
|
|
||||||
[mac]semibold.font = "HelveticaNeue-Medium"
|
[mac]semibold.font = "HelveticaNeue-Medium"
|
||||||
# Linux
|
# Linux
|
||||||
[linux]thin.font = "Lato Thin", "Ubuntu Thin", "Cantarell Thin"
|
|
||||||
[linux]light.font = "Lato Light", "Ubuntu Light", "Cantarell Light"
|
[linux]light.font = "Lato Light", "Ubuntu Light", "Cantarell Light"
|
||||||
[linux]semibold.font = "Lato Semibold", "Ubuntu Medium"
|
[linux]semibold.font = "Lato Semibold", "Ubuntu Medium"
|
||||||
# fallback for unknown platform
|
# fallback for unknown platform
|
||||||
thin.font = +0
|
|
||||||
light.font = +0
|
light.font = +0
|
||||||
semibold.font = +0
|
semibold.font = +0
|
||||||
|
|
||||||
@@ -81,7 +76,6 @@ monospaced.font = Monospaced
|
|||||||
[style].medium = font: $medium.font
|
[style].medium = font: $medium.font
|
||||||
[style].small = font: $small.font
|
[style].small = font: $small.font
|
||||||
[style].mini = font: $mini.font
|
[style].mini = font: $mini.font
|
||||||
[style].thin = font: $thin.font
|
|
||||||
[style].light = font: $light.font
|
[style].light = font: $light.font
|
||||||
[style].semibold = font: $semibold.font
|
[style].semibold = font: $semibold.font
|
||||||
[style].monospaced = font: $monospaced.font
|
[style].monospaced = font: $monospaced.font
|
||||||
|
|||||||
@@ -141,7 +141,6 @@ class BasicComponentsPanel
|
|||||||
JLabel h2Label = new JLabel();
|
JLabel h2Label = new JLabel();
|
||||||
JLabel h3Label = new JLabel();
|
JLabel h3Label = new JLabel();
|
||||||
JLabel h4Label = new JLabel();
|
JLabel h4Label = new JLabel();
|
||||||
JLabel thinLabel = new JLabel();
|
|
||||||
JLabel lightLabel = new JLabel();
|
JLabel lightLabel = new JLabel();
|
||||||
JLabel semiboldLabel = new JLabel();
|
JLabel semiboldLabel = new JLabel();
|
||||||
JLabel fontZoomLabel = new JLabel();
|
JLabel fontZoomLabel = new JLabel();
|
||||||
@@ -724,15 +723,10 @@ class BasicComponentsPanel
|
|||||||
h4Label.putClientProperty("FlatLaf.styleClass", "h4");
|
h4Label.putClientProperty("FlatLaf.styleClass", "h4");
|
||||||
add(h4Label, "cell 1 15 5 1");
|
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 ----
|
||||||
lightLabel.setText("light");
|
lightLabel.setText("light");
|
||||||
lightLabel.putClientProperty("FlatLaf.style", "font: 200% $light.font");
|
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 ----
|
||||||
semiboldLabel.setText("semibold");
|
semiboldLabel.setText("semibold");
|
||||||
|
|||||||
@@ -719,19 +719,12 @@ new FormModel {
|
|||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 15 5 1"
|
"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" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
name: "lightLabel"
|
name: "lightLabel"
|
||||||
"text": "light"
|
"text": "light"
|
||||||
"$client.FlatLaf.style": "font: 200% $light.font"
|
"$client.FlatLaf.style": "font: 200% $light.font"
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, 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" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
name: "semiboldLabel"
|
name: "semiboldLabel"
|
||||||
|
|||||||
@@ -102,8 +102,8 @@
|
|||||||
|
|
||||||
#---- light ----
|
#---- 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]
|
||||||
+ light.font [active] HelveticaNeue-Light plain 13 javax.swing.plaf.FontUIResource [UI]
|
+ light.font [active] HelveticaNeue-Thin plain 13 javax.swing.plaf.FontUIResource [UI]
|
||||||
|
|
||||||
|
|
||||||
#---- medium ----
|
#---- medium ----
|
||||||
@@ -134,9 +134,3 @@
|
|||||||
|
|
||||||
- small.font [active] Segoe UI plain 10 javax.swing.plaf.FontUIResource [UI]
|
- small.font [active] Segoe UI plain 10 javax.swing.plaf.FontUIResource [UI]
|
||||||
+ small.font [active] Helvetica Neue plain 11 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]
|
|
||||||
|
|||||||
@@ -1396,7 +1396,6 @@ ViewportUI com.formdev.flatlaf.ui.FlatViewportUI
|
|||||||
[style].monospaced font: $monospaced.font
|
[style].monospaced font: $monospaced.font
|
||||||
[style].semibold font: $semibold.font
|
[style].semibold font: $semibold.font
|
||||||
[style].small font: $small.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 ----
|
||||||
|
|
||||||
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 ----
|
#---- 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]
|
textHighlightText #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
|
||||||
textInactiveText #8c8c8c HSL 0 0 55 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]
|
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]
|
window #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI]
|
||||||
windowBorder #bbbbbb HSL 0 0 73 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]
|
windowText #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
|||||||
@@ -102,8 +102,8 @@
|
|||||||
|
|
||||||
#---- light ----
|
#---- 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]
|
||||||
+ light.font [active] HelveticaNeue-Light plain 13 javax.swing.plaf.FontUIResource [UI]
|
+ light.font [active] HelveticaNeue-Thin plain 13 javax.swing.plaf.FontUIResource [UI]
|
||||||
|
|
||||||
|
|
||||||
#---- medium ----
|
#---- medium ----
|
||||||
@@ -134,9 +134,3 @@
|
|||||||
|
|
||||||
- small.font [active] Segoe UI plain 10 javax.swing.plaf.FontUIResource [UI]
|
- small.font [active] Segoe UI plain 10 javax.swing.plaf.FontUIResource [UI]
|
||||||
+ small.font [active] Helvetica Neue plain 11 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]
|
|
||||||
|
|||||||
@@ -1401,7 +1401,6 @@ ViewportUI com.formdev.flatlaf.ui.FlatViewportUI
|
|||||||
[style].monospaced font: $monospaced.font
|
[style].monospaced font: $monospaced.font
|
||||||
[style].semibold font: $semibold.font
|
[style].semibold font: $semibold.font
|
||||||
[style].small font: $small.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 ----
|
||||||
|
|
||||||
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 ----
|
#---- 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]
|
textHighlightText #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||||
textInactiveText #8c8c8c HSL 0 0 55 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]
|
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]
|
window #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI]
|
||||||
windowBorder #000000 HSL 0 0 0 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]
|
windowText #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
|||||||
@@ -1405,7 +1405,6 @@ ViewportUI com.formdev.flatlaf.ui.FlatViewportUI
|
|||||||
[style].monospaced font: $monospaced.font
|
[style].monospaced font: $monospaced.font
|
||||||
[style].semibold font: $semibold.font
|
[style].semibold font: $semibold.font
|
||||||
[style].small font: $small.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 ----
|
||||||
|
|
||||||
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 ----
|
#---- 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]
|
textHighlightText #ffff00 HSL 60 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||||
textInactiveText #000088 HSL 240 100 27 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]
|
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]
|
window #ccffcc HSL 120 100 90 javax.swing.plaf.ColorUIResource [UI]
|
||||||
windowBorder #ff0000 HSL 0 100 50 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]
|
windowText #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
|||||||
@@ -53,7 +53,6 @@ public class FlatThemePreviewFonts
|
|||||||
FlatThemePreviewFonts.FontPreview mediumPreview = new FlatThemePreviewFonts.FontPreview();
|
FlatThemePreviewFonts.FontPreview mediumPreview = new FlatThemePreviewFonts.FontPreview();
|
||||||
FlatThemePreviewFonts.FontPreview smallPreview = new FlatThemePreviewFonts.FontPreview();
|
FlatThemePreviewFonts.FontPreview smallPreview = new FlatThemePreviewFonts.FontPreview();
|
||||||
FlatThemePreviewFonts.FontPreview miniPreview = new FlatThemePreviewFonts.FontPreview();
|
FlatThemePreviewFonts.FontPreview miniPreview = new FlatThemePreviewFonts.FontPreview();
|
||||||
FlatThemePreviewFonts.FontPreview thinPreview = new FlatThemePreviewFonts.FontPreview();
|
|
||||||
FlatThemePreviewFonts.FontPreview lightPreview = new FlatThemePreviewFonts.FontPreview();
|
FlatThemePreviewFonts.FontPreview lightPreview = new FlatThemePreviewFonts.FontPreview();
|
||||||
FlatThemePreviewFonts.FontPreview semiboldPreview = new FlatThemePreviewFonts.FontPreview();
|
FlatThemePreviewFonts.FontPreview semiboldPreview = new FlatThemePreviewFonts.FontPreview();
|
||||||
FlatThemePreviewFonts.FontPreview monospacedPreview = new FlatThemePreviewFonts.FontPreview();
|
FlatThemePreviewFonts.FontPreview monospacedPreview = new FlatThemePreviewFonts.FontPreview();
|
||||||
@@ -80,7 +79,6 @@ public class FlatThemePreviewFonts
|
|||||||
"[bottom]" +
|
"[bottom]" +
|
||||||
"[bottom]para" +
|
"[bottom]para" +
|
||||||
"[]" +
|
"[]" +
|
||||||
"[]" +
|
|
||||||
"[]para" +
|
"[]para" +
|
||||||
"[]para" +
|
"[]para" +
|
||||||
"[]"));
|
"[]"));
|
||||||
@@ -149,34 +147,29 @@ public class FlatThemePreviewFonts
|
|||||||
miniPreview.setFontStyle("mini");
|
miniPreview.setFontStyle("mini");
|
||||||
add(miniPreview, "cell 0 12,gapx 12");
|
add(miniPreview, "cell 0 12,gapx 12");
|
||||||
|
|
||||||
//---- thinPreview ----
|
|
||||||
thinPreview.setFontType("Thin");
|
|
||||||
thinPreview.setFontStyle("thin");
|
|
||||||
add(thinPreview, "cell 0 13,gapx 12");
|
|
||||||
|
|
||||||
//---- lightPreview ----
|
//---- lightPreview ----
|
||||||
lightPreview.setFontType("Light");
|
lightPreview.setFontType("Light");
|
||||||
lightPreview.setFontStyle("light");
|
lightPreview.setFontStyle("light");
|
||||||
add(lightPreview, "cell 0 14,gapx 12");
|
add(lightPreview, "cell 0 13,gapx 12");
|
||||||
|
|
||||||
//---- semiboldPreview ----
|
//---- semiboldPreview ----
|
||||||
semiboldPreview.setFontType("Semibold");
|
semiboldPreview.setFontType("Semibold");
|
||||||
semiboldPreview.setFontStyle("semibold");
|
semiboldPreview.setFontStyle("semibold");
|
||||||
add(semiboldPreview, "cell 0 15,gapx 12");
|
add(semiboldPreview, "cell 0 14,gapx 12");
|
||||||
|
|
||||||
//---- monospacedPreview ----
|
//---- monospacedPreview ----
|
||||||
monospacedPreview.setFontType("Monospaced");
|
monospacedPreview.setFontType("Monospaced");
|
||||||
monospacedPreview.setFontStyle("monospaced");
|
monospacedPreview.setFontStyle("monospaced");
|
||||||
add(monospacedPreview, "cell 0 16,gapx 12");
|
add(monospacedPreview, "cell 0 15,gapx 12");
|
||||||
|
|
||||||
//---- scaleLabel ----
|
//---- scaleLabel ----
|
||||||
scaleLabel.setText("Fonts are scaled by:");
|
scaleLabel.setText("Fonts are scaled by:");
|
||||||
add(scaleLabel, "cell 0 17,gapx 12");
|
add(scaleLabel, "cell 0 16,gapx 12");
|
||||||
|
|
||||||
//---- scaleValueLabel ----
|
//---- scaleValueLabel ----
|
||||||
scaleValueLabel.setText("1x");
|
scaleValueLabel.setText("1x");
|
||||||
scaleValueLabel.putClientProperty("FlatLaf.styleClass", "h2");
|
scaleValueLabel.putClientProperty("FlatLaf.styleClass", "h2");
|
||||||
add(scaleValueLabel, "cell 0 17");
|
add(scaleValueLabel, "cell 0 16");
|
||||||
// JFormDesigner - End of component initialization //GEN-END:initComponents
|
// JFormDesigner - End of component initialization //GEN-END:initComponents
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ new FormModel {
|
|||||||
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||||
"$layoutConstraints": "ltr,insets dialog,hidemode 3"
|
"$layoutConstraints": "ltr,insets dialog,hidemode 3"
|
||||||
"$columnConstraints": "[left]unrel"
|
"$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"
|
name: "this"
|
||||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
@@ -105,39 +105,32 @@ new FormModel {
|
|||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 12,gapx 12"
|
"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" ) {
|
add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewFonts$FontPreview" ) {
|
||||||
name: "lightPreview"
|
name: "lightPreview"
|
||||||
"fontType": "Light"
|
"fontType": "Light"
|
||||||
"fontStyle": "light"
|
"fontStyle": "light"
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, 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" ) {
|
add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewFonts$FontPreview" ) {
|
||||||
name: "semiboldPreview"
|
name: "semiboldPreview"
|
||||||
"fontType": "Semibold"
|
"fontType": "Semibold"
|
||||||
"fontStyle": "semibold"
|
"fontStyle": "semibold"
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, 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" ) {
|
add( new FormComponent( "com.formdev.flatlaf.themeeditor.FlatThemePreviewFonts$FontPreview" ) {
|
||||||
name: "monospacedPreview"
|
name: "monospacedPreview"
|
||||||
"fontType": "Monospaced"
|
"fontType": "Monospaced"
|
||||||
"fontStyle": "monospaced"
|
"fontStyle": "monospaced"
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, 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" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
name: "scaleLabel"
|
name: "scaleLabel"
|
||||||
"text": "Fonts are scaled by:"
|
"text": "Fonts are scaled by:"
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, 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" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
name: "scaleValueLabel"
|
name: "scaleValueLabel"
|
||||||
@@ -147,7 +140,7 @@ new FormModel {
|
|||||||
"JavaCodeGenerator.variableLocal": false
|
"JavaCodeGenerator.variableLocal": false
|
||||||
}
|
}
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 17"
|
"value": "cell 0 16"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( null ) {
|
}, new FormLayoutConstraints( null ) {
|
||||||
"location": new java.awt.Point( 5, 0 )
|
"location": new java.awt.Point( 5, 0 )
|
||||||
|
|||||||
@@ -1077,7 +1077,6 @@ ViewportUI
|
|||||||
[style].monospaced
|
[style].monospaced
|
||||||
[style].semibold
|
[style].semibold
|
||||||
[style].small
|
[style].small
|
||||||
[style].thin
|
|
||||||
activeCaption
|
activeCaption
|
||||||
activeCaptionBorder
|
activeCaptionBorder
|
||||||
activeCaptionText
|
activeCaptionText
|
||||||
@@ -1120,7 +1119,6 @@ textHighlight
|
|||||||
textHighlightText
|
textHighlightText
|
||||||
textInactiveText
|
textInactiveText
|
||||||
textText
|
textText
|
||||||
thin.font
|
|
||||||
window
|
window
|
||||||
windowBorder
|
windowBorder
|
||||||
windowText
|
windowText
|
||||||
|
|||||||
Reference in New Issue
Block a user