Merge remote-tracking branch

'origin/GP-5584_ghidragon_fixing_toolbar_icon_spacing_issue'
(Closes #7984)
This commit is contained in:
Ryan Kurtz 2025-04-10 14:18:40 -04:00
commit 6d0c89f9fd

View file

@ -128,6 +128,16 @@ public class EmptyBorderButton extends JButton {
super.setIcon(newIcon);
}
@Override
public void setBorder(Border border) {
// To keep UI from installing a non-appropriate border (such as when switching themes),
// only allow borders created by this class to be set.
if (border == RAISED_BUTTON_BORDER || border == LOWERED_BUTTON_BORDER ||
border == FOCUSED_BUTTON_BORDER || border == NO_BUTTON_BORDER) {
super.setBorder(border);
}
}
private void installLookAndFeelFix() {
// We want our custom buttons to paint themselves blended with the background. Several
// LookAndFeels do not do this (WinXP and Metal), so we override that behavior here.