Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-29 08:08:32 +08:00
Code Issues Actions Packages Projects 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
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(); Component bestCenter = getJavaActiveWindow();
Window bestParent = getParentWindow(bestCenter); Window bestParent = getBestParent(provider, bestCenter);
if (!provider.isModal()) {
bestParent = getBestNonModalParent(provider, bestParent);
}
// //
// Note: prefer the active window; allow user's choice of center component when it is // 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, private static Window getBestNonModalParent(DialogComponentProvider newProvider,
Window bestParent) { Window bestParent) {