Merge branch 'master' into feature/event-subscriptions

2019-12-08 06:53:54 +01:00 · 2019-12-08 06:53:54 +01:00 · 9b84b6e403
commit 9b84b6e403
parent 48145ba51e f942fc3b68
13 changed files with 510 additions and 62 deletions
--- a/winit/src/application.rs
+++ b/winit/src/application.rs
@ -334,6 +334,7 @@ pub trait Application: Sized {
                        winit::event::KeyboardInput {
                            virtual_keycode: Some(virtual_keycode),
                            state,
+                            modifiers,
                            ..
                        },
                    ..
@ -349,6 +350,7 @@ pub trait Application: Sized {
                    events.push(Event::Keyboard(keyboard::Event::Input {
                        key_code: conversion::key_code(virtual_keycode),
                        state: conversion::button_state(state),
+                        modifiers: conversion::modifiers_state(modifiers),
                    }));
                }
                WindowEvent::CloseRequested => {