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

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fixes-12-3-24'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-12-03 10:02:43 -05:00
parent edf9353999 180668de0d
commit 480fd0c5f5
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Docking/src/main/java/docking/ComponentProvider.java
+1 -1
View File
@@ -146,7 +146,7 @@ public abstract class ComponentProvider implements HelpDescriptor, ActionContext
* {@link #getContextType()} * {@link #getContextType()}
*/ */
public ComponentProvider(Tool tool, String name, String owner, Class<?> contextType) { public ComponentProvider(Tool tool, String name, String owner, Class<?> contextType) {
this.dockingTool = tool; this.dockingTool = Objects.requireNonNull(tool);
this.name = name; this.name = name;
this.owner = owner; this.owner = owner;
this.title = name; this.title = name;
Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
+2 -2
View File
@@ -503,7 +503,7 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
} }
/** /**
* Returns true if the specified provider's component is visible * Returns true if the specified provider's component is or soon will be visible.
* *
* @param provider component provider * @param provider component provider
* @return true if the specified provider's component is visible * @return true if the specified provider's component is visible
@@ -511,7 +511,7 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
public boolean isVisible(ComponentProvider provider) { public boolean isVisible(ComponentProvider provider) {
ComponentPlaceholder placeholder = getActivePlaceholder(provider); ComponentPlaceholder placeholder = getActivePlaceholder(provider);
if (placeholder != null) { if (placeholder != null) {
return placeholder.isShowing(); return placeholder.isActive();
} }
return false; return false;
} }
Ghidra/Framework/Docking/src/main/java/docking/PlaceholderManager.java
+1 -1
View File
@@ -64,7 +64,7 @@ class PlaceholderManager {
} }
if (defaultPlaceholder.isActive() != restoredPlaceholder.isActive()) { if (defaultPlaceholder.isActive() != restoredPlaceholder.isActive()) {
if (restoredPlaceholder.isShowing()) { if (restoredPlaceholder.isActive()) {
provider.componentShown(); provider.componentShown();
} }
else { else {