author | wenzelm |
Tue, 08 Sep 2020 21:14:42 +0200 | |
changeset 72247 | c06260b7152c |
parent 71932 | 65fd0f032a75 |
child 73653 | d9823224fcfe |
permissions | -rw-r--r-- |
72247 | 1 |
diff -ru 5.6.0/jEdit-orig/org/gjt/sp/jedit/gui/FloatingWindowContainer.java 5.6.0/jEdit-patched/org/gjt/sp/jedit/gui/FloatingWindowContainer.java |
2 |
--- 5.6.0/jEdit-orig/org/gjt/sp/jedit/gui/FloatingWindowContainer.java 2020-09-03 05:31:01.000000000 +0200 |
|
3 |
+++ 5.6.0/jEdit-patched/org/gjt/sp/jedit/gui/FloatingWindowContainer.java 2020-09-08 20:13:23.565140195 +0200 |
|
71932
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
4 |
@@ -45,14 +45,15 @@ |
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
5 |
* @version $Id: FloatingWindowContainer.java 25333 2020-05-10 09:40:02Z kpouer $ |
65329 | 6 |
* @since jEdit 4.0pre1 |
7 |
*/ |
|
71932
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
8 |
-public class FloatingWindowContainer extends JFrame implements DockableWindowContainer, PropertyChangeListener |
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
9 |
-{ |
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
10 |
+public class FloatingWindowContainer extends JDialog implements DockableWindowContainer, PropertyChangeListener { |
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
11 |
private String dockableName; |
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
12 |
|
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
13 |
//{{{ FloatingWindowContainer constructor |
65329 | 14 |
public FloatingWindowContainer(DockableWindowManagerImpl dockableWindowManager, |
15 |
boolean clone) |
|
16 |
{ |
|
17 |
+ super(dockableWindowManager.getView()); |
|
18 |
+ |
|
19 |
this.dockableWindowManager = dockableWindowManager; |
|
20 |
||
21 |
dockableWindowManager.addPropertyChangeListener(this); |
|
71932
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
22 |
@@ -87,7 +88,6 @@ |
65329 | 23 |
pack(); |
24 |
Container parent = dockableWindowManager.getView(); |
|
25 |
GUIUtilities.loadGeometry(this, parent, dockableName); |
|
26 |
- GUIUtilities.addSizeSaver(this, parent, dockableName); |
|
27 |
KeyListener listener = dockableWindowManager.closeListener(dockableName); |
|
28 |
addKeyListener(listener); |
|
29 |
getContentPane().addKeyListener(listener); |
|
71932
65fd0f032a75
updated to jedit-5.6pre1 (repository version 25349);
wenzelm
parents:
69838
diff
changeset
|
30 |
@@ -154,8 +154,11 @@ |
65329 | 31 |
@Override |
32 |
public void dispose() |
|
33 |
{ |
|
34 |
- entry.container = null; |
|
35 |
- entry.win = null; |
|
36 |
+ GUIUtilities.saveGeometry(this, dockableWindowManager.getView(), dockableName); |
|
37 |
+ if (entry != null) { |
|
38 |
+ entry.container = null; |
|
39 |
+ entry.win = null; |
|
40 |
+ } |
|
41 |
super.dispose(); |
|
42 |
} //}}} |
|
43 |