update: event reader

Author: not-elm

crates/bevy_flurx_ipc/src/ipc_trigger.rs

@@ -50,6 +50,7 @@ impl IpcTriggerExt for App {
         P: DeserializeOwned + Event + Send + Sync + 'static,
     {
         let event_id = event_id.into();
+        self.add_event::<P>();
         self.add_systems(PreUpdate, read_receive_ipc_event_from_webview::<P>(event_id).before(cleanup_ipc_trigger_sender));
         self
     }
@@ -78,13 +79,17 @@ where
             return;
         };
         for message in messages.iter().filter(|m| m.event_id == event_id) {
-            let Ok(payload) = serde_json::from_str::<Payload>(&message.payload)  else {
+            let Ok(p1) = serde_json::from_str::<Payload>(&message.payload)  else {
                 continue;
             };
+            let Ok(p2) = serde_json::from_str::<Payload>(&message.payload)  else {
+                continue;
+            };
+            commands.send_event(p1);
             if let Some(target) = message.target {
-                commands.entity(target).trigger(payload);
+                commands.entity(target).trigger(p2);
             } else {
-                commands.trigger(payload);
+                commands.trigger(p2);
             }
         }
     }

crates/bevy_webview_wry/src/embedding/grip_zone.rs

@@ -33,7 +33,7 @@ impl Plugin for GripZonePlugin {
             .add_observer(apply_drag_end);
 
         #[cfg(target_os = "linux")]
-        app.add_ipc_event::<OnGribDrag>("FLURX|grip::drag");
+        app.add_ipc_trigger::<OnGribDrag>("FLURX|grip::drag");
     }
 }
 
@@ -57,7 +57,7 @@ struct MouseDelta<'w, 's> {
     /// I was testing on Ubuntu 24.04 ARM64 in Parallels, but `MouseMotion` was getting clearly abnormal coordinates,
     /// so I switched to getting delta from webview.
     #[cfg(target_os = "linux")]
-    er: EventReader<'w, 's, IpcEvent<OnGribDrag>>,
+    er: EventReader<'w, 's, OnGribDrag>,
 }
 
 impl MouseDelta<'_, '_> {
@@ -76,7 +76,7 @@ impl MouseDelta<'_, '_> {
             .er
             .read()
             .map(|event| {
-                Vec2::new(event.payload.x, event.payload.y)
+                Vec2::new(event.x, event.y)
             })
             .reduce(|d1, d2| d1 + d2)
     }
@@ -132,7 +132,7 @@ struct OnGripGrab {
 }
 
 #[cfg(target_os = "linux")]
-#[derive(Deserialize)]
+#[derive(Deserialize, Event)]
 struct OnGribDrag {
     x: f32,
     y: f32,