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

8237505: RadioMenuItem in ToggleGroup: deselected on accelerator #1002

Closed
wants to merge 2 commits into from
Closed

8237505: RadioMenuItem in ToggleGroup: deselected on accelerator #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b124c24
Fix RadioMenuItem in ToggleGroup deselection on Accelerator issue
karthikpandelu Jan 19, 2023
42e8c39
Address review comments
karthikpandelu Jan 23, 2023
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
9 changes: 7 additions & 2 deletions ...javafx.controls/src/main/java/com/sun/javafx/scene/control/ControlAcceleratorSupport.java
View file
Open in desktop
Expand Up @@ -174,8 +174,13 @@ private static void doAcceleratorInstall(final List<? extends MenuItem> items, f
Event.fireEvent(target, new Event(MenuItem.MENU_VALIDATION_EVENT));
}
if (!menuitem.isDisable()) {
if (menuitem instanceof RadioMenuItem) {
((RadioMenuItem)menuitem).setSelected(!((RadioMenuItem)menuitem).isSelected());
if (menuitem instanceof RadioMenuItem radioMenuItem) {
if (radioMenuItem.getToggleGroup() == null) {
radioMenuItem.setSelected(!radioMenuItem.isSelected());
}
else {
radioMenuItem.setSelected(true);
}
}
else if (menuitem instanceof CheckMenuItem) {
((CheckMenuItem)menuitem).setSelected(!((CheckMenuItem)menuitem).isSelected());
Expand Down
30 changes: 30 additions & 0 deletions modules/javafx.controls/src/test/java/test/javafx/scene/control/RadioMenuItemTest.java
View file
Open in desktop
Expand Up @@ -28,6 +28,9 @@
import static test.com.sun.javafx.scene.control.infrastructure.ControlTestUtils.*;

import test.com.sun.javafx.pgstub.StubToolkit;
import test.com.sun.javafx.scene.control.infrastructure.KeyEventFirer;
import test.com.sun.javafx.scene.control.infrastructure.KeyModifier;
import test.com.sun.javafx.scene.control.infrastructure.StageLoader;
import com.sun.javafx.tk.Toolkit;
import javafx.beans.property.BooleanProperty;
import javafx.beans.property.ObjectProperty;
Expand All @@ -36,8 +39,13 @@
import javafx.beans.value.ChangeListener;
import javafx.beans.value.ObservableValue;
import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.control.RadioMenuItem;
import javafx.scene.control.ToggleGroup;
import javafx.scene.control.Menu;
import javafx.scene.control.MenuBar;
import javafx.scene.input.KeyCombination;
import javafx.scene.input.KeyCode;
import javafx.scene.shape.Rectangle;
import static org.junit.Assert.*;

Expand Down Expand Up @@ -296,4 +304,26 @@ public class RadioMenuItemTest {
assertTrue(b1.isSelected());
assertFalse(result8189677);
}

@Test public void testRadioMenuItemSelectionOnAccelerator() {
MenuBar menuBar = new MenuBar();
Menu menu = new Menu("Submenu");
menuBar.getMenus().add(menu);

ToggleGroup group = new ToggleGroup();
RadioMenuItem radioMenuItem = new RadioMenuItem("ONE");
radioMenuItem.setToggleGroup(group);
radioMenuItem.setAccelerator(KeyCombination.valueOf("alt+1"));
menu.getItems().add(radioMenuItem);

StageLoader s = new StageLoader(menuBar);
Scene scene = s.getStage().getScene();
KeyEventFirer keyboard = new KeyEventFirer(radioMenuItem, scene);

keyboard.doKeyPress(KeyCode.DIGIT1, KeyModifier.ALT);
assertTrue(radioMenuItem.isSelected());

keyboard.doKeyPress(KeyCode.DIGIT1, KeyModifier.ALT);
assertTrue(radioMenuItem.isSelected());
}
}