diff --git a/CHANGELOG.md b/CHANGELOG.md index dd463303..c75f38bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +### Fixed 🐛 + +* Fixed secondary-click to open a menu + ## 0.10.0 - 2021-02-28 - Plot and polish diff --git a/egui/src/containers/popup.rs b/egui/src/containers/popup.rs index b9205808..036d1a60 100644 --- a/egui/src/containers/popup.rs +++ b/egui/src/containers/popup.rs @@ -185,9 +185,7 @@ pub fn popup_below_widget( }); }); - if ui.input().key_pressed(Key::Escape) - || ui.input().pointer.any_click() && !widget_response.clicked() - { + if ui.input().key_pressed(Key::Escape) || widget_response.clicked_elsewhere() { ui.memory().close_popup(); } } diff --git a/egui/src/menu.rs b/egui/src/menu.rs index 90328708..d169b4dd 100644 --- a/egui/src/menu.rs +++ b/egui/src/menu.rs @@ -117,9 +117,7 @@ fn menu_impl<'c>( }); // TODO: this prevents sub-menus in menus. We should fix that. - if ui.input().key_pressed(Key::Escape) - || ui.input().pointer.any_click() && !button_response.clicked() - { + if ui.input().key_pressed(Key::Escape) || button_response.clicked_elsewhere() { bar_state.open_menu = None; } } diff --git a/egui/src/widgets/color_picker.rs b/egui/src/widgets/color_picker.rs index a134e489..016d74f0 100644 --- a/egui/src/widgets/color_picker.rs +++ b/egui/src/widgets/color_picker.rs @@ -342,8 +342,7 @@ pub fn color_edit_button_hsva(ui: &mut Ui, hsva: &mut Hsva, alpha: Alpha) -> Res }); if !button_response.clicked() { - let clicked_outside = ui.input().pointer.any_click() && !area_response.hovered(); - if clicked_outside || ui.input().key_pressed(Key::Escape) { + if ui.input().key_pressed(Key::Escape) || area_response.clicked_elsewhere() { ui.memory().close_popup(); } }