Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-29 15:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch

Browse Source 
'origin/GP-1018-dragonamcher-modal-dialog-disappearance' into
Ghidra_10.0 (Closes #3103)
This commit is contained in:
ghidra1 2021-06-07 18:05:47 -04:00
commit f6be13972b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
View File

@ -1775,7 +1775,7 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
return bestParent;
}
private static Window getBestNonModalParent(DialogComponentProvider newProvider,
private static Window getBestNonModalParent(DialogComponentProvider providerToShow,
Window bestParent) {
Window activeWindow = getJavaActiveWindow();
@ -1801,10 +1801,20 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
}
int activeId = activeProvider.getId();
int newId = newProvider.getId();
if (newId < activeId) {
// the new provider is actually older than the active window--do not parent the
// new provider to that window
int providerId = providerToShow.getId();
if (providerId < activeId) {
// The provider being shown is older than the active window--do not parent the provider
// to that window. The older age suggests that the new provider was shown on a delay
// and should really be considered to live behind the active modal dialog.
return bestParent;
}
if (activeProvider.isTransient()) {
// This prevents transient modal dialogs from being parents to non-modal dialogs. This
// can cause the non-modal dialog to be closed when the transient modal dialog goes
// away. There is the possibility of the non-modal dialog being blocked if not parented
// the this modal dialog. If we find a use case that exposes this pattern, then we
// will have to revisit how this method chooses to parent.
return bestParent;
}