2711_rev10976.diff
| .bzrignore 2015-11-27 17:01:15 +0000 | ||
|---|---|---|
| 1 |
mkupd.sh |
|
| 2 |
.bzrignore |
|
| 1 | 3 |
.git |
| 2 | 4 |
.gitignore |
| 3 | 5 |
build |
| src/com/goldencode/p2j/ui/chui/ThinClient.java 2015-11-27 16:15:01 +0000 | ||
|---|---|---|
| 2196 | 2196 |
** Fixed implicit window show by frame statements, in GUI. |
| 2197 | 2197 |
** HC 20151124 Utilized Keep3DFillinBorder environment variable when drawing FILL- |
| 2198 | 2198 |
** IN border. |
| 2199 |
** VIG 20151118 Fixed MENUBAR repaint for dynamic case. |
|
| 2199 | 2200 |
*/ |
| 2200 | 2201 | |
| 2201 | 2202 |
package com.goldencode.p2j.ui.chui; |
| ... | ... | |
| 10701 | 10702 |
} |
| 10702 | 10703 | |
| 10703 | 10704 |
wnd.getMenubar().setVisible(true); |
| 10705 |
wnd.doLayout(); |
|
| 10704 | 10706 |
|
| 10705 | 10707 |
eventDrawingBracket(wnd, new Runnable() |
| 10706 | 10708 |
{
|
| 10707 | 10709 |
@Override |
| 10708 | 10710 |
public void run() |
| 10709 | 10711 |
{
|
| 10710 |
wnd.getMenubar().repaint();
|
|
| 10712 |
wnd.repaint(); |
|
| 10711 | 10713 |
} |
| 10712 | 10714 |
}); |
| 10713 | 10715 |
} |
| src/com/goldencode/p2j/ui/client/FocusManager.java 2015-11-27 16:20:21 +0000 | ||
|---|---|---|
| 27 | 27 |
** 014 HC 20151013 Changes to extend GUI multi-window focus management and ACTIVE-WINDOW system |
| 28 | 28 |
** handle processing to modal windows. |
| 29 | 29 |
** 015 CA 20151123 Fixed focus traversing when there are nested frames. |
| 30 |
** VIG 20151125 Fixed IllegalStateException exception in widgets processing in focusChange(). |
|
| 30 | 31 |
*/ |
| 31 | 32 | |
| 32 | 33 |
package com.goldencode.p2j.ui.client; |
| ... | ... | |
| 1198 | 1199 |
Frame frame; |
| 1199 | 1200 |
if (test.config().frameId == -1) |
| 1200 | 1201 |
{
|
| 1201 |
if (test.parent() instanceof Browse) |
|
| 1202 |
if (test.parent() instanceof Browse || |
|
| 1203 |
test.parent() instanceof Menu || |
|
| 1204 |
test.parent() instanceof SubMenu) |
|
| 1202 | 1205 |
{
|
| 1203 | 1206 |
// widget attached to inner browse |
| 1204 | 1207 |
possibleFocus = test.parent().hasFocusable(test); |
| src/com/goldencode/p2j/ui/client/gui/SubMenuGuiImpl.java 2015-11-27 16:10:58 +0000 | ||
|---|---|---|
| 21 | 21 |
** handle processing to modal windows. |
| 22 | 22 |
** 006 CA 20151026 Enclose driver API calls in select/releaseWindow(). |
| 23 | 23 |
** VIG 20151027 Added "pressed" state transferring to neighbor MENUBAR element. |
| 24 |
** Added mouseEntered=false to hideBody(..) and fixed javadoc. |
|
| 24 | 25 |
*/ |
| 25 | 26 | |
| 26 | 27 |
package com.goldencode.p2j.ui.client.gui; |
| ... | ... | |
| 592 | 593 |
parent().repaint(); |
| 593 | 594 | |
| 594 | 595 |
setSubmenusPressed(false, true); |
| 596 |
mouseEntered = false; |
|
| 595 | 597 |
|
| 596 | 598 |
super.hideBody(recursive); |
| 597 | 599 |
|
| ... | ... | |
| 1137 | 1139 |
* |
| 1138 | 1140 |
* @param pressed |
| 1139 | 1141 |
* <code>true</code> means pressed, <code>false</code - means not pressed. |
| 1142 |
* @param recursive |
|
| 1143 |
* <code>true</code> denotes recursive processing of nested sub-menus. |
|
| 1140 | 1144 |
*/ |
| 1141 | 1145 |
protected void setSubmenusPressed(boolean pressed, boolean recursive) |
| 1142 | 1146 |
{
|
| src/com/goldencode/p2j/ui/client/gui/WindowLayout.java 2015-11-27 16:18:11 +0000 | ||
|---|---|---|
| 45 | 45 |
** 025 HC 20151027 Implemented WINDOW MESSAGE-AREA and STATUS-AREA attributes. |
| 46 | 46 |
** CA 20151029 If workspace is resized, ensure the new window dimension includes the |
| 47 | 47 |
** decorations and the border. |
| 48 |
** 026 VIG 20151122 Added isVisible check for menubar layout. |
|
| 48 | 49 |
*/ |
| 49 | 50 | |
| 50 | 51 |
package com.goldencode.p2j.ui.client.gui; |
| ... | ... | |
| 232 | 233 |
if (window instanceof Window) |
| 233 | 234 |
{
|
| 234 | 235 |
Menu<?> menubar = ((Window<?>) window).getMenubar(); |
| 235 |
if (menubar != null) |
|
| 236 |
if (menubar != null && menubar.isVisible())
|
|
| 236 | 237 |
{
|
| 237 | 238 |
menubar.doLayout(); |
| 238 | 239 |
mbarHeight = c.heightToNative(menubar.height()); |
| ... | ... | |
| 301 | 302 |
if (window instanceof WindowGuiImpl) |
| 302 | 303 |
{
|
| 303 | 304 |
Menu<GuiOutputManager> menubar = ((WindowGuiImpl)window).getMenubar(); |
| 304 |
if (menubar != null) |
|
| 305 |
if (menubar != null && menubar.isVisible())
|
|
| 305 | 306 |
{
|
| 306 | 307 |
MenuConfig mc = menubar.config(); |
| 307 | 308 |
menubar.setPhysicalLocation(x, y); |