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

GP-2961 - Theme Fixes - Many changes to deal with odd rendering behavior in Nimbus and the Flat LaFs.

Browse source
This commit is contained in:
dragonmacher 2022-12-29 14:51:25 -05:00
parent f443b2a907
commit fc301bb386
24 changed files with 274 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Features/Python/data/python.theme.properties
View file

@ -15,5 +15,7 @@ color.fg.plugin.python.syntax.special = darkgreen
icon.plugin.python = python.png
[Dark Defaults]

8
Ghidra/Features/Python/src/main/help/help/topics/Python/interpreter.html
View file

@ -2,9 +2,6 @@
<HTML>
<HEAD>
<META name="generator" content=
"HTML Tidy for Java (vers. 2009-12-01), see jtidy.sourceforge.net">
<TITLE>Python Interpreter</TITLE>
<LINK rel="stylesheet" type="text/css" href="help/shared/DefaultStyle.css">
</HEAD>
@ -165,5 +162,10 @@
<P align="left" class="providedbyplugin">Provided by: <I>PythonPlugin</I></P>
<P>&nbsp;</P>
<BR>
<BR>
<BR>
</BODY>
</HTML>

24
Ghidra/Features/Python/src/main/java/ghidra/python/PythonCodeCompletionFactory.java
View file

@ -194,7 +194,7 @@ public class PythonCodeCompletionFactory {
PyObject pyObj) {
return newCodeCompletion(description, insertion, pyObj, "");
}
/**
* Creates a new CodeCompletion from the given Python objects.
*
@ -235,7 +235,7 @@ public class PythonCodeCompletionFactory {
}
}
}
int charsToRemove = userInput.length();
return new CodeCompletion(description, insertion, comp, charsToRemove);
}
@ -249,18 +249,6 @@ public class PythonCodeCompletionFactory {
includeTypes = options.getBoolean(INCLUDE_TYPES_LABEL, INCLUDE_TYPES_DEFAULT);
options.registerOption(INCLUDE_TYPES_LABEL, INCLUDE_TYPES_DEFAULT, null,
INCLUDE_TYPES_DESCRIPTION);
Iterator<?> iter = classes.iterator();
while (iter.hasNext()) {
Class<?> currentClass = (Class<?>) iter.next();
options.registerOption(
COMPLETION_LABEL + Options.DELIMITER + getSimpleName(currentClass),
classToColorMap.get(currentClass), null,
"Color to use for " + classDescription.get(currentClass) + ".");
classToColorMap.put(currentClass,
options.getColor(COMPLETION_LABEL + Options.DELIMITER + getSimpleName(currentClass),
classToColorMap.get(currentClass)));
}
}
/**
@ -279,13 +267,7 @@ public class PythonCodeCompletionFactory {
*/
public static void changeOptions(Options options, String name, Object oldValue,
Object newValue) {
String classSimpleName = name.substring((COMPLETION_LABEL + Options.DELIMITER).length());
Class<?> klass = simpleNameToClass.get(classSimpleName);
if (classToColorMap.containsKey(klass)) {
classToColorMap.put(klass, (Color) newValue);
}
else if (name.equals(INCLUDE_TYPES_LABEL)) {
if (name.equals(INCLUDE_TYPES_LABEL)) {
includeTypes = ((Boolean) newValue).booleanValue();
}
else {