From b455dd41ab6f00c8049cb383fb5f12193723e73d Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 31 Jul 2023 22:36:59 +0200 Subject: [PATCH] TabbedPane: going back to 3px tab selection for macOS themes --- .../com/formdev/flatlaf/themes/FlatMacDarkLaf.properties | 4 +--- .../com/formdev/flatlaf/themes/FlatMacLightLaf.properties | 4 +--- flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt | 6 +++--- flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt | 6 +++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties index d490fe73..70865866 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties @@ -263,10 +263,8 @@ Spinner.buttonSeparatorWidth = 0 #---- TabbedPane ---- -TabbedPane.tabSelectionHeight = 4 -TabbedPane.cardTabSelectionHeight = 4 TabbedPane.tabArc = $Button.arc -TabbedPane.tabSelectionArc = $TabbedPane.tabSelectionHeight +TabbedPane.tabSelectionArc = 999 TabbedPane.cardTabArc = $Button.arc diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties index dc90bebd..a3427fe0 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties @@ -262,10 +262,8 @@ Spinner.buttonPressedArrowColor = lighten($Spinner.buttonArrowColor,30%,derived #---- TabbedPane ---- -TabbedPane.tabSelectionHeight = 4 -TabbedPane.cardTabSelectionHeight = 4 TabbedPane.tabArc = $Button.arc -TabbedPane.tabSelectionArc = $TabbedPane.tabSelectionHeight +TabbedPane.tabSelectionArc = 999 TabbedPane.cardTabArc = $Button.arc diff --git a/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt index a4e2258c..7e54a98d 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt @@ -1048,7 +1048,7 @@ TabbedPane.buttonHoverBackground #111111 HSL 0 0 7 com.formdev.flatlaf TabbedPane.buttonInsets 2,1,2,1 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.buttonPressedBackground #0a0a0a HSL 0 0 4 com.formdev.flatlaf.util.DerivedColor [UI] darken(8%) TabbedPane.cardTabArc 12 -TabbedPane.cardTabSelectionHeight 4 +TabbedPane.cardTabSelectionHeight 3 TabbedPane.closeArc 4 TabbedPane.closeCrossFilledSize 7.5 TabbedPane.closeCrossLineWidth 1 @@ -1092,8 +1092,8 @@ TabbedPane.tabAreaInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.tabHeight 32 TabbedPane.tabInsets 4,12,4,12 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.tabRunOverlay 0 -TabbedPane.tabSelectionArc 4 -TabbedPane.tabSelectionHeight 4 +TabbedPane.tabSelectionArc 999 +TabbedPane.tabSelectionHeight 3 TabbedPane.tabSelectionInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.tabSeparatorsFullHeight false TabbedPane.tabType underlined diff --git a/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt index 5bc7dc73..63b470e5 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt @@ -1052,7 +1052,7 @@ TabbedPane.buttonHoverBackground #e4e4e4 HSL 0 0 89 com.formdev.flatlaf TabbedPane.buttonInsets 2,1,2,1 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.buttonPressedBackground #dddddd HSL 0 0 87 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) TabbedPane.cardTabArc 12 -TabbedPane.cardTabSelectionHeight 4 +TabbedPane.cardTabSelectionHeight 3 TabbedPane.closeArc 4 TabbedPane.closeCrossFilledSize 7.5 TabbedPane.closeCrossLineWidth 1 @@ -1096,8 +1096,8 @@ TabbedPane.tabAreaInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.tabHeight 32 TabbedPane.tabInsets 4,12,4,12 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.tabRunOverlay 0 -TabbedPane.tabSelectionArc 4 -TabbedPane.tabSelectionHeight 4 +TabbedPane.tabSelectionArc 999 +TabbedPane.tabSelectionHeight 3 TabbedPane.tabSelectionInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] TabbedPane.tabSeparatorsFullHeight false TabbedPane.tabType underlined