desktop: Ignore input when the context menu is open
This matches FP's behavior: both keyboard and mouse input should be ignored.
This commit is contained in:
parent
10c52ce706
commit
5d42a78c47
|
@ -291,6 +291,10 @@ impl App {
|
||||||
check_redraw = true;
|
check_redraw = true;
|
||||||
}
|
}
|
||||||
WindowEvent::MouseWheel { delta, .. } => {
|
WindowEvent::MouseWheel { delta, .. } => {
|
||||||
|
if self.gui.borrow_mut().is_context_menu_visible() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
use ruffle_core::events::MouseWheelDelta;
|
use ruffle_core::events::MouseWheelDelta;
|
||||||
use winit::event::MouseScrollDelta;
|
use winit::event::MouseScrollDelta;
|
||||||
let delta = match delta {
|
let delta = match delta {
|
||||||
|
@ -322,6 +326,10 @@ impl App {
|
||||||
modifiers = new_modifiers;
|
modifiers = new_modifiers;
|
||||||
}
|
}
|
||||||
WindowEvent::KeyboardInput { event, .. } => {
|
WindowEvent::KeyboardInput { event, .. } => {
|
||||||
|
if self.gui.borrow_mut().is_context_menu_visible() {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Handle fullscreen keyboard shortcuts: Alt+Return, Escape.
|
// Handle fullscreen keyboard shortcuts: Alt+Return, Escape.
|
||||||
match event {
|
match event {
|
||||||
KeyEvent {
|
KeyEvent {
|
||||||
|
|
Loading…
Reference in New Issue