Revert "Send modifiers first"

This reverts commit e17977d.
rust-windowing · Jun 13, 2023 · a444637 · a444637
1 parent f0d88c5
commit a444637
Showing 1 changed file with 38 additions and 32 deletions.
diff --git a/src/platform_impl/web/event_loop/window_target.rs b/src/platform_impl/web/event_loop/window_target.rs
@@ -134,30 +134,33 @@ impl<T> EventLoopWindowTarget<T> {
         let modifiers = self.modifiers.clone();
         canvas.on_keyboard_press(
             move |physical_key, logical_key, text, location, repeat, active_modifiers| {
-                let modifiers = (modifiers.get() != active_modifiers).then(|| {
+                let modifiers_changed = (modifiers.get() != active_modifiers).then(|| {
                     modifiers.set(active_modifiers);
                     Event::WindowEvent {
                         window_id: RootWindowId(id),
                         event: WindowEvent::ModifiersChanged(active_modifiers.into()),
                     }
                 });
 
-                runner.send_events(modifiers.into_iter().chain(iter::once(Event::WindowEvent {
-                    window_id: RootWindowId(id),
-                    event: WindowEvent::KeyboardInput {
-                        device_id: RootDeviceId(unsafe { DeviceId::dummy() }),
-                        event: KeyEvent {
-                            physical_key,
-                            logical_key,
-                            text,
-                            location,
-                            state: ElementState::Pressed,
-                            repeat,
-                            platform_specific: KeyEventExtra,
+                runner.send_events(
+                    iter::once(Event::WindowEvent {
+                        window_id: RootWindowId(id),
+                        event: WindowEvent::KeyboardInput {
+                            device_id: RootDeviceId(unsafe { DeviceId::dummy() }),
+                            event: KeyEvent {
+                                physical_key,
+                                logical_key,
+                                text,
+                                location,
+                                state: ElementState::Pressed,
+                                repeat,
+                                platform_specific: KeyEventExtra,
+                            },
+                            is_synthetic: false,
                         },
-                        is_synthetic: false,
-                    },
-                })));
+                    })
+                    .chain(modifiers_changed),
+                );
             },
             prevent_default,
         );
@@ -166,30 +169,33 @@ impl<T> EventLoopWindowTarget<T> {
         let modifiers = self.modifiers.clone();
         canvas.on_keyboard_release(
             move |physical_key, logical_key, text, location, repeat, active_modifiers| {
-                let modifiers = (modifiers.get() != active_modifiers).then(|| {
+                let modifiers_changed = (modifiers.get() != active_modifiers).then(|| {
                     modifiers.set(active_modifiers);
                     Event::WindowEvent {
                         window_id: RootWindowId(id),
                         event: WindowEvent::ModifiersChanged(active_modifiers.into()),
                     }
                 });
 
-                runner.send_events(modifiers.into_iter().chain(iter::once(Event::WindowEvent {
-                    window_id: RootWindowId(id),
-                    event: WindowEvent::KeyboardInput {
-                        device_id: RootDeviceId(unsafe { DeviceId::dummy() }),
-                        event: KeyEvent {
-                            physical_key,
-                            logical_key,
-                            text,
-                            location,
-                            state: ElementState::Released,
-                            repeat,
-                            platform_specific: KeyEventExtra,
+                runner.send_events(
+                    iter::once(Event::WindowEvent {
+                        window_id: RootWindowId(id),
+                        event: WindowEvent::KeyboardInput {
+                            device_id: RootDeviceId(unsafe { DeviceId::dummy() }),
+                            event: KeyEvent {
+                                physical_key,
+                                logical_key,
+                                text,
+                                location,
+                                state: ElementState::Released,
+                                repeat,
+                                platform_specific: KeyEventExtra,
+                            },
+                            is_synthetic: false,
                         },
-                        is_synthetic: false,
-                    },
-                })))
+                    })
+                    .chain(modifiers_changed),
+                )
             },
             prevent_default,
         );