yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-04 18:29:37 +02:00
Code Issues Releases Wiki Activity

GT-2698 refactor UI elements to lock down HTML rendering

Browse source
This commit is contained in:
dev747368 2019-04-11 15:55:56 -04:00
parent a03c96d37b
commit e0c25b0590
360 changed files with 3895 additions and 4563 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Ghidra/Features/Base/src/main/java/help/screenshot/ImageDialogProvider.java
View file

@ -27,8 +27,7 @@ import java.util.Collection;
import javax.imageio.ImageIO;
import javax.swing.*;
import docking.ActionContext;
import docking.DialogComponentProvider;
import docking.*;
import docking.action.DockingAction;
import docking.action.ToolBarData;
import ghidra.util.Msg;
@ -170,18 +169,18 @@ public class ImageDialogProvider extends DialogComponentProvider {
JPanel imagePanel = new JPanel(new BorderLayout());
newImageLabel = new JLabel(new ImageIcon(newImage));
newImageLabel = DockingUtils.createNonHtmlLabel(new ImageIcon(newImage));
newImageLabel.setOpaque(true);
newImageLabel.setBackground(Color.BLACK);
JPanel newLabelPanel = new JPanel(new BorderLayout());
if (oldImage != null) {
oldImageLabel = new JLabel(new ImageIcon(oldImage));
oldImageLabel = DockingUtils.createNonHtmlLabel(new ImageIcon(oldImage));
oldImageLabel.setOpaque(true);
oldImageLabel.setBackground(Color.BLACK);
}
else {
oldImageLabel = new JLabel(" Old image not found ");
oldImageLabel = DockingUtils.createNonHtmlLabel(" Old image not found ");
}
newLabelPanel.add(createImageLabelComponent("New Image"), BorderLayout.NORTH);
@ -213,7 +212,8 @@ public class ImageDialogProvider extends DialogComponentProvider {
}
private JLabel createNameLabel(String name) {
JLabel label = new JLabel("<html><b><font color='yellow' size='8'>" + name);
JLabel label =
DockingUtils.createHtmlLabel("<html><b><font color='yellow' size='8'>" + name);
label.setOpaque(true);
// label.setForeground(Color.YELLOW);
label.setBackground(Color.BLACK);