Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

8241710: NullPointerException while entering empty submenu with "arrow right" #161

Closed
wants to merge 2 commits into from
Closed

8241710: NullPointerException while entering empty submenu with "arrow right" #161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb5603
Fix NPE
aghaisas Apr 7, 2020
aecc69c
Minor review fixes
aghaisas Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 14 additions & 13 deletions modules/javafx.controls/src/main/java/com/sun/javafx/scene/control/ContextMenuContent.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -651,18 +651,19 @@ private void processRightKey(KeyEvent ke) {
private void showMenu(Menu menu) {
menu.show();

// if there is a submenu
if (submenu != null) {
// request focus on the first item of the submenu after it is shown
ContextMenuContent cmContent = (ContextMenuContent)submenu.getSkin().getNode();
if (cmContent != null) {
if (cmContent.itemsContainer.getChildren().size() > 0) {
cmContent.itemsContainer.getChildren().get(0).requestFocus();
cmContent.currentFocusedIndex = 0;
} else {
cmContent.requestFocus();
}
}
if (submenu == null) {
return;
}

// request focus on the first item of the submenu after it is shown
ContextMenuContent cmContent = (ContextMenuContent)submenu.getSkin().getNode();
if (cmContent != null) {
if (cmContent.itemsContainer.getChildren().size() > 0) {
cmContent.itemsContainer.getChildren().get(0).requestFocus();
cmContent.currentFocusedIndex = 0;
} else {
cmContent.requestFocus();
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion modules/javafx.controls/src/test/java/test/javafx/scene/control/ContextMenuTest.java
View file
Open in desktop
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down