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

GT-3103 - Look and Feel - fixed Linux Nimbus LaF issues with painting

Browse source 
list item backgrounds
This commit is contained in:
dragonmacher 2019-08-26 10:17:28 -04:00
parent aa71d84620
commit 667c17499f
6 changed files with 33 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Framework/Docking/src/main/java/docking/action/ShowFocusInfoAction.java
View file

@ -78,6 +78,11 @@ public class ShowFocusInfoAction extends DockingAction {
log.info("Active Java Window: " + printComp(kfm.getActiveWindow()));
log.info("Focused Java Window: " + printComp(kfm.getFocusedWindow()));
log.info("Focused Java Component: " + printComp(kfm.getFocusOwner()));
Object mouseOverObject = DockingWindowManager.getMouseOverObject();
if (mouseOverObject instanceof Component) {
log.info("Mouse-over Object: " + printComp((Component) mouseOverObject));
}
log.info("");
}

10
Ghidra/Framework/Docking/src/main/java/docking/widgets/AbstractGCellRenderer.java
View file

@ -101,7 +101,7 @@ public abstract class AbstractGCellRenderer extends GDHtmlLabel {
protected Color getOSDependentBackgroundColor(JComponent parent, int row) {
if (!shouldAlternateRowBackgroundColor()) {
return parent.getBackground();
return getDefaultBackgroundColor();
}
// For now we always alternate row colors--it actually makes the various LaFs look nicer
@ -155,10 +155,14 @@ public abstract class AbstractGCellRenderer extends GDHtmlLabel {
return boldFont;
}
protected static Color getBackgroundColorForRow(int row) {
protected Color getDefaultBackgroundColor() {
return Color.WHITE;
}
protected Color getBackgroundColorForRow(int row) {
if ((row & 1) == 1) {
return Color.WHITE;
return getDefaultBackgroundColor();
}
return ALTERNATE_BACKGROUND_COLOR;
}

2
Ghidra/Framework/Docking/src/main/java/docking/widgets/DropDownTextField.java
View file

@ -345,6 +345,8 @@ public class DropDownTextField<T> extends JTextField implements GComponent {
if (isShowing()) {
updateWindowLocation();
showMatchingWindow();
previewLabel.setBackground(TOOLTIP_WINDOW_BGCOLOR);
toolTipWindow.setVisible(hasPreview());
}
}

3
Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/DirectoryList.java
View file

@ -58,7 +58,8 @@ class DirectoryList extends GList<File> implements GhidraFileChooserDirectoryMod
private void build() {
setLayoutOrientation(JList.VERTICAL_WRAP);
setCellRenderer((cellRenderer = new FileListCellRenderer(getFont(), chooser)));
cellRenderer = new FileListCellRenderer(getFont(), chooser);
setCellRenderer(cellRenderer);
model.addListDataListener(new ListDataListener() {
@Override
public void contentsChanged(ListDataEvent e) {

26
Ghidra/Framework/Docking/src/main/java/docking/widgets/filechooser/GhidraFileChooser.java
View file

@ -72,6 +72,8 @@ import util.HistoryList;
public class GhidraFileChooser extends DialogComponentProvider
implements GhidraFileChooserListener, FileFilter {
private static final Color FOREROUND_COLOR = Color.BLACK;
private static final Color BACKGROUND_COLOR = Color.WHITE;
static final String PREFERENCES_PREFIX = "G_FILE_CHOOSER";
private static final String WIDTH_PREFERENCE_PREFIX = PREFERENCES_PREFIX + ".WIDTH.";
private static final String HEIGHT_PREFERENCE_PREFIX = PREFERENCES_PREFIX + ".HEIGHT.";
@ -295,7 +297,7 @@ public class GhidraFileChooser extends DialogComponentProvider
myComputerButton.setName("MY_COMPUTER_BUTTON");
myComputerButton.setIcon(ResourceManager.loadImage("images/computer.png"));
myComputerButton.addActionListener(e -> updateMyComputer());
myComputerButton.setForeground(Color.BLACK);
myComputerButton.setForeground(FOREROUND_COLOR);
desktopButton = new FileChooserToggleButton("Desktop") {
@Override
@ -306,7 +308,7 @@ public class GhidraFileChooser extends DialogComponentProvider
desktopButton.setName("DESKTOP_BUTTON");
desktopButton.setIcon(ResourceManager.loadImage("images/desktop.png"));
desktopButton.addActionListener(e -> updateDesktop());
desktopButton.setForeground(Color.BLACK);
desktopButton.setForeground(FOREROUND_COLOR);
desktopButton.setEnabled(fileChooserModel.getDesktopDirectory() != null);
homeButton = new FileChooserToggleButton("Home") {
@ -318,7 +320,7 @@ public class GhidraFileChooser extends DialogComponentProvider
homeButton.setName("HOME_BUTTON");
homeButton.setIcon(ResourceManager.loadImage("images/user-home.png"));
homeButton.addActionListener(e -> updateHome());
homeButton.setForeground(Color.BLACK);
homeButton.setForeground(FOREROUND_COLOR);
recentButton = new FileChooserToggleButton("Recent") {
@Override
@ -334,7 +336,7 @@ public class GhidraFileChooser extends DialogComponentProvider
recentButton.setIcon(multiIcon);
recentButton.addActionListener(e -> updateRecent());
recentButton.setForeground(Color.BLACK);
recentButton.setForeground(FOREROUND_COLOR);
shortCutButtonGroup = new UnselectableButtonGroup();
shortCutButtonGroup.add(myComputerButton);
@ -351,7 +353,7 @@ public class GhidraFileChooser extends DialogComponentProvider
JPanel panel = new JPanel(new BorderLayout());
panel.setBorder(BorderFactory.createLoweredBevelBorder());
panel.setBackground(Color.WHITE.darker());
panel.setBackground(BACKGROUND_COLOR.darker());
panel.add(shortCutPanel, BorderLayout.NORTH);
return panel;
}
@ -389,7 +391,7 @@ public class GhidraFileChooser extends DialogComponentProvider
JLabel filterLabel = new GLabel("Type:");
filterCombo = new GComboBox<>();
filterCombo.setRenderer(GListCellRenderer.createDefaultCellTextRenderer(
gff -> gff != null ? gff.getDescription() : ""));
fileFilter -> fileFilter != null ? fileFilter.getDescription() : ""));
filterCombo.addItemListener(e -> rescanCurrentDirectory());
filterModel = (DefaultComboBoxModel<GhidraFileFilter>) filterCombo.getModel();
@ -452,7 +454,7 @@ public class GhidraFileChooser extends DialogComponentProvider
private void buildWaitPanel() {
waitPanel = new JPanel(new BorderLayout());
waitPanel.setBorder(BorderFactory.createLoweredBevelBorder());
waitPanel.setBackground(Color.WHITE);
waitPanel.setBackground(BACKGROUND_COLOR);
waitPanel.addMouseListener(new MouseAdapter() {
@Override
public void mouseReleased(MouseEvent e) {
@ -538,6 +540,7 @@ public class GhidraFileChooser extends DialogComponentProvider
/**
* When <b>true</b> is passed the chooser will use a detailed table view to show the files;
* false will show a simplified list of files.
* @param showDetails true to show details
*/
public void setShowDetails(boolean showDetails) {
if (detailsButton.isSelected() != showDetails) {
@ -555,9 +558,10 @@ public class GhidraFileChooser extends DialogComponentProvider
directoryListModel = new DirectoryListModel();
directoryList = new DirectoryList(this, directoryListModel);
directoryList.setName("LIST");
directoryList.setBackground(BACKGROUND_COLOR);
directoryScroll = new JScrollPane(directoryList);
directoryScroll.getViewport().setBackground(Color.WHITE);
directoryScroll.getViewport().setBackground(BACKGROUND_COLOR);
directoryScroll.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER);
directoryScroll.addComponentListener(new ComponentAdapter() {
//if the scroll pane is resized, we need to adjust
@ -627,7 +631,6 @@ public class GhidraFileChooser extends DialogComponentProvider
*
* @exception IllegalArgumentException if <code>mode</code> is an
* illegal Dialog mode
* @see #getFileSelectionMode
* @deprecated use instead {@link #setFileSelectionMode(GhidraFileChooserMode)}
*/
@Deprecated
@ -1422,9 +1425,10 @@ public class GhidraFileChooser extends DialogComponentProvider
directoryTableModel = new DirectoryTableModel(this);
directoryTable = new DirectoryTable(this, directoryTableModel);
directoryTable.setName("TABLE");
directoryTable.setBackground(BACKGROUND_COLOR);
JScrollPane scrollPane = new JScrollPane(directoryTable);
scrollPane.getViewport().setBackground(Color.WHITE);
scrollPane.getViewport().setBackground(BACKGROUND_COLOR);
return scrollPane;
}
@ -1628,6 +1632,7 @@ public class GhidraFileChooser extends DialogComponentProvider
* <b>
* If you don't know how to use this method, then don't call it!
* </b>
* @param file the file chosen by the user
*/
void userChoseFile(File file) {
doChooseFile(file);
@ -1640,6 +1645,7 @@ public class GhidraFileChooser extends DialogComponentProvider
* <b>
* If you don't know how to use this method, then don't call it!
* </b>
* @param files the files to select
*/
void userSelectedFiles(List<File> files) {
selectedFiles.setFiles(files);

3
Ghidra/Framework/Docking/src/main/java/docking/widgets/list/GListCellRenderer.java
View file

@ -137,8 +137,7 @@ public class GListCellRenderer<E> extends AbstractGCellRenderer implements ListC
* @return a new Dimension containing a width and height value necessary to display the largest
* element in the list
*/
public Dimension computePlainTextListCellDimensions(JList<? extends E> list,
List<E> items,
public Dimension computePlainTextListCellDimensions(JList<? extends E> list, List<E> items,
int minWidth, int minHeight) {
configureFont(list, list.getModel(), 0);
FontMetrics metrics = getFontMetrics(getFont());