mirror of
https://github.com/emilk/egui.git
synced 2026-09-02 23:00:04 -04:00
Create custom egui_kittest::Node (#7138)
This adds a custom Node struct with proper support for egui types (`Key`, `Modifiers`, `egui::Event`, `Rect`) instead of needing to use the kittest / accesskit types. I also changed the `click` function to do a proper mouse move / mouse down instead of the accesskit click. Also added `accesskit_click` to trigger the accesskit event. This resulted in some changed snapshots, since the elements are now hovered. Also renamed `press_key` to `key_press` for consistency with `key_down/key_up`. Also removed the Deref to the AccessKit Node, to make it clearer when to expect egui and when to expect accesskit types. * Closes #5705 * [x] I have followed the instructions in the PR template
This commit is contained in:
@@ -95,7 +95,7 @@ fn menu_close_on_click_outside() {
|
||||
TestMenu::new(MenuConfig::new().close_behavior(PopupCloseBehavior::CloseOnClick))
|
||||
.into_harness();
|
||||
|
||||
harness.get_by_label("Menu A").simulate_click();
|
||||
harness.get_by_label("Menu A").click();
|
||||
harness.run();
|
||||
|
||||
harness
|
||||
@@ -106,9 +106,7 @@ fn menu_close_on_click_outside() {
|
||||
// We should be able to check the checkbox without closing the menu
|
||||
// Click a couple of times, just in case
|
||||
for expect_checked in [true, false, true, false] {
|
||||
harness
|
||||
.get_by_label("Checkbox in Submenu C")
|
||||
.simulate_click();
|
||||
harness.get_by_label("Checkbox in Submenu C").click();
|
||||
harness.run();
|
||||
assert_eq!(expect_checked, harness.state().checked);
|
||||
}
|
||||
@@ -119,7 +117,7 @@ fn menu_close_on_click_outside() {
|
||||
assert!(harness.query_by_label("Checkbox in Submenu C").is_some());
|
||||
|
||||
// Clicking outside should close the menu
|
||||
harness.get_by_label("Some other label").simulate_click();
|
||||
harness.get_by_label("Some other label").click();
|
||||
harness.run();
|
||||
assert!(harness.query_by_label("Checkbox in Submenu C").is_none());
|
||||
}
|
||||
@@ -130,14 +128,14 @@ fn menu_close_on_click() {
|
||||
TestMenu::new(MenuConfig::new().close_behavior(PopupCloseBehavior::CloseOnClick))
|
||||
.into_harness();
|
||||
|
||||
harness.get_by_label("Menu A").simulate_click();
|
||||
harness.get_by_label("Menu A").click();
|
||||
harness.run();
|
||||
|
||||
harness.get_by_label_contains("Submenu B with icon").hover();
|
||||
harness.run();
|
||||
|
||||
// Clicking the button should close the menu (even if ui.close() is not called by the button)
|
||||
harness.get_by_label("Button in Submenu B").simulate_click();
|
||||
harness.get_by_label("Button in Submenu B").click();
|
||||
harness.run();
|
||||
assert!(harness.query_by_label("Button in Submenu B").is_none());
|
||||
}
|
||||
@@ -145,21 +143,19 @@ fn menu_close_on_click() {
|
||||
#[test]
|
||||
fn clicking_submenu_button_should_never_close_menu() {
|
||||
// We test for this since otherwise the menu wouldn't work on touch devices
|
||||
// The other tests use .hover to open submenus, but this test explicitly uses .simulate_click
|
||||
// The other tests use .hover to open submenus, but this test explicitly uses .click
|
||||
let mut harness =
|
||||
TestMenu::new(MenuConfig::new().close_behavior(PopupCloseBehavior::CloseOnClick))
|
||||
.into_harness();
|
||||
|
||||
harness.get_by_label("Menu A").simulate_click();
|
||||
harness.get_by_label("Menu A").click();
|
||||
harness.run();
|
||||
|
||||
// Clicking the submenu button should not close the menu
|
||||
harness
|
||||
.get_by_label_contains("Submenu B with icon")
|
||||
.simulate_click();
|
||||
harness.get_by_label_contains("Submenu B with icon").click();
|
||||
harness.run();
|
||||
|
||||
harness.get_by_label("Button in Submenu B").simulate_click();
|
||||
harness.get_by_label("Button in Submenu B").click();
|
||||
harness.run();
|
||||
assert!(harness.query_by_label("Button in Submenu B").is_none());
|
||||
}
|
||||
@@ -174,7 +170,7 @@ fn menu_snapshots() {
|
||||
harness.run();
|
||||
results.add(harness.try_snapshot("menu/closed_hovered"));
|
||||
|
||||
harness.get_by_label("Menu A").simulate_click();
|
||||
harness.get_by_label("Menu A").click();
|
||||
harness.run();
|
||||
results.add(harness.try_snapshot("menu/opened"));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user