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: added fonts/styles for headings and various text sizes

Browse Source
This commit is contained in:
Karl Tauber
2021-10-13 10:53:37 +02:00
parent d10bcfc72f
commit 465af9bc41
5 changed files with 256 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,38 @@
# Instead copy and modify only those properties that you need to alter. # Instead copy and modify only those properties that you need to alter.
# #
#---- typography / fonts ----
# headings
h00.font = +24
h0.font = +18
h1.font = +12
h2.font = +6
h3.font = +3
h4.font = bold
# text
large.font = +2
medium.font = -1
small.font = -2
mini.font = -3
# default font
#defaultFont = ...
# styles
[style].h00 = font: $h00.font
[style].h0 = font: $h0.font
[style].h1 = font: $h1.font
[style].h2 = font: $h2.font
[style].h3 = font: $h3.font
[style].h4 = font: $h4.font
[style].large = font: $large.font
[style].medium = font: $medium.font
[style].small = font: $small.font
[style].mini = font: $mini.font
#---- UI delegates ---- #---- UI delegates ----
ButtonUI = com.formdev.flatlaf.ui.FlatButtonUI ButtonUI = com.formdev.flatlaf.ui.FlatButtonUI

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

@@ -1381,6 +1381,20 @@ Viewport.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.Colo
ViewportUI com.formdev.flatlaf.ui.FlatViewportUI ViewportUI com.formdev.flatlaf.ui.FlatViewportUI
#---- [style] ----
[style].h00 font: $h00.font
[style].h0 font: $h0.font
[style].h1 font: $h1.font
[style].h2 font: $h2.font
[style].h3 font: $h3.font
[style].h4 font: $h4.font
[style].large font: $large.font
[style].medium font: $medium.font
[style].mini font: $mini.font
[style].small font: $small.font
#---- ---- #---- ----
activeCaption #434e60 HSL 217 18 32 javax.swing.plaf.ColorUIResource [UI] activeCaption #434e60 HSL 217 18 32 javax.swing.plaf.ColorUIResource [UI]
@@ -1396,6 +1410,36 @@ defaultFont Segoe UI plain 12 javax.swing.plaf.FontUIResou
desktop #46494b HSL 204 3 28 javax.swing.plaf.ColorUIResource [UI] desktop #46494b HSL 204 3 28 javax.swing.plaf.ColorUIResource [UI]
#---- h0 ----
h0.font [active] Segoe UI plain 30 javax.swing.plaf.FontUIResource [UI]
#---- h00 ----
h00.font [active] Segoe UI plain 36 javax.swing.plaf.FontUIResource [UI]
#---- h1 ----
h1.font [active] Segoe UI plain 24 javax.swing.plaf.FontUIResource [UI]
#---- h2 ----
h2.font [active] Segoe UI plain 18 javax.swing.plaf.FontUIResource [UI]
#---- h3 ----
h3.font [active] Segoe UI plain 15 javax.swing.plaf.FontUIResource [UI]
#---- h4 ----
h4.font [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI]
#---- html ---- #---- html ----
html.missingImage [lazy] 38,38 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage) html.missingImage [lazy] 38,38 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage)
@@ -1417,13 +1461,37 @@ laf.dark true
laf.scaleFactor [active] 1.0 laf.scaleFactor [active] 1.0
#---- large ----
large.font [active] Segoe UI plain 14 javax.swing.plaf.FontUIResource [UI]
#---- medium ----
medium.font [active] Segoe UI plain 11 javax.swing.plaf.FontUIResource [UI]
#---- ---- #---- ----
menu #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI] menu #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI]
menuText #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] menuText #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
#---- mini ----
mini.font [active] Segoe UI plain 9 javax.swing.plaf.FontUIResource [UI]
#---- ----
scrollbar #3e4244 HSL 200 5 25 com.formdev.flatlaf.util.DerivedColor [UI] lighten(1%) scrollbar #3e4244 HSL 200 5 25 com.formdev.flatlaf.util.DerivedColor [UI] lighten(1%)
#---- small ----
small.font [active] Segoe UI plain 10 javax.swing.plaf.FontUIResource [UI]
#---- swingx/TaskPane ---- #---- swingx/TaskPane ----
swingx/TaskPaneUI com.formdev.flatlaf.swingx.ui.FlatTaskPaneUI swingx/TaskPaneUI com.formdev.flatlaf.swingx.ui.FlatTaskPaneUI

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

@@ -1386,6 +1386,20 @@ Viewport.foreground #000000 HSL 0 0 0 javax.swing.plaf.Colo
ViewportUI com.formdev.flatlaf.ui.FlatViewportUI ViewportUI com.formdev.flatlaf.ui.FlatViewportUI
#---- [style] ----
[style].h00 font: $h00.font
[style].h0 font: $h0.font
[style].h1 font: $h1.font
[style].h2 font: $h2.font
[style].h3 font: $h3.font
[style].h4 font: $h4.font
[style].large font: $large.font
[style].medium font: $medium.font
[style].mini font: $mini.font
[style].small font: $small.font
#---- ---- #---- ----
activeCaption #99b4d1 HSL 211 38 71 javax.swing.plaf.ColorUIResource [UI] activeCaption #99b4d1 HSL 211 38 71 javax.swing.plaf.ColorUIResource [UI]
@@ -1401,6 +1415,36 @@ defaultFont Segoe UI plain 12 javax.swing.plaf.FontUIResou
desktop #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] desktop #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
#---- h0 ----
h0.font [active] Segoe UI plain 30 javax.swing.plaf.FontUIResource [UI]
#---- h00 ----
h00.font [active] Segoe UI plain 36 javax.swing.plaf.FontUIResource [UI]
#---- h1 ----
h1.font [active] Segoe UI plain 24 javax.swing.plaf.FontUIResource [UI]
#---- h2 ----
h2.font [active] Segoe UI plain 18 javax.swing.plaf.FontUIResource [UI]
#---- h3 ----
h3.font [active] Segoe UI plain 15 javax.swing.plaf.FontUIResource [UI]
#---- h4 ----
h4.font [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI]
#---- html ---- #---- html ----
html.missingImage [lazy] 38,38 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage) html.missingImage [lazy] 38,38 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage)
@@ -1422,13 +1466,37 @@ laf.dark false
laf.scaleFactor [active] 1.0 laf.scaleFactor [active] 1.0
#---- large ----
large.font [active] Segoe UI plain 14 javax.swing.plaf.FontUIResource [UI]
#---- medium ----
medium.font [active] Segoe UI plain 11 javax.swing.plaf.FontUIResource [UI]
#---- ---- #---- ----
menu #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI] menu #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI]
menuText #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] menuText #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
#---- mini ----
mini.font [active] Segoe UI plain 9 javax.swing.plaf.FontUIResource [UI]
#---- ----
scrollbar #f5f5f5 HSL 0 0 96 com.formdev.flatlaf.util.DerivedColor [UI] lighten(1%) scrollbar #f5f5f5 HSL 0 0 96 com.formdev.flatlaf.util.DerivedColor [UI] lighten(1%)
#---- small ----
small.font [active] Segoe UI plain 10 javax.swing.plaf.FontUIResource [UI]
#---- swingx/TaskPane ---- #---- swingx/TaskPane ----
swingx/TaskPaneUI com.formdev.flatlaf.swingx.ui.FlatTaskPaneUI swingx/TaskPaneUI com.formdev.flatlaf.swingx.ui.FlatTaskPaneUI

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

@@ -1390,6 +1390,20 @@ Viewport.foreground #ff0000 HSL 0 100 50 javax.swing.plaf.Colo
ViewportUI com.formdev.flatlaf.ui.FlatViewportUI ViewportUI com.formdev.flatlaf.ui.FlatViewportUI
#---- [style] ----
[style].h00 font: $h00.font
[style].h0 font: $h0.font
[style].h1 font: $h1.font
[style].h2 font: $h2.font
[style].h3 font: $h3.font
[style].h4 font: $h4.font
[style].large font: $large.font
[style].medium font: $medium.font
[style].mini font: $mini.font
[style].small font: $small.font
#---- ---- #---- ----
activeCaption #99b4d1 HSL 211 38 71 javax.swing.plaf.ColorUIResource [UI] activeCaption #99b4d1 HSL 211 38 71 javax.swing.plaf.ColorUIResource [UI]
@@ -1405,6 +1419,36 @@ defaultFont Segoe UI plain 12 javax.swing.plaf.FontUIResou
desktop #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] desktop #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
#---- h0 ----
h0.font [active] Segoe UI plain 30 javax.swing.plaf.FontUIResource [UI]
#---- h00 ----
h00.font [active] Segoe UI plain 36 javax.swing.plaf.FontUIResource [UI]
#---- h1 ----
h1.font [active] Segoe UI plain 24 javax.swing.plaf.FontUIResource [UI]
#---- h2 ----
h2.font [active] Segoe UI plain 18 javax.swing.plaf.FontUIResource [UI]
#---- h3 ----
h3.font [active] Segoe UI plain 15 javax.swing.plaf.FontUIResource [UI]
#---- h4 ----
h4.font [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI]
#---- html ---- #---- html ----
html.missingImage [lazy] 38,38 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage) html.missingImage [lazy] 38,38 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage)
@@ -1426,13 +1470,37 @@ laf.dark false
laf.scaleFactor [active] 1.0 laf.scaleFactor [active] 1.0
#---- large ----
large.font [active] Segoe UI plain 14 javax.swing.plaf.FontUIResource [UI]
#---- medium ----
medium.font [active] Segoe UI plain 11 javax.swing.plaf.FontUIResource [UI]
#---- ---- #---- ----
menu #ccffcc HSL 120 100 90 javax.swing.plaf.ColorUIResource [UI] menu #ccffcc HSL 120 100 90 javax.swing.plaf.ColorUIResource [UI]
menuText #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI] menuText #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
#---- mini ----
mini.font [active] Segoe UI plain 9 javax.swing.plaf.FontUIResource [UI]
#---- ----
scrollbar #88ff88 HSL 120 100 77 javax.swing.plaf.ColorUIResource [UI] scrollbar #88ff88 HSL 120 100 77 javax.swing.plaf.ColorUIResource [UI]
#---- small ----
small.font [active] Segoe UI plain 10 javax.swing.plaf.FontUIResource [UI]
#---- swingx/TaskPane ---- #---- swingx/TaskPane ----
swingx/TaskPaneUI com.formdev.flatlaf.swingx.ui.FlatTaskPaneUI swingx/TaskPaneUI com.formdev.flatlaf.swingx.ui.FlatTaskPaneUI

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

@@ -1064,6 +1064,16 @@ Viewport.background
Viewport.font Viewport.font
Viewport.foreground Viewport.foreground
ViewportUI ViewportUI
[style].h0
[style].h00
[style].h1
[style].h2
[style].h3
[style].h4
[style].large
[style].medium
[style].mini
[style].small
activeCaption activeCaption
activeCaptionBorder activeCaptionBorder
activeCaptionText activeCaptionText
@@ -1075,6 +1085,12 @@ controlShadow
controlText controlText
defaultFont defaultFont
desktop desktop
h0.font
h00.font
h1.font
h2.font
h3.font
h4.font
html.missingImage html.missingImage
html.pendingImage html.pendingImage
inactiveCaption inactiveCaption
@@ -1084,9 +1100,13 @@ info
infoText infoText
laf.dark laf.dark
laf.scaleFactor laf.scaleFactor
large.font
medium.font
menu menu
menuText menuText
mini.font
scrollbar scrollbar
small.font
swingx/TaskPaneUI swingx/TaskPaneUI
text text
textHighlight textHighlight