Plugin based kittest inspector

Cargo.toml

@@ -6,6 +6,7 @@ members = [
   "crates/egui_demo_lib",
   "crates/egui_extras",
   "crates/egui_glow",
+  "crates/egui_inspection",
   "crates/egui_kittest",
   "crates/egui-wgpu",
   "crates/egui-winit",
@@ -65,6 +66,7 @@ egui_extras = { version = "0.34.2", path = "crates/egui_extras", default-feature
 egui-wgpu = { version = "0.34.2", path = "crates/egui-wgpu", default-features = false }
 egui_demo_lib = { version = "0.34.2", path = "crates/egui_demo_lib", default-features = false }
 egui_glow = { version = "0.34.2", path = "crates/egui_glow", default-features = false }
+egui_inspection = { version = "0.34.2", path = "crates/egui_inspection", default-features = false }
 egui_kittest = { version = "0.34.2", path = "crates/egui_kittest", default-features = false }
 eframe = { version = "0.34.2", path = "crates/eframe", default-features = false }
 
@@ -82,7 +84,7 @@ bitflags = "2.9.4"
 bytemuck = "1.24.0"
 cint = "0.3.1"
 color-hex = "0.2.0"
-criterion = { version = "0.7.0", default-features = false }
+criterion = { version = "0.8.2", default-features = false }
 dify = { version = "0.8", default-features = false }
 directories = "6.0.0"
 document-features = "0.2.11"
@@ -93,9 +95,10 @@ font-types = { version = "0.11.0", default-features = false, features = ["std"]
 glow = "0.17.0"
 glutin = { version = "0.32.3", default-features = false }
 glutin-winit = { version = "0.5.0", default-features = false }
-harfrust = "0.5.2"
+harfrust = "0.7.0"
 home = "0.5.9"
 image = { version = "0.25.6", default-features = false }
+itertools = "0.14.0"
 jiff = { version = "0.2.23", default-features = false }
 js-sys = "0.3.77"
 kittest = { version = "0.4.0" }
@@ -114,19 +117,20 @@ parking_lot = "0.12.5"
 percent-encoding = "2.3.2"
 poll-promise = { version = "0.3.0", default-features = false }
 pollster = "0.4.0"
-profiling = { version = "1.0.17", default-features = false }
-puffin = "0.19.1"
-puffin_http = "0.16.1"
+profiling = { version = "1.0.18", default-features = false }
+puffin = "0.20.0"
+puffin_http = "0.17.0"
 rand = "0.9.2"
 raw-window-handle = "0.6.2"
 rayon = "1.11.0"
 resvg = { version = "0.45.1", default-features = false }
 rfd = "0.17.2"
+rmp-serde = "1.3.1"
 ron = "0.12.0"
 self_cell = "1.2.1"
 serde = { version = "1.0.228", features = ["derive"] }
 similar-asserts = "1.7.0"
-skrifa = { version = "0.40.0", default-features = false, features = ["std", "autohint_shaping"] }
+skrifa = { version = "0.42.1", default-features = false, features = ["std", "autohint_shaping"] }
 smallvec = "1.15.1"
 smithay-clipboard = "0.7.2"
 static_assertions = "1.1.0"
@@ -139,7 +143,7 @@ type-map = "0.5.1"
 unicode_names2 = { version = "2.0.0", default-features = false }
 unicode-general-category = "1.1.0"
 unicode-segmentation = "1.12.0"
-vello_cpu = { version = "0.0.7", default-features = false, features = [
+vello_cpu = { version = "0.0.8", default-features = false, features = [
   "std",
   "u8_pipeline",
   "f32_pipeline",

crates/ecolor/src/color32.rs

@@ -489,7 +489,7 @@ mod test {
             } else {
                 // There will be small rounding errors whenever the alpha is not 0 or 255,
                 // because we multiply and then unmultiply the alpha.
-                for (&a, &b) in in_rgba.iter().zip(out_rgba.iter()) {
+                for (&a, &b) in std::iter::zip(&in_rgba, &out_rgba) {
                     assert!(a.abs_diff(b) <= 3, "{in_rgba:?} != {out_rgba:?}");
                 }
             }

crates/ecolor/src/rgba.rs

@@ -336,7 +336,7 @@ mod test {
             } else {
                 // There will be small rounding errors whenever the alpha is not 0 or 255,
                 // because we multiply and then unmultiply the alpha.
-                for (&a, &b) in in_rgba.iter().zip(out_rgba.iter()) {
+                for (&a, &b) in std::iter::zip(&in_rgba, &out_rgba) {
                     assert!(a.abs_diff(b) <= 3, "{in_rgba:?} != {out_rgba:?}");
                 }
             }

crates/eframe/Cargo.toml

@@ -116,6 +116,12 @@ x11 = [
 ## This is used to generate images for examples.
 __screenshot = []
 
+## Enable the [`egui_inspection`] plugin. When the `EGUI_INSPECTION_SOCKET` env var points
+## at a unix socket, eframe attaches an `InspectionPlugin` to the egui context on startup
+## that streams the AccessKit tree and applies received commands. Unix-only; no-op on
+## non-unix targets.
+inspection = ["dep:egui_inspection", "accesskit"]
+
 [dependencies]
 egui = { workspace = true, default-features = false, features = ["bytemuck"] }
 
@@ -131,6 +137,7 @@ web-time.workspace = true
 # Optional dependencies
 
 egui_glow = { workspace = true, optional = true, default-features = false }
+egui_inspection = { workspace = true, optional = true, features = ["plugin"] }
 glow = { workspace = true, optional = true }
 ron = { workspace = true, optional = true, features = ["integer128"] }
 serde = { workspace = true, optional = true }

crates/eframe/src/lib.rs

@@ -45,7 +45,7 @@
 //!
 //! impl eframe::App for MyEguiApp {
 //!    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
-//!        egui::CentralPanel::default().show_inside(ui, |ui| {
+//!        egui::CentralPanel::default().show(ui, |ui| {
 //!            ui.heading("Hello World!");
 //!        });
 //!    }
@@ -209,6 +209,33 @@ pub use native::file_storage::storage_dir;
 #[cfg(not(target_arch = "wasm32"))]
 pub mod icon_data;
 
+// ----------------------------------------------------------------------------
+
+/// Attach an [`egui_inspection::InspectionPlugin`] to `ctx` if the
+/// `EGUI_INSPECTION_SOCKET` env var points at a reachable unix socket.
+///
+/// No-op when:
+/// - the `inspection` feature isn't enabled,
+/// - the target isn't unix, or
+/// - the env var is unset.
+///
+/// Connection failures are logged via `log::warn!` but do not abort startup — running
+/// without an inspector is always valid.
+#[cfg(all(feature = "inspection", unix, not(target_arch = "wasm32")))]
+pub(crate) fn maybe_attach_inspection_plugin(ctx: &egui::Context, label: Option<String>) {
+    match egui_inspection::InspectionPlugin::from_env(label) {
+        Ok(Some(plugin)) => {
+            log::info!("eframe: attaching egui_inspection plugin");
+            ctx.add_plugin(plugin);
+        }
+        Ok(None) => {}
+        Err(err) => log::warn!("eframe: egui_inspection attach failed: {err}"),
+    }
+}
+
+#[cfg(not(all(feature = "inspection", unix, not(target_arch = "wasm32"))))]
+pub(crate) fn maybe_attach_inspection_plugin(_ctx: &egui::Context, _label: Option<String>) {}
+
 /// This is how you start a native (desktop) app.
 ///
 /// The first argument is name of your app, which is an identifier
@@ -244,7 +271,7 @@ pub mod icon_data;
 ///
 /// impl eframe::App for MyEguiApp {
 ///    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
-///        egui::CentralPanel::default().show_inside(ui, |ui| {
+///        egui::CentralPanel::default().show(ui, |ui| {
 ///            ui.heading("Hello World!");
 ///        });
 ///    }
@@ -334,7 +361,7 @@ pub fn run_native_ext(
 ///
 /// impl eframe::App for MyEguiApp {
 ///    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
-///        egui::CentralPanel::default().show_inside(ui, |ui| {
+///        egui::CentralPanel::default().show(ui, |ui| {
 ///            ui.heading("Hello World!");
 ///        });
 ///    }
@@ -425,7 +452,7 @@ fn init_native(app_name: &str, native_options: &mut NativeOptions) -> Renderer {
 ///     let options = eframe::NativeOptions::default();
 ///     eframe::run_ui_native("My egui App", options, move |ui, _frame| {
 ///         // Wrap everything in a CentralPanel so we get some margins and a background color:
-///         egui::CentralPanel::default().show_inside(ui, |ui| {
+///         egui::CentralPanel::default().show(ui, |ui| {
 ///             ui.heading("My egui Application");
 ///             ui.horizontal(|ui| {
 ///                 let name_label = ui.label("Your name: ");

crates/eframe/src/native/glow_integration.rs

@@ -299,6 +299,8 @@ impl<'app> GlowWinitApp<'app> {
         let app_creator = std::mem::take(&mut self.app_creator)
             .expect("Single-use AppCreator has unexpectedly already been taken");
 
+        crate::maybe_attach_inspection_plugin(&integration.egui_ctx, Some(self.app_name.clone()));
+
         let app: Box<dyn 'app + App> = {
             // Use latest raw_window_handle for eframe compatibility
             use raw_window_handle::{HasDisplayHandle as _, HasWindowHandle as _};
@@ -679,7 +681,7 @@ impl GlowWinitRunning<'_> {
         let gl_surface = viewport.gl_surface.as_ref().unwrap();
         let egui_winit = viewport.egui_winit.as_mut().unwrap();
 
-        egui_winit.handle_platform_output(&window, platform_output);
+        egui_winit.handle_platform_output_with_event_loop(&window, event_loop, platform_output);
 
         if is_visible {
             let clipped_primitives = integration.egui_ctx.tessellate(shapes, pixels_per_point);

crates/eframe/src/native/wgpu_integration.rs

@@ -291,6 +291,9 @@ impl<'app> WgpuWinitApp<'app> {
 
         let app_creator = std::mem::take(&mut self.app_creator)
             .expect("Single-use AppCreator has unexpectedly already been taken");
+
+        crate::maybe_attach_inspection_plugin(&egui_ctx, Some(self.app_name.clone()));
+
         let cc = CreationContext {
             egui_ctx: egui_ctx.clone(),
             integration_info: integration.frame.info().clone(),
@@ -409,7 +412,7 @@ impl WinitApp for WgpuWinitApp<'_> {
         self.initialized_all_windows(event_loop);
 
         if let Some(running) = &mut self.running {
-            running.run_ui_and_paint(window_id)
+            running.run_ui_and_paint(window_id, event_loop)
         } else {
             Ok(EventResult::Wait)
         }
@@ -569,7 +572,11 @@ impl WgpuWinitRunning<'_> {
     }
 
     /// This is called both for the root viewport, and all deferred viewports
-    fn run_ui_and_paint(&mut self, window_id: WindowId) -> Result<EventResult> {
+    fn run_ui_and_paint(
+        &mut self,
+        window_id: WindowId,
+        event_loop: &ActiveEventLoop,
+    ) -> Result<EventResult> {
         profiling::function_scope!();
 
         let Some(viewport_id) = self
@@ -710,7 +717,7 @@ impl WgpuWinitRunning<'_> {
             return Ok(EventResult::Wait);
         };
 
-        egui_winit.handle_platform_output(window, platform_output);
+        egui_winit.handle_platform_output_with_event_loop(window, event_loop, platform_output);
 
         let vsync_secs = if is_visible {
             let clipped_primitives = egui_ctx.tessellate(shapes, pixels_per_point);

crates/eframe/src/web/app_runner.rs

@@ -368,7 +368,8 @@ impl AppRunner {
         let egui::PlatformOutput {
             commands,
             cursor_icon,
-            events: _,                    // already handled
+            cursor_image: _, // TODO(alextournai): support custom bitmap cursors on the web (via CSS `url(...)`)
+            events: _,       // already handled
             mutable_text_under_cursor: _, // TODO(#4569): https://github.com/emilk/egui/issues/4569
             ime,
             accesskit_update: _,        // not currently implemented

crates/eframe/src/web/input.rs

@@ -31,11 +31,12 @@ pub fn primary_touch_pos(
     runner: &mut AppRunner,
     event: &web_sys::TouchEvent,
 ) -> Option<(egui::Pos2, web_sys::Touch)> {
-    let all_touches: Vec<_> = (0..event.touches().length())
-        .filter_map(|i| event.touches().get(i))
-        // On touchend we don't get anything in `touches`, but we still get `changed_touches`, so include those:
-        .chain((0..event.changed_touches().length()).filter_map(|i| event.changed_touches().get(i)))
-        .collect();
+    // On touchend we don't get anything in `touches`, but we still get `changed_touches`, so include those:
+    let all_touches: Vec<_> = std::iter::chain(
+        (0..event.touches().length()).filter_map(|i| event.touches().get(i)),
+        (0..event.changed_touches().length()).filter_map(|i| event.changed_touches().get(i)),
+    )
+    .collect();
 
     if let Some(primary_touch) = runner.input.primary_touch {
         // Is the primary touch is gone?

crates/eframe/src/web/web_painter_wgpu.rs

@@ -365,7 +365,7 @@ impl WebPainter for WebPainterWgpu {
         // Submit the commands: both the main buffer and user-defined ones.
         render_state
             .queue
-            .submit(user_cmd_bufs.into_iter().chain([encoder.finish()]));
+            .submit(std::iter::chain(user_cmd_bufs, [encoder.finish()]));
 
         if let Some((frame, capture_buffer)) = frame_and_capture_buffer {
             if let Some(capture_buffer) = capture_buffer

crates/egui-wgpu/src/winit.rs

@@ -715,7 +715,7 @@ impl Painter {
             let start = web_time::Instant::now();
             render_state
                 .queue
-                .submit(user_cmd_bufs.into_iter().chain([encoded]));
+                .submit(std::iter::chain(user_cmd_bufs, [encoded]));
             vsync_sec += start.elapsed().as_secs_f32();
         };