yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 09:49:23 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch

Browse source 
'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
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Ghidra/Framework/Docking/src/main/java/docking/widgets/EmptyBorderButton.java
View file

@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -128,6 +128,16 @@ public class EmptyBorderButton extends JButton {
super.setIcon(newIcon); 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() { private void installLookAndFeelFix() {
// We want our custom buttons to paint themselves blended with the background. Several // 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. // LookAndFeels do not do this (WinXP and Metal), so we override that behavior here.