Mercurial > hg > icedtea9-forest > jdk
changeset 5539:cc8d1cc533bf
7149005: [macosx] Java Control Panel's UI controls are distorted when draging scroll bar.
Reviewed-by: serb
author | alexp |
---|---|
date | Sat, 12 May 2012 17:46:00 +0400 |
parents | 3b8635e357e9 |
children | 69301efaac91 |
files | src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java |
diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java Sat May 12 12:01:36 2012 +0400 +++ b/src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java Sat May 12 17:46:00 2012 +0400 @@ -30,6 +30,7 @@ import javax.swing.*; import javax.swing.border.Border; +import javax.swing.plaf.UIResource; import javax.swing.plaf.basic.BasicHTML; import javax.swing.text.View; @@ -76,8 +77,11 @@ protected void setThemeBorder(final AbstractButton b) { super.setThemeBorder(b); - // Set the correct border - b.setBorder(AquaButtonBorder.getBevelButtonBorder()); + Border border = b.getBorder(); + if (border == null || border instanceof UIResource) { + // Set the correct border + b.setBorder(AquaButtonBorder.getBevelButtonBorder()); + } } protected abstract AquaButtonBorder getPainter();