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

GP-3089 - Theme Fixes

Browse source
This commit is contained in:
dragonmacher 2023-02-17 11:19:02 -05:00
parent 1e8d324166
commit 7adfd1e8fb
12 changed files with 84 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ghidra/Features/Base/data/base.theme.properties
View file

@ -140,12 +140,6 @@ color.bg.plugin.overview.entropy.uninitialized = blue
color.bg.plugin.overview.entropy.palette.base.low = black
color.bg.plugin.overview.entropy.palette.base.high = white
color.bg.plugin.programdiff.highlight = moccasin
color.bg.plugin.programdiff.details.address = #009999
color.bg.plugin.programdiff.details.comment = #009900
color.bg.plugin.programdiff.details.danger = #FF0000
color.bg.plugin.programdiff.details.emphasize = #009900
color.bg.plugin.references.table.active.operand = rgb(205, 205, 205)
@ -213,8 +207,6 @@ color.bg.plugin.editors.compositeeditor.byte.header = [color]system.color.bg.vie
color.fg.plugin.equate.enum = deepskyblue
color.bg.plugin.programdiff.highlight = darkRed
color.bg.plugin.references.table.active.operand = #5A5E60

20
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/marker/MarkerManager.java
View file

@ -28,6 +28,7 @@ import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.map.LazyMap;
import docking.widgets.PopupWindow;
import generic.theme.*;
import ghidra.app.nav.Navigatable;
import ghidra.app.services.*;
import ghidra.app.util.viewer.listingpanel.*;
@ -85,6 +86,7 @@ public class MarkerManager implements MarkerService {
private List<ChangeListener> listeners = new ArrayList<>();
private MarkerClickedListener markerClickedListener = null;
private ThemeListener themeListener = e -> themeChanged(e);
public MarkerManager(Plugin plugin) {
this(plugin.getName(), plugin.getTool());
@ -103,6 +105,13 @@ public class MarkerManager implements MarkerService {
primaryMarginProvider = createMarginProvider();
primaryOverviewProvider = createOverviewProvider();
Gui.addThemeListener(themeListener);
}
private void themeChanged(ThemeEvent e) {
if (e instanceof ColorChangedThemeEvent) {
markerSetCache.clearColors();
}
}
private void programClosed(Program program) {
@ -230,6 +239,7 @@ public class MarkerManager implements MarkerService {
}
public void dispose() {
Gui.removeThemeListener(themeListener);
updater.dispose();
markerSetCache.clear();
overviewProviders.forEach(provider -> provider.dispose());
@ -475,6 +485,12 @@ public class MarkerManager implements MarkerService {
return entry;
}
void clearColors() {
for (MarkerSetCacheEntry entry : map.values()) {
entry.clearColors();
}
}
public void clear() {
map.clear();
}
@ -509,6 +525,10 @@ public class MarkerManager implements MarkerService {
program.addCloseListener(closeListener);
}
void clearColors() {
colorCache.clear();
}
private void programClosed() {
program.removeCloseListener(closeListener);
cache.programClosed(program);

3
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/progmgr/MultiTabPanel.java
View file

@ -223,6 +223,7 @@ public class MultiTabPanel extends JPanel {
iconLabel.setToolTipText("Close");
iconLabel.setName("Close"); // junit access
iconLabel.setOpaque(true);
MouseListener iconSwitcherMouseListener = new MouseAdapter() {
@Override
@ -925,6 +926,8 @@ public class MultiTabPanel extends JPanel {
this.nameLabel = nameLabel;
this.labelPanel = labelPanel;
this.iconLabel = iconLabel;
setBackground(backgroundColor);
}
void refresh() {

1
Ghidra/Features/FunctionGraph/src/main/help/help/topics/FunctionGraphPlugin/Function_Graph.html
View file

@ -70,7 +70,6 @@
</TABLE><BR>
<BR>
<P>Once a graph is stale, you can press the refresh button at any time to have the graph
re-create itself <B>without performing a relayout</B>. The green box in the image above
contains the refresh button. Alternatively, you can press the <A href=

69
Ghidra/Features/FunctionGraph/src/main/java/ghidra/app/plugin/core/functiongraph/FGSatelliteUndockedProvider.java
View file

@ -1,69 +0,0 @@
/* ###
* IP: GHIDRA
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ghidra.app.plugin.core.functiongraph;
import java.awt.Dimension;
import java.awt.event.MouseEvent;
import javax.swing.Icon;
import javax.swing.JComponent;
import docking.*;
import generic.theme.GIcon;
import ghidra.app.plugin.core.functiongraph.mvc.FGController;
import ghidra.framework.plugintool.ComponentProviderAdapter;
import ghidra.util.HelpLocation;
public class FGSatelliteUndockedProvider extends ComponentProviderAdapter {
static final String NAME = "Function Graph Satellite";
private static final Icon ICON = new GIcon("icon.functiongraph.action.provider.satellite");
private FGController controller;
private JComponent satelliteComponent;
public FGSatelliteUndockedProvider(FunctionGraphPlugin plugin, FGController controller,
JComponent satelliteComponent) {
super(plugin.getTool(), NAME, plugin.getName());
this.controller = controller;
this.satelliteComponent = satelliteComponent;
satelliteComponent.setMinimumSize(new Dimension(400, 400));
setHelpLocation(new HelpLocation("FunctionGraphPlugin", "Satellite_View_Dock"));
setIcon(ICON);
setDefaultWindowPosition(WindowPosition.WINDOW);
setWindowMenuGroup(FunctionGraphPlugin.FUNCTION_GRAPH_NAME);
addToTool();
}
@Override
public ActionContext getActionContext(MouseEvent event) {
ComponentProvider primaryProvider = controller.getProvider();
return primaryProvider.getActionContext(event);
}
@Override
public JComponent getComponent() {
return satelliteComponent;
}
@Override
public void componentShown() {
controller.satelliteProviderShown();
}
}

10
Ghidra/Features/FunctionGraph/src/test.slow/java/ghidra/app/plugin/core/functiongraph/AbstractFunctionGraphTest.java
View file

@ -79,6 +79,8 @@ public abstract class AbstractFunctionGraphTest extends AbstractGhidraHeadedInte
protected static final Transferable DUMMY_TRANSFERABLE = new DummyTransferable();
protected static final String SATELLITE_NAME = "Function Graph Satellite";
protected PluginTool tool;
protected FunctionGraphPlugin graphPlugin;
protected ProgramDB program;
@ -2120,12 +2122,12 @@ public abstract class AbstractFunctionGraphTest extends AbstractGhidraHeadedInte
}
protected void assertNoUndockedProvider() {
ComponentProvider provider = tool.getComponentProvider(FGSatelliteUndockedProvider.NAME);
ComponentProvider provider = tool.getComponentProvider(SATELLITE_NAME);
assertNull("Undocked satellite provider is installed when it should not be", provider);
}
protected void assertUndockedProviderNotShowing() {
ComponentProvider provider = tool.getComponentProvider(FGSatelliteUndockedProvider.NAME);
ComponentProvider provider = tool.getComponentProvider(SATELLITE_NAME);
if (provider == null) {
return; // no provider; not showing
}
@ -2133,7 +2135,7 @@ public abstract class AbstractFunctionGraphTest extends AbstractGhidraHeadedInte
}
protected void assertUndockedProviderShowing() {
ComponentProvider provider = tool.getComponentProvider(FGSatelliteUndockedProvider.NAME);
ComponentProvider provider = tool.getComponentProvider(SATELLITE_NAME);
assertUndockedProviderShowing(provider);
}
@ -2173,7 +2175,7 @@ public abstract class AbstractFunctionGraphTest extends AbstractGhidraHeadedInte
}
protected void closeUndockedProvider() {
ComponentProvider provider = tool.getComponentProvider(FGSatelliteUndockedProvider.NAME);
ComponentProvider provider = tool.getComponentProvider(SATELLITE_NAME);
assertNotNull("Undocked provider is not installed when it should be", provider);
tool.showComponentProvider(provider, false);
waitForSwing();

11
Ghidra/Features/ProgramDiff/data/programdiff.theme.properties
View file

@ -1,6 +1,14 @@
[Defaults]
color.bg.plugin.programdiff.highlight = moccasin
color.bg.plugin.programdiff.details.address = #009999
color.bg.plugin.programdiff.details.comment = #009900
color.bg.plugin.programdiff.details.danger = #FF0000
color.bg.plugin.programdiff.details.emphasize = #009900
icon.plugin.programdiff.apply = pencil16.png
icon.plugin.programdiff.apply.next = pencil_arrow16.png
icon.plugin.programdiff.ignore = eraser_arrow16.png
@ -10,5 +18,8 @@ icon.plugin.programdiff.open.close.program = table_relationship.png
icon.plugin.programdiff.settings = settings16.gif
icon.plugin.programdiff.cursor.location = cursor_arrow.gif
[Dark Defaults]
color.bg.plugin.programdiff.highlight = #4D4D2A

12
Ghidra/Framework/Docking/src/main/java/docking/widgets/label/AbstractHtmlLabel.java
View file

@ -48,6 +48,7 @@ public abstract class AbstractHtmlLabel extends JLabel
private static final String HTML_TAG = "<html>";
private boolean isUpdating = false;
private boolean isHtml = false;
protected AbstractHtmlLabel() {
addPropertyChangeListener(this);
@ -64,6 +65,10 @@ public abstract class AbstractHtmlLabel extends JLabel
// do not pass <html> up to the parent so that it does not install its own html rendering
if (text != null && text.toLowerCase().startsWith(HTML_TAG)) {
text = text.substring(HTML_TAG.length());
isHtml = true;
}
else {
isHtml = false;
}
super.setText(text);
@ -80,7 +85,7 @@ public abstract class AbstractHtmlLabel extends JLabel
private void updateHtmlView() {
String text = getText();
if (text == null || !isHTMLRenderingEnabled()) {
if (text == null || !isHtml || !isHTMLRenderingEnabled()) {
putClientProperty(BasicHTML.propertyKey, null);
return;
}
@ -211,10 +216,9 @@ public abstract class AbstractHtmlLabel extends JLabel
String size = Integer.toString(font.getSize());
String weight = font.isBold() ? "700" : "400";
String style = font.isItalic() ? "italic" : "normal";
String color = WebColors.toString(bg);
String color = WebColors.toString(bg, false);
String css = String.format(s, family, size, weight, style, color);
StyleSheet styleSheet = getStyleSheet();
styleSheet.addRule(css);
ss.addRule(css);
}
@Override

4
Ghidra/Framework/Graph/src/main/java/ghidra/graph/viewer/renderer/VisualVertexSatelliteRenderer.java
View file

@ -87,8 +87,12 @@ public class VisualVertexSatelliteRenderer<V extends VisualVertex, E extends Vis
return;
}
// this makes the plain vertices easier to see
paintDropShadow(rc, g, shape);
g.setPaint(fillPaint);
g.fill(shape);
g.setPaint(oldPaint);
}

1
Ghidra/Framework/Gui/data/gui.palette.theme.properties
View file

@ -49,6 +49,7 @@ color.palette.pink = pink
color.palette.purple = purple
color.palette.red = red
color.palette.silver = silver
color.palette.slateblue = slateblue
color.palette.steelblue = steelblue
color.palette.tan = tan
color.palette.teal = teal

2
Ghidra/Framework/Gui/src/main/java/generic/theme/ApplicationThemeManager.java
View file

@ -228,8 +228,8 @@ public class ApplicationThemeManager extends ThemeManager {
}
updateChangedValuesMap(currentValue, newValue);
currentValues.addColor(newValue);
lookAndFeelManager.colorsChanged();
notifyThemeChanged(new ColorChangedThemeEvent(currentValues, newValue));
lookAndFeelManager.colorsChanged();
}
@Override

3
Ghidra/Framework/Gui/src/main/java/generic/theme/laf/LookAndFeelManager.java
View file

@ -213,7 +213,8 @@ public abstract class LookAndFeelManager {
}
/**
* Subclass provide this method to install the specific loo
* Subclass provide this method to install the specific look and feel.
*
* @throws ClassNotFoundException if the <code>LookAndFeel</code>
* class could not be found
* @throws InstantiationException if a new instance of the class