|
1
|
=== modified file 'src/com/goldencode/p2j/ui/client/WindowManager.java'
|
|
2
|
--- src/com/goldencode/p2j/ui/client/WindowManager.java 2016-04-29 13:58:53 +0000
|
|
3
|
+++ src/com/goldencode/p2j/ui/client/WindowManager.java 2016-05-06 15:21:40 +0000
|
|
4
|
@@ -1303,7 +1303,7 @@
|
|
5
|
TopLevelWindow<?> window = WindowManager.findWindow(windowId);
|
|
6
|
if (window == null)
|
|
7
|
{
|
|
8
|
- throw new RuntimeException("Unknown window reported by GUI driver!");
|
|
9
|
+ throw new RuntimeException("Unknown window reported by GUI driver! target " + windowId);
|
|
10
|
}
|
|
11
|
|
|
12
|
if (window == activeDriverWindow.get())
|
|
13
|
|
|
14
|
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/AbstractGuiDriver.java'
|
|
15
|
--- src/com/goldencode/p2j/ui/client/gui/driver/AbstractGuiDriver.java 2016-04-14 15:15:50 +0000
|
|
16
|
+++ src/com/goldencode/p2j/ui/client/gui/driver/AbstractGuiDriver.java 2016-05-06 14:57:06 +0000
|
|
17
|
@@ -1986,6 +1986,7 @@
|
|
18
|
@Override
|
|
19
|
public void iconifyWindow(int sourceId)
|
|
20
|
{
|
|
21
|
+ EmulatedWindowState ews = getPrimitives().getWindowEmulator(sourceId);
|
|
22
|
ews.iconifyWindow(sourceId);
|
|
23
|
}
|
|
24
|
|
|
25
|
@@ -1999,6 +2000,7 @@
|
|
26
|
@Override
|
|
27
|
public void deiconifyWindow(int sourceId)
|
|
28
|
{
|
|
29
|
+ EmulatedWindowState ews = getPrimitives().getWindowEmulator(sourceId);
|
|
30
|
ews.deiconifyWindow(sourceId);
|
|
31
|
}
|
|
32
|
|
|
33
|
|
|
34
|
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java'
|
|
35
|
--- src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java 2016-04-21 17:01:43 +0000
|
|
36
|
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java 2016-05-06 15:36:47 +0000
|
|
37
|
@@ -970,9 +970,14 @@
|
|
38
|
}
|
|
39
|
|
|
40
|
activeWindowId = activatingWindowId;
|
|
41
|
-
|
|
42
|
- WindowManager.windowDeactivated(deactivatingWindowId, false);
|
|
43
|
- WindowManager.windowActivated(activatingWindowId, false);
|
|
44
|
+ if (deactivatingWindowId != -1)
|
|
45
|
+ {
|
|
46
|
+ WindowManager.windowDeactivated(deactivatingWindowId, false);
|
|
47
|
+ }
|
|
48
|
+ if (activatingWindowId != -1)
|
|
49
|
+ {
|
|
50
|
+ WindowManager.windowActivated(activatingWindowId, false);
|
|
51
|
+ }
|
|
52
|
}
|
|
53
|
|
|
54
|
/**
|
|
55
|
|
|
56
|
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js'
|
|
57
|
--- src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js 2016-04-25 19:35:35 +0000
|
|
58
|
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/res/p2j.screen.js 2016-05-06 15:41:16 +0000
|
|
59
|
@@ -3017,9 +3017,9 @@
|
|
60
|
if (deactivatingWindowId != -1)
|
|
61
|
{
|
|
62
|
var win = getWindow(deactivatingWindowId);
|
|
63
|
- if (!win.isVisible())
|
|
64
|
+ if (win && !win.isVisible())
|
|
65
|
{
|
|
66
|
- p2j.socket.sendWindowIconState(windowId, false);
|
|
67
|
+ p2j.socket.sendWindowIconState(deactivatingWindowId, false);
|
|
68
|
}
|
|
69
|
}
|
|
70
|
|
|
71
|
@@ -3028,7 +3028,12 @@
|
|
72
|
{
|
|
73
|
var win = getWindow(activatingWindowId);
|
|
74
|
// de-iconify the window
|
|
75
|
- win.deiconify();
|
|
76
|
+ if (win)
|
|
77
|
+ {
|
|
78
|
+ win.deiconify();
|
|
79
|
+ // Notify GuiWebDriver that this window changes its minimized state
|
|
80
|
+ p2j.socket.sendWindowIconState(activatingWindowId, false);
|
|
81
|
+ }
|
|
82
|
}
|
|
83
|
|
|
84
|
// send the window activation to the java side
|
|
85
|
|