From 2be2dae3d6d5d47acdd5353c9f028a5d6bdfcc53 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 14 Nov 2022 14:19:49 +0100 Subject: [PATCH] macOS themes: updated UI defaults dumps (PR #533) --- .../dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt | 12 ++++++++++-- .../dumps/uidefaults/FlatMacLightLaf_1.8.0.txt | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt index fdc1490db..28f780b0c 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt @@ -454,6 +454,7 @@ JXMonthView.monthStringBackground #4c5052 HSL 200 4 31 javax.swing.plaf.C JXMonthView.monthStringForeground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] JXMonthView.monthUpFileName [lazy] 20,20 com.formdev.flatlaf.swingx.ui.FlatMonthUpIcon [UI] JXMonthView.selectedBackground #0058d0 HSL 215 100 41 javax.swing.plaf.ColorUIResource [UI] +JXMonthView.todayColor #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] JXMonthView.trailingDayForeground #9a9a9a HSL 0 0 60 javax.swing.plaf.ColorUIResource [UI] JXMonthView.unselectableDayForeground #e05555 HSL 0 69 61 javax.swing.plaf.ColorUIResource [UI] JXMonthView.weekOfTheYearForeground #888888 HSL 0 0 53 javax.swing.plaf.ColorUIResource [UI] @@ -1234,6 +1235,7 @@ TextPaneUI com.formdev.flatlaf.ui.FlatTextPaneUI TitlePane.background #323232 HSL 0 0 20 javax.swing.plaf.ColorUIResource [UI] TitlePane.buttonHoverBackground #585858 HSL 0 0 35 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15% autoInverse) TitlePane.buttonMaximizedHeight 22 +TitlePane.buttonMinimumWidth 30 TitlePane.buttonPressedBackground #4c4c4c HSL 0 0 30 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse) TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI] TitlePane.centerTitle false @@ -1244,6 +1246,7 @@ TitlePane.closeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWin TitlePane.closePressedBackground #c42b1ce6 90% HSLA 5 75 44 90 javax.swing.plaf.ColorUIResource [UI] TitlePane.closePressedForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] TitlePane.embeddedForeground #b7b7b7 HSL 0 0 72 javax.swing.plaf.ColorUIResource [UI] +TitlePane.font [active] $defaultFont [UI] TitlePane.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] TitlePane.icon [lazy] 16,16 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage) TitlePane.iconMargins 3,8,3,8 javax.swing.plaf.InsetsUIResource [UI] @@ -1253,11 +1256,16 @@ TitlePane.inactiveBackground #323232 HSL 0 0 20 javax.swing.plaf.Colo TitlePane.inactiveForeground #9a9a9a HSL 0 0 60 javax.swing.plaf.ColorUIResource [UI] TitlePane.maximizeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI] TitlePane.menuBarEmbedded true -TitlePane.menuBarTitleGap 20 +TitlePane.menuBarResizeHeight 4 +TitlePane.menuBarTitleGap 40 +TitlePane.menuBarTitleMinimumGap 12 TitlePane.noIconLeftGap 8 TitlePane.restoreIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowRestoreIcon [UI] TitlePane.showIcon true +TitlePane.showIconBesideTitle false +TitlePane.showIconInDialogs true TitlePane.titleMargins 3,0,3,0 javax.swing.plaf.InsetsUIResource [UI] +TitlePane.titleMinimumWidth 60 TitlePane.unifiedBackground true TitlePane.useWindowDecorations true @@ -1569,7 +1577,7 @@ mini.font [active] Segoe UI plain 9 javax.swing.plaf.Fon #---- monospaced ---- -monospaced.font [active] Consolas plain 12 javax.swing.plaf.FontUIResource [UI] +monospaced.font [active] Monospaced plain 12 javax.swing.plaf.FontUIResource [UI] #---- ---- diff --git a/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt index eabce3e7e..e2d71b961 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt @@ -458,6 +458,7 @@ JXMonthView.monthStringBackground #dfdfdf HSL 0 0 87 javax.swing.plaf.C JXMonthView.monthStringForeground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] JXMonthView.monthUpFileName [lazy] 20,20 com.formdev.flatlaf.swingx.ui.FlatMonthUpIcon [UI] JXMonthView.selectedBackground #b3d4ff HSL 214 100 85 javax.swing.plaf.ColorUIResource [UI] +JXMonthView.todayColor #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] JXMonthView.trailingDayForeground #b6b6b6 HSL 0 0 71 javax.swing.plaf.ColorUIResource [UI] JXMonthView.unselectableDayForeground #e02222 HSL 0 75 51 javax.swing.plaf.ColorUIResource [UI] JXMonthView.weekOfTheYearForeground #666666 HSL 0 0 40 javax.swing.plaf.ColorUIResource [UI] @@ -1238,6 +1239,7 @@ TextPaneUI com.formdev.flatlaf.ui.FlatTextPaneUI TitlePane.background #ececec HSL 0 0 93 javax.swing.plaf.ColorUIResource [UI] TitlePane.buttonHoverBackground #d3d3d3 HSL 0 0 83 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) TitlePane.buttonMaximizedHeight 22 +TitlePane.buttonMinimumWidth 30 TitlePane.buttonPressedBackground #d8d8d8 HSL 0 0 85 com.formdev.flatlaf.util.DerivedColor [UI] darken(8% autoInverse) TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI] TitlePane.centerTitle false @@ -1248,6 +1250,7 @@ TitlePane.closeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWin TitlePane.closePressedBackground #c42b1ce6 90% HSLA 5 75 44 90 javax.swing.plaf.ColorUIResource [UI] TitlePane.closePressedForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] TitlePane.embeddedForeground #7f7f7f HSL 0 0 50 javax.swing.plaf.ColorUIResource [UI] +TitlePane.font [active] $defaultFont [UI] TitlePane.foreground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] TitlePane.icon [lazy] 16,16 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage) TitlePane.iconMargins 3,8,3,8 javax.swing.plaf.InsetsUIResource [UI] @@ -1257,11 +1260,16 @@ TitlePane.inactiveBackground #ececec HSL 0 0 93 javax.swing.plaf.Colo TitlePane.inactiveForeground #b6b6b6 HSL 0 0 71 javax.swing.plaf.ColorUIResource [UI] TitlePane.maximizeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI] TitlePane.menuBarEmbedded true -TitlePane.menuBarTitleGap 20 +TitlePane.menuBarResizeHeight 4 +TitlePane.menuBarTitleGap 40 +TitlePane.menuBarTitleMinimumGap 12 TitlePane.noIconLeftGap 8 TitlePane.restoreIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowRestoreIcon [UI] TitlePane.showIcon true +TitlePane.showIconBesideTitle false +TitlePane.showIconInDialogs true TitlePane.titleMargins 3,0,3,0 javax.swing.plaf.InsetsUIResource [UI] +TitlePane.titleMinimumWidth 60 TitlePane.unifiedBackground true TitlePane.useWindowDecorations true @@ -1573,7 +1581,7 @@ mini.font [active] Segoe UI plain 9 javax.swing.plaf.Fon #---- monospaced ---- -monospaced.font [active] Consolas plain 12 javax.swing.plaf.FontUIResource [UI] +monospaced.font [active] Monospaced plain 12 javax.swing.plaf.FontUIResource [UI] #---- ----