From e79880d3051a65d85fa9f71cde48b9b28ca19105 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Tue, 5 May 2020 18:44:54 +0200 Subject: [PATCH] ToolTip: made border darker (to make it better and no longer paint disabled tips (issue #94) --- .../main/resources/com/formdev/flatlaf/FlatLaf.properties | 8 -------- .../resources/com/formdev/flatlaf/FlatLightLaf.properties | 1 + .../testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt | 2 -- .../flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt | 2 -- .../testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt | 4 +--- .../flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt | 4 +--- 6 files changed, 3 insertions(+), 18 deletions(-) diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties index 8ee44ee3..277123b9 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties @@ -591,14 +591,6 @@ ToolBar.spacingBorder=$Button.toolbar.spacingInsets ToolTipManager.enableToolTipMode=activeApplication -#---- ToolTip ---- - -ToolTip.border=4,6,4,6,$Component.borderColor -ToolTip.borderInactive=null -ToolTip.backgroundInactive=$ToolTip.background -ToolTip.foregroundInactive=@disabledText - - #---- Tree ---- Tree.border=1,1,1,1 diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties index d38e68cb..1c7a2bd0 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -269,6 +269,7 @@ ToggleButton.toolbar.selectedBackground=$ToggleButton.selectedBackground #---- ToolTip ---- +ToolTip.border=4,6,4,6,$InternalFrame.activeBorderColor ToolTip.background=#fafafa 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 706ffb22..178761a8 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 @@ -1092,11 +1092,9 @@ ToolBarUI com.formdev.flatlaf.ui.FlatToolBarUI #---- ToolTip ---- ToolTip.background #1e2123 javax.swing.plaf.ColorUIResource [UI] -ToolTip.backgroundInactive #1e2123 javax.swing.plaf.ColorUIResource [UI] ToolTip.border [lazy] 4,6,4,6 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] ToolTip.font [active] $defaultFont [UI] ToolTip.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -ToolTip.foregroundInactive #777777 javax.swing.plaf.ColorUIResource [UI] #---- ToolTipManager ---- 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 7edd1d06..7d1a07e6 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 @@ -1090,11 +1090,9 @@ ToolBarUI com.formdev.flatlaf.ui.FlatToolBarUI #---- ToolTip ---- ToolTip.background #1e2123 javax.swing.plaf.ColorUIResource [UI] -ToolTip.backgroundInactive #1e2123 javax.swing.plaf.ColorUIResource [UI] ToolTip.border [lazy] 4,6,4,6 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] ToolTip.font [active] $defaultFont [UI] ToolTip.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -ToolTip.foregroundInactive #777777 javax.swing.plaf.ColorUIResource [UI] #---- ToolTipManager ---- 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 99956988..7c13a2eb 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 @@ -1094,11 +1094,9 @@ ToolBarUI com.formdev.flatlaf.ui.FlatToolBarUI #---- ToolTip ---- ToolTip.background #fafafa javax.swing.plaf.ColorUIResource [UI] -ToolTip.backgroundInactive #fafafa javax.swing.plaf.ColorUIResource [UI] -ToolTip.border [lazy] 4,6,4,6 false com.formdev.flatlaf.ui.FlatLineBorder [UI] lineColor=#c4c4c4 javax.swing.plaf.ColorUIResource [UI] lineThickness=1.000000 +ToolTip.border [lazy] 4,6,4,6 false com.formdev.flatlaf.ui.FlatLineBorder [UI] lineColor=#919191 javax.swing.plaf.ColorUIResource [UI] lineThickness=1,000000 ToolTip.font [active] $defaultFont [UI] ToolTip.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -ToolTip.foregroundInactive #8c8c8c javax.swing.plaf.ColorUIResource [UI] #---- ToolTipManager ---- 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 521ed1a1..e3344f54 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 @@ -1092,11 +1092,9 @@ ToolBarUI com.formdev.flatlaf.ui.FlatToolBarUI #---- ToolTip ---- ToolTip.background #fafafa javax.swing.plaf.ColorUIResource [UI] -ToolTip.backgroundInactive #fafafa javax.swing.plaf.ColorUIResource [UI] -ToolTip.border [lazy] 4,6,4,6 false com.formdev.flatlaf.ui.FlatLineBorder [UI] lineColor=#c4c4c4 javax.swing.plaf.ColorUIResource [UI] lineThickness=1,000000 +ToolTip.border [lazy] 4,6,4,6 false com.formdev.flatlaf.ui.FlatLineBorder [UI] lineColor=#919191 javax.swing.plaf.ColorUIResource [UI] lineThickness=1,000000 ToolTip.font [active] $defaultFont [UI] ToolTip.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -ToolTip.foregroundInactive #8c8c8c javax.swing.plaf.ColorUIResource [UI] #---- ToolTipManager ----