1
|
=== modified file 'src/com/goldencode/p2j/ui/client/WindowManager.java'
|
2
|
--- src/com/goldencode/p2j/ui/client/WindowManager.java 2016-02-25 06:13:23 +0000
|
3
|
+++ src/com/goldencode/p2j/ui/client/WindowManager.java 2016-03-15 20:04:43 +0000
|
4
|
@@ -68,7 +68,6 @@
|
5
|
import com.goldencode.p2j.ui.chui.ThinClient;
|
6
|
import com.goldencode.p2j.ui.client.event.*;
|
7
|
import com.goldencode.p2j.ui.client.gui.*;
|
8
|
-import com.goldencode.p2j.ui.client.gui.OverlayWindow;
|
9
|
import com.goldencode.p2j.ui.client.gui.driver.GuiDriver;
|
10
|
import com.goldencode.p2j.ui.client.widget.*;
|
11
|
import com.goldencode.p2j.util.Utils;
|
12
|
@@ -324,6 +323,12 @@
|
13
|
throw new NullPointerException("The window can not be null!");
|
14
|
}
|
15
|
|
16
|
+ if (!window.isRealized())
|
17
|
+ {
|
18
|
+ // window is derigistered
|
19
|
+ return;
|
20
|
+ }
|
21
|
+
|
22
|
// move window to top
|
23
|
WorkArea wa = work.get();
|
24
|
synchronized (wa.windows)
|
25
|
@@ -530,7 +535,7 @@
|
26
|
*/
|
27
|
public static void setActiveWindow(TopLevelWindow<?> window)
|
28
|
{
|
29
|
- // overlay window can not be cinsidered as active one
|
30
|
+ // overlay window can not be considered as active one
|
31
|
if (window != null && window.isOverlay())
|
32
|
{
|
33
|
return;
|
34
|
|
35
|
=== modified file 'src/com/goldencode/p2j/ui/client/widget/AbstractContainer.java'
|
36
|
--- src/com/goldencode/p2j/ui/client/widget/AbstractContainer.java 2016-03-03 16:10:57 +0000
|
37
|
+++ src/com/goldencode/p2j/ui/client/widget/AbstractContainer.java 2016-03-15 19:58:46 +0000
|
38
|
@@ -1042,7 +1042,8 @@
|
39
|
{
|
40
|
TopLevelWindow<O> window = topLevelWindow();
|
41
|
|
42
|
- if (WindowManager.topLevelWindow() != window)
|
43
|
+ if (WindowManager.topLevelWindow() != window ||
|
44
|
+ WindowManager.getActiveModalWindow() == window)
|
45
|
{
|
46
|
// activate the related window
|
47
|
WindowManager.activateWindow(window);
|
48
|
|