From 73b642799deac06d29c6130ee9b8facff26c25d5 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 17 Feb 2020 23:35:38 +0100 Subject: [PATCH] UI defaults dumps updated --- .../uidefaults/FlatDarkLaf_1.8.0_202-mac.txt | 14 +++++++++----- .../testing/uidefaults/FlatDarkLaf_1.8.0_202.txt | 7 ++++--- .../uidefaults/FlatLightLaf_1.8.0_202-mac.txt | 14 +++++++++----- .../testing/uidefaults/FlatLightLaf_1.8.0_202.txt | 7 ++++--- 4 files changed, 26 insertions(+), 16 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 d9d1d6e8..8b61c765 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 @@ -120,7 +120,9 @@ Button.shadow #44000000 javax.swing.plaf.ColorUIResource [UI Button.textIconGap 4 Button.textShiftOffset 0 Button.toolbar.hoverBackground #4c5052 javax.swing.plaf.ColorUIResource [UI] +Button.toolbar.margin 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] Button.toolbar.pressedBackground #555a5d javax.swing.plaf.ColorUIResource [UI] +Button.toolbar.spacingInsets 1,2,1,2 javax.swing.plaf.InsetsUIResource [UI] ButtonUI com.formdev.flatlaf.ui.FlatButtonUI @@ -515,7 +517,7 @@ FormView.submitButton.textAndMnemonic Submit Query #---- FormattedTextField ---- FormattedTextField.background #45494a javax.swing.plaf.ColorUIResource [UI] -FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] FormattedTextField.caretBlinkRate 500 FormattedTextField.caretForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] FormattedTextField.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] @@ -1029,7 +1031,7 @@ PanelUI com.apple.laf.AquaPanelUI #---- PasswordField ---- PasswordField.background #45494a javax.swing.plaf.ColorUIResource [UI] -PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] PasswordField.capsLockIconColor #64000000 javax.swing.plaf.ColorUIResource [UI] PasswordField.caretBlinkRate 500 PasswordField.caretForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -1784,6 +1786,7 @@ TextAreaUI com.formdev.flatlaf.ui.FlatTextAreaUI #---- TextComponent ---- +TextComponent.arc 0 TextComponent.selectAllOnFocusPolicy once TextComponent.selectionBackgroundInactive #d4d4d4 javax.swing.plaf.ColorUIResource [UI] @@ -1791,7 +1794,7 @@ TextComponent.selectionBackgroundInactive #d4d4d4 javax.swing.plaf.ColorUIRes #---- TextField ---- TextField.background #45494a javax.swing.plaf.ColorUIResource [UI] -TextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +TextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] TextField.caretBlinkRate 500 TextField.caretForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] TextField.darkShadow #000000 javax.swing.plaf.ColorUIResource [UI] @@ -2044,9 +2047,9 @@ ToolBar.ancestorInputMap [lazy] 8 javax.swing.plaf.InputMapUIResource [ pressed RIGHT navigateRight pressed UP navigateUp ToolBar.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] -ToolBar.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatToolBarBorder [UI] +ToolBar.border [lazy] 2,2,2,2 false com.formdev.flatlaf.ui.FlatToolBarBorder [UI] ToolBar.borderHandleColor #8c8c8c javax.swing.plaf.ColorUIResource [UI] -ToolBar.buttonMargins 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] +ToolBar.borderMargins 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] ToolBar.darkShadow #000000 javax.swing.plaf.ColorUIResource [UI] ToolBar.dockingBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] ToolBar.dockingForeground #0749d9 com.apple.laf.AquaImageFactory$SystemColorProxy [UI] @@ -2061,6 +2064,7 @@ ToolBar.light #0749d9 javax.swing.plaf.ColorUIResource [UI] ToolBar.separatorColor #515151 javax.swing.plaf.ColorUIResource [UI] ToolBar.separatorWidth 7 ToolBar.shadow #44000000 javax.swing.plaf.ColorUIResource [UI] +ToolBar.spacingBorder [lazy] 1,2,1,2 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] #---- ToolBarButton ---- diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt index e605b0a9..585c08ae 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -437,7 +437,7 @@ FileView.hardDriveIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFil #---- FormattedTextField ---- FormattedTextField.background #45494a javax.swing.plaf.ColorUIResource [UI] -FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] FormattedTextField.caretBlinkRate 500 FormattedTextField.caretForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] FormattedTextField.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] @@ -921,7 +921,7 @@ PanelUI javax.swing.plaf.basic.BasicPanelUI #---- PasswordField ---- PasswordField.background #45494a javax.swing.plaf.ColorUIResource [UI] -PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] PasswordField.caretBlinkRate 500 PasswordField.caretForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] PasswordField.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] @@ -1680,13 +1680,14 @@ TextAreaUI com.formdev.flatlaf.ui.FlatTextAreaUI #---- TextComponent ---- +TextComponent.arc 0 TextComponent.selectAllOnFocusPolicy once #---- TextField ---- TextField.background #45494a javax.swing.plaf.ColorUIResource [UI] -TextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +TextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] TextField.caretBlinkRate 500 TextField.caretForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] TextField.darkShadow #7a8a99 javax.swing.plaf.ColorUIResource [UI] 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 072a74bd..5b1ab3b7 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 @@ -121,7 +121,9 @@ Button.shadow #44000000 javax.swing.plaf.ColorUIResource [UI Button.textIconGap 4 Button.textShiftOffset 0 Button.toolbar.hoverBackground #dfdfdf javax.swing.plaf.ColorUIResource [UI] +Button.toolbar.margin 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] Button.toolbar.pressedBackground #d8d8d8 javax.swing.plaf.ColorUIResource [UI] +Button.toolbar.spacingInsets 1,2,1,2 javax.swing.plaf.InsetsUIResource [UI] ButtonUI com.formdev.flatlaf.ui.FlatButtonUI @@ -516,7 +518,7 @@ FormView.submitButton.textAndMnemonic Submit Query #---- FormattedTextField ---- FormattedTextField.background #ffffff javax.swing.plaf.ColorUIResource [UI] -FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] FormattedTextField.caretBlinkRate 500 FormattedTextField.caretForeground #000000 javax.swing.plaf.ColorUIResource [UI] FormattedTextField.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] @@ -1031,7 +1033,7 @@ PanelUI com.apple.laf.AquaPanelUI #---- PasswordField ---- PasswordField.background #ffffff javax.swing.plaf.ColorUIResource [UI] -PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] PasswordField.capsLockIconColor #64000000 javax.swing.plaf.ColorUIResource [UI] PasswordField.caretBlinkRate 500 PasswordField.caretForeground #000000 javax.swing.plaf.ColorUIResource [UI] @@ -1786,6 +1788,7 @@ TextAreaUI com.formdev.flatlaf.ui.FlatTextAreaUI #---- TextComponent ---- +TextComponent.arc 0 TextComponent.selectAllOnFocusPolicy once TextComponent.selectionBackgroundInactive #d4d4d4 javax.swing.plaf.ColorUIResource [UI] @@ -1793,7 +1796,7 @@ TextComponent.selectionBackgroundInactive #d4d4d4 javax.swing.plaf.ColorUIRes #---- TextField ---- TextField.background #ffffff javax.swing.plaf.ColorUIResource [UI] -TextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +TextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] TextField.caretBlinkRate 500 TextField.caretForeground #000000 javax.swing.plaf.ColorUIResource [UI] TextField.darkShadow #000000 javax.swing.plaf.ColorUIResource [UI] @@ -2046,9 +2049,9 @@ ToolBar.ancestorInputMap [lazy] 8 javax.swing.plaf.InputMapUIResource [ pressed RIGHT navigateRight pressed UP navigateUp ToolBar.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] -ToolBar.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatToolBarBorder [UI] +ToolBar.border [lazy] 2,2,2,2 false com.formdev.flatlaf.ui.FlatToolBarBorder [UI] ToolBar.borderHandleColor #8c8c8c javax.swing.plaf.ColorUIResource [UI] -ToolBar.buttonMargins 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] +ToolBar.borderMargins 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] ToolBar.darkShadow #000000 javax.swing.plaf.ColorUIResource [UI] ToolBar.dockingBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] ToolBar.dockingForeground #0749d9 com.apple.laf.AquaImageFactory$SystemColorProxy [UI] @@ -2063,6 +2066,7 @@ ToolBar.light #0749d9 javax.swing.plaf.ColorUIResource [UI] ToolBar.separatorColor #d1d1d1 javax.swing.plaf.ColorUIResource [UI] ToolBar.separatorWidth 7 ToolBar.shadow #44000000 javax.swing.plaf.ColorUIResource [UI] +ToolBar.spacingBorder [lazy] 1,2,1,2 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] #---- ToolBarButton ---- diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt index 0d406724..9b17fdf2 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -438,7 +438,7 @@ FileView.hardDriveIcon [lazy] 16,16 com.formdev.flatlaf.icons.FlatFil #---- FormattedTextField ---- FormattedTextField.background #ffffff javax.swing.plaf.ColorUIResource [UI] -FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] FormattedTextField.caretBlinkRate 500 FormattedTextField.caretForeground #000000 javax.swing.plaf.ColorUIResource [UI] FormattedTextField.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] @@ -923,7 +923,7 @@ PanelUI javax.swing.plaf.basic.BasicPanelUI #---- PasswordField ---- PasswordField.background #ffffff javax.swing.plaf.ColorUIResource [UI] -PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] PasswordField.caretBlinkRate 500 PasswordField.caretForeground #000000 javax.swing.plaf.ColorUIResource [UI] PasswordField.disabledBackground #f2f2f2 javax.swing.plaf.ColorUIResource [UI] @@ -1682,13 +1682,14 @@ TextAreaUI com.formdev.flatlaf.ui.FlatTextAreaUI #---- TextComponent ---- +TextComponent.arc 0 TextComponent.selectAllOnFocusPolicy once #---- TextField ---- TextField.background #ffffff javax.swing.plaf.ColorUIResource [UI] -TextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] +TextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] TextField.caretBlinkRate 500 TextField.caretForeground #000000 javax.swing.plaf.ColorUIResource [UI] TextField.darkShadow #7a8a99 javax.swing.plaf.ColorUIResource [UI]