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

Merge remote-tracking branch 'origin/GP-0-dragonmacher-test-fix-2-19-21'

Browse Source
This commit is contained in:
ghidra1
2021-02-22 13:44:05 -05:00
parent 198001742f aaf3bcef17
commit c3c4e15d73
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
+15 -5
View File
@@ -1735,11 +1735,7 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
}
Component bestCenter = getJavaActiveWindow();
Window bestParent = getParentWindow(bestCenter);
if (!provider.isModal()) {
bestParent = getBestNonModalParent(provider, bestParent);
}
Window bestParent = getBestParent(provider, bestCenter);
//
// Note: prefer the active window; allow user's choice of center component when it is
@@ -1762,6 +1758,20 @@ public class DockingWindowManager implements PropertyChangeListener, Placeholder
}
}
private static Window getBestParent(DialogComponentProvider provider, Component component) {
Window bestParent = getParentWindow(component);
if (!provider.isModal()) {
bestParent = getBestNonModalParent(provider, bestParent);
}
if (bestParent == null) {
KeyboardFocusManager kfm = KeyboardFocusManager.getCurrentKeyboardFocusManager();
bestParent = kfm.getActiveWindow();
}
return bestParent;
}
private static Window getBestNonModalParent(DialogComponentProvider newProvider,
Window bestParent) {