From 3cdc5fa537ec36a6b4c529cf07313f3b4101cdf4 Mon Sep 17 00:00:00 2001 From: Alexander Potochkin Date: Sat, 12 May 2012 17:46:00 +0400 Subject: [PATCH] 7149005: [macosx] Java Control Panel's UI controls are distorted when draging scroll bar Reviewed-by: serb --- .../macosx/classes/com/apple/laf/AquaButtonLabeledUI.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jdk/src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java b/jdk/src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java index 95503c8271d..d9ebdd0e11d 100644 --- a/jdk/src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java +++ b/jdk/src/macosx/classes/com/apple/laf/AquaButtonLabeledUI.java @@ -30,6 +30,7 @@ import java.awt.image.BufferedImage; 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 @@ public abstract class AquaButtonLabeledUI extends AquaButtonToggleUI implements 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();