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

Merge remote-tracking branch 'origin/GP-1674-dragonmacher-plugin-packages'

Browse source
This commit is contained in:
ghidra1 2022-01-20 17:51:07 -05:00
commit 6f78d3a77a
30 changed files with 1200 additions and 496 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Ghidra/Framework/Docking/src/main/java/docking/DockingDialog.java
View file

@ -55,13 +55,13 @@ public class DockingDialog extends JDialog implements HelpDescriptor {
/**
* Creates a default parent frame that will appear in the OS's task bar. Having this frame
* gives the user something to click when their dialog is lost. We attempt to hide this
* gives the user something to click when their dialog is lost. We attempt to hide this
* frame offscreen.
*
*
* Note: we expect to only get here when there is no parent window found. This usually
* only happens during tests and one-off main methods that are not part of a
* only happens during tests and one-off main methods that are not part of a
* running tool.
*
*
* @param componentProvider the dialog content for this dialog
* @return the hidden frame
*/
@ -69,7 +69,7 @@ public class DockingDialog extends JDialog implements HelpDescriptor {
//
// Note: we expect to only get here when there is no parent window found. This usually
// only happens during tests and one-off main methods that are not part of a
// only happens during tests and one-off main methods that are not part of a
// running tool
//
HiddenDockingFrame hiddenFrame = new HiddenDockingFrame(Application.getName());
@ -132,8 +132,8 @@ public class DockingDialog extends JDialog implements HelpDescriptor {
Point initialLocation = component.getIntialLocation();
if (initialLocation != null) {
// NOTE: have to call setLocation() twice because the first time the native peer
// component's location is not actually changed; calling setLocation() again
// NOTE: have to call setLocation() twice because the first time the native peer
// component's location is not actually changed; calling setLocation() again
// does cause the location to change.
setLocation(initialLocation);
setLocation(initialLocation);
@ -286,7 +286,7 @@ public class DockingDialog extends JDialog implements HelpDescriptor {
JFrame f = (JFrame) myParent;
Window[] ownedWindows = f.getOwnedWindows();
for (Window window : ownedWindows) {
if (window != this) {
if (window != this && window.isVisible()) {
return;
}
}
@ -382,7 +382,7 @@ public class DockingDialog extends JDialog implements HelpDescriptor {
void setEndBounds(Rectangle bounds) {
if (Objects.equals(startBounds, bounds)) {
// keep the end bounds unchanged, which helps us later determine if the
// keep the end bounds unchanged, which helps us later determine if the
// dialog was moved
return;
}