Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-31 19:28:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-3509-dragonmacher-python-prompt-spacing' into patch
(Closes #5379)
This commit is contained in:
Ryan Kurtz
2023-05-31 08:37:33 -04:00
parent aa2ac78dc3 d3912c5e0f
commit 1fcaf3c9cd
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/interpreter/InterpreterPanel.java
+7 -3
View File
@@ -132,6 +132,10 @@ public class InterpreterPanel extends JPanel implements OptionsChangeListener {
promptTextPane.setBackground(BG_COLOR); promptTextPane.setBackground(BG_COLOR);
inputTextPane.setBackground(BG_COLOR); inputTextPane.setBackground(BG_COLOR);
// Reduce the gap after the prompt text. The UI will not calculate its preferred size with
// a minimum width if the insets have been set.
promptTextPane.setMargin(new Insets(0, 0, 0, 0));
history = new HistoryManagerImpl(); history = new HistoryManagerImpl();
outputScrollPane.setFocusable(false); outputScrollPane.setFocusable(false);
@@ -381,7 +385,7 @@ public class InterpreterPanel extends JPanel implements OptionsChangeListener {
private void createOptions() { private void createOptions() {
ToolOptions options = tool.getOptions("Console"); ToolOptions options = tool.getOptions("Console");
// TODO: change help anchor name // TODO: change help anchor name
HelpLocation help = new HelpLocation(getName(), "ConsolePlugin"); HelpLocation help = new HelpLocation(getName(), "ConsolePlugin");
options.setOptionsHelpLocation(help); options.setOptionsHelpLocation(help);
@@ -396,7 +400,7 @@ public class InterpreterPanel extends JPanel implements OptionsChangeListener {
completionWindowTrigger = completionWindowTrigger =
options.getEnum(COMPLETION_WINDOW_TRIGGER_LABEL, CompletionWindowTrigger.TAB); options.getEnum(COMPLETION_WINDOW_TRIGGER_LABEL, CompletionWindowTrigger.TAB);
// TODO // TODO
// highlightCompletion = // highlightCompletion =
// options.getBoolean(HIGHLIGHT_COMPLETION_OPTION_LABEL, DEFAULT_HIGHLIGHT_COMPLETION); // options.getBoolean(HIGHLIGHT_COMPLETION_OPTION_LABEL, DEFAULT_HIGHLIGHT_COMPLETION);
// options.setDescription(HIGHLIGHT_COMPLETION_OPTION_LABEL, HIGHLIGHT_COMPLETION_DESCRIPTION); // options.setDescription(HIGHLIGHT_COMPLETION_OPTION_LABEL, HIGHLIGHT_COMPLETION_DESCRIPTION);
@@ -415,7 +419,7 @@ public class InterpreterPanel extends JPanel implements OptionsChangeListener {
else if (optionName.equals(COMPLETION_WINDOW_TRIGGER_LABEL)) { else if (optionName.equals(COMPLETION_WINDOW_TRIGGER_LABEL)) {
completionWindowTrigger = (CompletionWindowTrigger) newValue; completionWindowTrigger = (CompletionWindowTrigger) newValue;
} }
// TODO // TODO
// else if (optionName.equals(HIGHLIGHT_COMPLETION_OPTION_LABEL)) { // else if (optionName.equals(HIGHLIGHT_COMPLETION_OPTION_LABEL)) {
// highlightCompletion = ((Boolean) newValue).booleanValue(); // highlightCompletion = ((Boolean) newValue).booleanValue();
// } // }