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

Test fix for splash screen test

Browse source
This commit is contained in:
dragonmacher 2021-02-19 18:19:50 -05:00
parent 45927bb9c3
commit aaf3bcef17
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Ghidra/Framework/Docking/src/main/java/docking/DockingWindowManager.java
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) {