Merge branch 'emilk:master' into common-panels

crates/egui_demo_app/src/frame_history.rs

@@ -72,7 +72,7 @@ impl FrameHistory {
         let mut shapes = Vec::with_capacity(3 + 2 * history.len());
         shapes.push(Shape::Rect(epaint::RectShape::new(
             rect,
-            style.rounding,
+            style.corner_radius,
             ui.visuals().extreme_bg_color,
             ui.style().noninteractive().bg_stroke,
             egui::StrokeKind::Inside,

crates/egui_demo_app/src/wrap_app.rs

@@ -47,7 +47,7 @@ impl eframe::App for FractalClockApp {
             .frame(
                 egui::Frame::dark_canvas(&ctx.style())
                     .stroke(egui::Stroke::NONE)
-                    .rounding(0),
+                    .corner_radius(0),
             )
             .show(ctx, |ui| {
                 self.fractal_clock

crates/egui_demo_app/tests/snapshots/clock.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4aeab31841dd95b5e0f4bd0af0c0ba49a862d50836dbafdf2172fbbab950c105
-size 327741
+oid sha256:2c15a74a1b1ed3b52a53966a3df2901ca520b92fbfbd10503e32ddb8431e1467
+size 335399

crates/egui_demo_app/tests/snapshots/easymarkeditor.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7bcf6e2977bed682d7bdaa0b6a6786e528662dd0791d2e6f83cf1b4852035838
-size 182833
+oid sha256:d8f1046ee5d50d73a17009fd1f11f056b5828fedc62908d00730a6aa77125473
+size 182900

crates/egui_demo_app/tests/snapshots/imageviewer.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2292f0f80bfd3c80055a72eb983549ac2875d36acb333732bd0a67e51b24ae4f
-size 102983
+oid sha256:57274cec5ee7e5522073249b931ea65ead22752aea1de40666543e765c1b6b85
+size 102929

crates/egui_demo_app/tests/test_demo_app.rs

@@ -2,6 +2,7 @@ use egui::accesskit::Role;
 use egui::Vec2;
 use egui_demo_app::{Anchor, WrapApp};
 use egui_kittest::kittest::Queryable;
+use egui_kittest::SnapshotResults;
 
 #[test]
 fn test_demo_app() {
@@ -27,7 +28,7 @@ fn test_demo_app() {
         "Expected to find the Custom3d app.",
     );
 
-    let mut results = vec![];
+    let mut results = SnapshotResults::new();
 
     for (name, anchor) in apps {
         harness.get_by_role_and_label(Role::Button, name).click();
@@ -68,12 +69,6 @@ fn test_demo_app() {
         // Can't use Harness::run because fractal clock keeps requesting repaints
         harness.run_steps(2);
 
-        if let Err(e) = harness.try_snapshot(&anchor.to_string()) {
-            results.push(e);
-        }
-    }
-
-    if let Some(error) = results.first() {
-        panic!("{error}");
+        results.add(harness.try_snapshot(&anchor.to_string()));
     }
 }