From cd144ff067eab40d728e4fd2b6c1c052fb94576b Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Tue, 18 Feb 2020 13:49:19 +0100 Subject: [PATCH] UI defaults: added UI values that are defined in MetalLookAndFeel but not in BasicLookAndFeel also added UI values that have different values in Metal and Basic LaF (preparation for replacing "base" Metal LaF with BasicLookAndFeel) --- .../testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt | 8 +++++--- .../testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt index 64abd219..0d3055f5 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt @@ -321,6 +321,7 @@ DesktopIcon.borderColor #98000000 javax.swing.plaf.ColorUIResource [UI DesktopIcon.borderRimColor #c0c0c0c0 javax.swing.plaf.ColorUIResource [UI] DesktopIcon.closeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon [UI] DesktopIcon.closeSize 20,20 javax.swing.plaf.DimensionUIResource [UI] +DesktopIcon.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] DesktopIcon.iconSize 64,64 javax.swing.plaf.DimensionUIResource [UI] DesktopIcon.labelBackground #64000000 javax.swing.plaf.ColorUIResource [UI] DesktopIconUI com.formdev.flatlaf.ui.FlatDesktopIconUI @@ -487,7 +488,7 @@ FileChooser.upFolderIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFil FileChooser.updateButton.textAndMnemonic Update FileChooser.updateButtonMnemonic 0 FileChooser.useSystemExtensionHiding false -FileChooser.usesSingleFilePane false +FileChooser.usesSingleFilePane true FileChooserUI com.formdev.flatlaf.ui.FlatFileChooserUI @@ -862,7 +863,7 @@ Menu.acceleratorSelectionForeground #bbbbbb javax.swing.plaf.ColorUIResource Menu.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenuArrowIcon [UI] Menu.background #303234 javax.swing.plaf.ColorUIResource [UI] Menu.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] -Menu.borderPainted false +Menu.borderPainted true Menu.cancelMode hideLastSubmenu Menu.consumesTabs true Menu.crossMenuMnemonic true @@ -1274,6 +1275,7 @@ RootPaneUI com.apple.laf.AquaRootPaneUI #---- ScrollBar ---- +ScrollBar.allowsAbsolutePositioning true ScrollBar.ancestorInputMap.RightToLeft [lazy] 4 javax.swing.plaf.InputMapUIResource [UI] pressed KP_LEFT positiveUnitIncrement pressed KP_RIGHT negativeUnitIncrement @@ -2082,7 +2084,7 @@ ToolTip.foregroundInactive #777777 javax.swing.plaf.ColorUIResource [UI] #---- ToolTipManager ---- -ToolTipManager.enableToolTipMode allWindows +ToolTipManager.enableToolTipMode activeApplication #---- ToolTip ---- diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt index 051824b0..6b42bd71 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt @@ -322,6 +322,7 @@ DesktopIcon.borderColor #98000000 javax.swing.plaf.ColorUIResource [UI DesktopIcon.borderRimColor #c0c0c0c0 javax.swing.plaf.ColorUIResource [UI] DesktopIcon.closeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon [UI] DesktopIcon.closeSize 20,20 javax.swing.plaf.DimensionUIResource [UI] +DesktopIcon.foreground #000000 javax.swing.plaf.ColorUIResource [UI] DesktopIcon.iconSize 64,64 javax.swing.plaf.DimensionUIResource [UI] DesktopIcon.labelBackground #64000000 javax.swing.plaf.ColorUIResource [UI] DesktopIconUI com.formdev.flatlaf.ui.FlatDesktopIconUI @@ -488,7 +489,7 @@ FileChooser.upFolderIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFil FileChooser.updateButton.textAndMnemonic Update FileChooser.updateButtonMnemonic 0 FileChooser.useSystemExtensionHiding false -FileChooser.usesSingleFilePane false +FileChooser.usesSingleFilePane true FileChooserUI com.formdev.flatlaf.ui.FlatFileChooserUI @@ -864,7 +865,7 @@ Menu.acceleratorSelectionForeground #ffffff javax.swing.plaf.ColorUIResource Menu.arrowIcon [lazy] 6,10 com.formdev.flatlaf.icons.FlatMenuArrowIcon [UI] Menu.background #ffffff javax.swing.plaf.ColorUIResource [UI] Menu.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI] -Menu.borderPainted false +Menu.borderPainted true Menu.cancelMode hideLastSubmenu Menu.consumesTabs true Menu.crossMenuMnemonic true @@ -1276,6 +1277,7 @@ RootPaneUI com.apple.laf.AquaRootPaneUI #---- ScrollBar ---- +ScrollBar.allowsAbsolutePositioning true ScrollBar.ancestorInputMap.RightToLeft [lazy] 4 javax.swing.plaf.InputMapUIResource [UI] pressed KP_LEFT positiveUnitIncrement pressed KP_RIGHT negativeUnitIncrement @@ -2084,7 +2086,7 @@ ToolTip.foregroundInactive #8c8c8c javax.swing.plaf.ColorUIResource [UI] #---- ToolTipManager ---- -ToolTipManager.enableToolTipMode allWindows +ToolTipManager.enableToolTipMode activeApplication #---- ToolTip ----