focusmanager_fix.diff
src/com/goldencode/p2j/ui/client/FocusManager.java | ||
---|---|---|
1301 | 1301 |
// set the widgets that must not receive focus, see above |
1302 | 1302 |
parent.setIgnoreFocus(ignoreFocus); |
1303 | 1303 |
} |
1304 | ||
1305 |
// get the top-level window now, the focused widget may be destroyed after |
|
1306 |
// the call to parent.nextFocus() or parent.prevFocus() |
|
1307 |
TopLevelWindow widgetWindow = widget != null ? widget.topLevelWindow() : null; |
|
1304 | 1308 |
|
1305 | 1309 |
tempFocusChange = true; |
1306 | 1310 |
try |
... | ... | |
1328 | 1332 |
// give priority to the top-level window of the reference widget, this |
1329 | 1333 |
// is to support widgets that consist of multiple top-level windows |
1330 | 1334 |
// like a COMBO-BOX |
1331 |
Widget inFocus = widget != null ? widget.topLevelWindow().currentFocus() :
|
|
1332 |
UiUtils.getCurrentFocus(); |
|
1335 |
Widget inFocus = widgetWindow != null ? widgetWindow.currentFocus() :
|
|
1336 |
UiUtils.getCurrentFocus();
|
|
1333 | 1337 |
|
1334 | 1338 |
if (inFocus == widget) |
1335 | 1339 |
{ |