This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 34670
Collapse All | Expand All

(-)core/windows/src/org/netbeans/core/windows/DialogDisplayerImpl.java (-3 / +17 lines)
Lines 17-22 Link Here
17
17
18
import java.awt.Component;
18
import java.awt.Component;
19
import java.awt.Dialog;
19
import java.awt.Dialog;
20
import java.awt.Frame;
21
import java.awt.KeyboardFocusManager;
20
import java.awt.Window;
22
import java.awt.Window;
21
23
22
import org.openide.DialogDescriptor;
24
import org.openide.DialogDescriptor;
Lines 47-53 Link Here
47
                    return new NbDialog(d, NbPresenter.currentModalDialog);
49
                    return new NbDialog(d, NbPresenter.currentModalDialog);
48
                }
50
                }
49
                else {
51
                else {
50
                    return new NbDialog(d, MainWindow.getDefault());
52
                    Frame f = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow() 
53
                        instanceof Frame ? 
54
                        (Frame) KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow() 
55
                        : MainWindow.getDefault();
56
                    return new NbDialog(d, f);
51
                }
57
                }
52
            }
58
            }
53
        });
59
        });
Lines 73-85 Link Here
73
                        if (NbPresenter.currentModalDialog != null) {
79
                        if (NbPresenter.currentModalDialog != null) {
74
                            presenter = new NbDialog((DialogDescriptor) descriptor, NbPresenter.currentModalDialog);
80
                            presenter = new NbDialog((DialogDescriptor) descriptor, NbPresenter.currentModalDialog);
75
                        } else {
81
                        } else {
76
                            presenter = new NbDialog((DialogDescriptor) descriptor, MainWindow.getDefault());
82
                            Frame f = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow() 
83
                                instanceof Frame ? 
84
                                (Frame) KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow() 
85
                                : MainWindow.getDefault();
86
                            presenter = new NbDialog((DialogDescriptor) descriptor, f);
77
                        }
87
                        }
78
                    } else {
88
                    } else {
79
                        if (NbPresenter.currentModalDialog != null) {
89
                        if (NbPresenter.currentModalDialog != null) {
80
                            presenter = new NbPresenter(descriptor, NbPresenter.currentModalDialog, true);
90
                            presenter = new NbPresenter(descriptor, NbPresenter.currentModalDialog, true);
81
                        } else {
91
                        } else {
82
                            presenter = new NbPresenter(descriptor, MainWindow.getDefault(), true);
92
                            Frame f = KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow() 
93
                                instanceof Frame ? 
94
                                (Frame) KeyboardFocusManager.getCurrentKeyboardFocusManager().getActiveWindow() 
95
                                : MainWindow.getDefault();
96
                            presenter = new NbPresenter(descriptor, f, true);
83
                        }
97
                        }
84
                    }
98
                    }
85
99

Return to bug 34670