From c25d857e78f3597f1a72f12d09e6e11e7d394ed0 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Fri, 8 Dec 2023 19:07:32 +0100 Subject: [PATCH] UI defaults dumps updated on macOS for commits 9fef2f9d0514a8391e0a091b1370a20a1a69e309 and ce527329a63b81403ad4b225c022ae538f8c3178 --- .../uidefaults/FlatDarkLaf_1.8.0-mac.txt | 24 +++++++++++++++++++ .../uidefaults/FlatLightLaf_1.8.0-mac.txt | 24 +++++++++++++++++++ .../FlatLightLaf_InputMap_1.8.0-mac.txt | 3 +-- 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt index b74ba588..b5c8c403 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0-mac.txt @@ -15,6 +15,18 @@ + FileChooser.useSystemExtensionHiding false +#---- JXHeader ---- + +- JXHeader.titleFont [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI] ++ JXHeader.titleFont [active] Helvetica Neue bold 13 javax.swing.plaf.FontUIResource [UI] + + +#---- JXTitledPanel ---- + +- JXTitledPanel.titleFont [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI] ++ JXTitledPanel.titleFont [active] Helvetica Neue bold 13 javax.swing.plaf.FontUIResource [UI] + + #---- Menu ---- - Menu.shortcutKeys length=1 [I @@ -53,6 +65,18 @@ - ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] + ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] + + +#---- TaskPane ---- + +- TaskPane.font [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI] ++ TaskPane.font [active] Helvetica Neue bold 13 javax.swing.plaf.FontUIResource [UI] + + +#---- TitlePane ---- + +- TitlePane.small.font [active] Segoe UI plain 11 javax.swing.plaf.FontUIResource [UI] ++ TitlePane.small.font [active] Helvetica Neue plain 12 javax.swing.plaf.FontUIResource [UI] - defaultFont Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI] + defaultFont Helvetica Neue plain 13 javax.swing.plaf.FontUIResource [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt index b74ba588..b5c8c403 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0-mac.txt @@ -15,6 +15,18 @@ + FileChooser.useSystemExtensionHiding false +#---- JXHeader ---- + +- JXHeader.titleFont [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI] ++ JXHeader.titleFont [active] Helvetica Neue bold 13 javax.swing.plaf.FontUIResource [UI] + + +#---- JXTitledPanel ---- + +- JXTitledPanel.titleFont [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI] ++ JXTitledPanel.titleFont [active] Helvetica Neue bold 13 javax.swing.plaf.FontUIResource [UI] + + #---- Menu ---- - Menu.shortcutKeys length=1 [I @@ -53,6 +65,18 @@ - ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] + ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] + + +#---- TaskPane ---- + +- TaskPane.font [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI] ++ TaskPane.font [active] Helvetica Neue bold 13 javax.swing.plaf.FontUIResource [UI] + + +#---- TitlePane ---- + +- TitlePane.small.font [active] Segoe UI plain 11 javax.swing.plaf.FontUIResource [UI] ++ TitlePane.small.font [active] Helvetica Neue plain 12 javax.swing.plaf.FontUIResource [UI] - defaultFont Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI] + defaultFont Helvetica Neue plain 13 javax.swing.plaf.FontUIResource [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0-mac.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0-mac.txt index 443c66c6..f9e4462d 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0-mac.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_InputMap_1.8.0-mac.txt @@ -21,7 +21,7 @@ CheckBox.focusInputMap [lazy] 2 javax.swing.plaf.InputMapUIResource [ #---- ComboBox ---- -ComboBox.ancestorInputMap [lazy] 11 javax.swing.plaf.InputMapUIResource [UI] +ComboBox.ancestorInputMap [lazy] 10 javax.swing.plaf.InputMapUIResource [UI] DOWN selectNext END endPassThrough ENTER enterPressed @@ -31,7 +31,6 @@ ComboBox.ancestorInputMap [lazy] 11 javax.swing.plaf.InputMapUIResource KP_UP selectPrevious PAGE_DOWN pageDownPassThrough PAGE_UP pageUpPassThrough - SPACE spacePopup UP selectPrevious