|
1
|
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/AbstractGuiDriver.java'
|
|
2
|
--- src/com/goldencode/p2j/ui/client/gui/driver/AbstractGuiDriver.java 2015-09-10 17:38:10 +0000
|
|
3
|
+++ src/com/goldencode/p2j/ui/client/gui/driver/AbstractGuiDriver.java 2015-09-14 18:19:50 +0000
|
|
4
|
@@ -1486,7 +1486,7 @@
|
|
5
|
}
|
|
6
|
|
|
7
|
/**
|
|
8
|
- * Iconify the window.
|
|
9
|
+ * Selects the target window and then minimizes it.
|
|
10
|
*
|
|
11
|
* @param sourceId
|
|
12
|
* The root ID of the sub-tree which was iconified, and triggered iconification of
|
|
13
|
@@ -1495,11 +1495,12 @@
|
|
14
|
@Override
|
|
15
|
public void iconifyWindow(int sourceId)
|
|
16
|
{
|
|
17
|
+ selectWindow(sourceId);
|
|
18
|
ews.iconifyWindow(sourceId);
|
|
19
|
}
|
|
20
|
|
|
21
|
/**
|
|
22
|
- * De-iconify the window.
|
|
23
|
+ * Selects the target window and then restores it.
|
|
24
|
*
|
|
25
|
* @param sourceId
|
|
26
|
* The root ID of the sub-tree which was deiconified, and triggered restoration of
|
|
27
|
@@ -1508,6 +1509,7 @@
|
|
28
|
@Override
|
|
29
|
public void deiconifyWindow(int sourceId)
|
|
30
|
{
|
|
31
|
+ selectWindow(sourceId);
|
|
32
|
ews.deiconifyWindow(sourceId);
|
|
33
|
}
|
|
34
|
|
|
35
|
|
|
36
|
=== modified file 'src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java'
|
|
37
|
--- src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java 2015-09-14 14:04:49 +0000
|
|
38
|
+++ src/com/goldencode/p2j/ui/client/gui/driver/web/GuiWebDriver.java 2015-09-14 18:16:42 +0000
|
|
39
|
@@ -703,26 +703,6 @@
|
|
40
|
@Override
|
|
41
|
public void windowIconified(int windowId, boolean state)
|
|
42
|
{
|
|
43
|
- //TODO remove it if it will work properly.
|
|
44
|
-// System.err.println("windowIconified(" + windowId + ", " + state + ")");
|
|
45
|
-// List<TitledWindow<?>> windowsList = WindowManager.windowList();
|
|
46
|
-// boolean emptyScreen = true;
|
|
47
|
-// for(TitledWindow<?> win : windowsList)
|
|
48
|
-// {
|
|
49
|
-// System.err.println("windowId = " + win.getId().asInt() + " visible = " + win.isVisible());
|
|
50
|
-// if (win.isVisible())
|
|
51
|
-// {
|
|
52
|
-// emptyScreen = false;
|
|
53
|
-// break;
|
|
54
|
-// }
|
|
55
|
-// }
|
|
56
|
-// System.err.println("current window = " + ((ews != null) ? ews.getWindowId(): "null"));
|
|
57
|
-// if (emptyScreen)
|
|
58
|
-// {
|
|
59
|
-// System.err.println("empty screen for windowIconified(" + windowId + ", " + state + ")");
|
|
60
|
-// selectWindow(windowId);
|
|
61
|
-// System.err.println("selected current window = " + ((ews != null) ? ews.getWindowId(): "null"));
|
|
62
|
-// }
|
|
63
|
if (state)
|
|
64
|
{
|
|
65
|
iconifyWindow(windowId);
|
|
66
|
@@ -734,34 +714,6 @@
|
|
67
|
}
|
|
68
|
|
|
69
|
/**
|
|
70
|
- * Select the window and then iconify it.
|
|
71
|
- *
|
|
72
|
- * @param sourceId
|
|
73
|
- * The root ID of the sub-tree which was iconified, and triggered iconification of
|
|
74
|
- * this window.
|
|
75
|
- */
|
|
76
|
- @Override
|
|
77
|
- public void iconifyWindow(int sourceId)
|
|
78
|
- {
|
|
79
|
- selectWindow(sourceId);
|
|
80
|
- super.iconifyWindow(sourceId);
|
|
81
|
- }
|
|
82
|
-
|
|
83
|
- /**
|
|
84
|
- * Select the window and then de-iconify the window.
|
|
85
|
- *
|
|
86
|
- * @param sourceId
|
|
87
|
- * The root ID of the sub-tree which was deiconified, and triggered restoration of
|
|
88
|
- * this window.
|
|
89
|
- */
|
|
90
|
- @Override
|
|
91
|
- public void deiconifyWindow(int sourceId)
|
|
92
|
- {
|
|
93
|
- selectWindow(sourceId);
|
|
94
|
- super.deiconifyWindow(sourceId);
|
|
95
|
- }
|
|
96
|
-
|
|
97
|
- /**
|
|
98
|
* Register all the mouse-aware widgets (in all Windows) with the JS side.
|
|
99
|
* <p>
|
|
100
|
* To register a widget, it must be visible, displayed and enabled, and part of a visible
|
|
101
|
|