|
1 diff -ru jEdit/org/gjt/sp/jedit/gui/DockableWindowContainer.java jEdit-patched/org/gjt/sp/jedit/gui/DockableWindowContainer.java |
|
2 --- jEdit/org/gjt/sp/jedit/gui/DockableWindowContainer.java 2013-07-28 19:03:36.000000000 +0200 |
|
3 +++ jEdit-patched/org/gjt/sp/jedit/gui/DockableWindowContainer.java 2014-05-11 19:41:50.786012120 +0200 |
|
4 @@ -26,7 +26,7 @@ |
|
5 * @version $Id: DockableWindowContainer.java 21502 2012-03-29 17:19:44Z ezust $ |
|
6 * @since jEdit 2.6pre3 |
|
7 */ |
|
8 -interface DockableWindowContainer |
|
9 +public interface DockableWindowContainer |
|
10 { |
|
11 void register(DockableWindowManagerImpl.Entry entry); |
|
12 void remove(DockableWindowManagerImpl.Entry entry); |
|
13 diff -ru jEdit/org/gjt/sp/jedit/gui/FloatingWindowContainer.java jEdit-patched/org/gjt/sp/jedit/gui/FloatingWindowContainer.java |
|
14 --- jEdit/org/gjt/sp/jedit/gui/FloatingWindowContainer.java 2013-07-28 19:03:38.000000000 +0200 |
|
15 +++ jEdit-patched/org/gjt/sp/jedit/gui/FloatingWindowContainer.java 2014-05-11 19:32:49.710039809 +0200 |
|
16 @@ -35,7 +35,7 @@ |
|
17 import javax.swing.Box; |
|
18 import javax.swing.BoxLayout; |
|
19 import javax.swing.JButton; |
|
20 -import javax.swing.JFrame; |
|
21 +import javax.swing.JDialog; |
|
22 import javax.swing.JPopupMenu; |
|
23 import javax.swing.JSeparator; |
|
24 import javax.swing.SwingUtilities; |
|
25 @@ -50,7 +50,7 @@ |
|
26 * @version $Id: FloatingWindowContainer.java 21831 2012-06-18 22:54:17Z ezust $ |
|
27 * @since jEdit 4.0pre1 |
|
28 */ |
|
29 -public class FloatingWindowContainer extends JFrame implements DockableWindowContainer, |
|
30 +public class FloatingWindowContainer extends JDialog implements DockableWindowContainer, |
|
31 PropertyChangeListener |
|
32 { |
|
33 String dockableName = null; |
|
34 @@ -58,6 +58,8 @@ |
|
35 public FloatingWindowContainer(DockableWindowManagerImpl dockableWindowManager, |
|
36 boolean clone) |
|
37 { |
|
38 + super(dockableWindowManager.getView()); |
|
39 + |
|
40 this.dockableWindowManager = dockableWindowManager; |
|
41 |
|
42 dockableWindowManager.addPropertyChangeListener(this); |
|
43 @@ -93,7 +95,6 @@ |
|
44 pack(); |
|
45 Container parent = dockableWindowManager.getView(); |
|
46 GUIUtilities.loadGeometry(this, parent, dockableName); |
|
47 - GUIUtilities.addSizeSaver(this, parent, dockableName); |
|
48 KeyListener listener = dockableWindowManager.closeListener(dockableName); |
|
49 addKeyListener(listener); |
|
50 getContentPane().addKeyListener(listener); |
|
51 @@ -160,8 +161,11 @@ |
|
52 @Override |
|
53 public void dispose() |
|
54 { |
|
55 - entry.container = null; |
|
56 - entry.win = null; |
|
57 + GUIUtilities.saveGeometry(this, dockableWindowManager.getView(), dockableName); |
|
58 + if (entry != null) { |
|
59 + entry.container = null; |
|
60 + entry.win = null; |
|
61 + } |
|
62 super.dispose(); |
|
63 } //}}} |
|
64 |