diff --git a/crates/egui_demo_lib/src/rendering_test.rs b/crates/egui_demo_lib/src/rendering_test.rs index 680f842dd57..f9ead5c584c 100644 --- a/crates/egui_demo_lib/src/rendering_test.rs +++ b/crates/egui_demo_lib/src/rendering_test.rs @@ -690,7 +690,7 @@ mod tests { let mut color_test = ColorTest::default(); let mut harness = egui_kittest::Harness::builder() .with_size(vec2(2000.0, 2000.0)) - .with_dpi(dpi) + .with_pixels_per_point(dpi) .build_ui(|ui| { color_test.ui(ui); }); diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.00.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.00.png index e5870bd8fe3..ae442978324 100644 --- a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.00.png +++ b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.00.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf774de50f485096b1190093e2ef9a9e598f1d19941045386f182b7e51744d0c -size 277095 +oid sha256:023eaa363b42ec24ae845dc2ca9ff271a0bd47217e625785d3716044ecfa7a64 +size 278444 diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.25.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.25.png index fc42214700b..428160c867d 100644 --- a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.25.png +++ b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.25.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cf07a6f55057730133d192bcbf26d95583377d8c6147f3788eefa2d527972d4 -size 375597 +oid sha256:d81f618e54176b1c43b710121f249e13ce29827fbea3451827ab62229006677e +size 378603 diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.50.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.50.png index 4d5ec243d56..003a08bd6e3 100644 --- a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.50.png +++ b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.50.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06bc9f9adfbd017ae51cf1be8910db9db4552d6e741205065832cc29654bd38d -size 462813 +oid sha256:2d8eca6d5555ef779233175615b877fb91318b4a09a37e5cfbe71973d56f4caf +size 465907 diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.67.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.67.png index 3f1d5c8f417..629edf05c1e 100644 --- a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.67.png +++ b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.67.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:567d52eb9b96942670e920c6e88bbfb5adc2690f6d5a2b6b87996ff96584899e -size 533920 +oid sha256:4768804f57dfc54c5f6b84a2686038b8d630a28c7e928ae044d5b2ce8377e2cd +size 538775 diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.75.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.75.png index 5db5db3a7fa..98ffb99034b 100644 --- a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.75.png +++ b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_1.75.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5837945b9b8f60a6dbc334eb84eb0df6217f240ca7fda3a12f6c79ba21a23ac1 -size 567531 +oid sha256:fcee0e0302f33d681348d62bee3b548beb494c6dd1fa3454586986e0b699e162 +size 572403 diff --git a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_2.00.png b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_2.00.png index 26eb302bfd8..04d581799bd 100644 --- a/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_2.00.png +++ b/crates/egui_demo_lib/tests/snapshots/rendering_test/dpi_2.00.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06de15c3e72805174fd9efc3ec9697b6360d3f54d67f2e837630c6887aeb1c15 -size 659759 +oid sha256:254a8dff0b1d4b74971fd3bd4044c4ec0ce49412a95e98419a14dc55b32a4fc9 +size 663272 diff --git a/crates/egui_demo_lib/tests/snapshots/widget_gallery.png b/crates/egui_demo_lib/tests/snapshots/widget_gallery.png index 8aa817094cd..914b3da9ead 100644 --- a/crates/egui_demo_lib/tests/snapshots/widget_gallery.png +++ b/crates/egui_demo_lib/tests/snapshots/widget_gallery.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3833dc1709543abbb320ce32f47880bd40299801fa633c7f0eee27bed643e5ab -size 158260 +oid sha256:c069ef4f86beeeafd8686f30fc914bedd7e7e7ec38fd96e9a46ac6b31308c43f +size 160883 diff --git a/crates/egui_kittest/src/app_kind.rs b/crates/egui_kittest/src/app_kind.rs index e7c046b2ee0..5adca264fb3 100644 --- a/crates/egui_kittest/src/app_kind.rs +++ b/crates/egui_kittest/src/app_kind.rs @@ -55,17 +55,19 @@ impl<'a> AppKind<'a> { fn run_ui(f: &mut AppKindUi<'a>, ctx: &egui::Context, sizing_pass: bool) -> egui::Response { egui::CentralPanel::default() - .frame( - Frame::central_panel(&ctx.style()) - .inner_margin(0.0) - .outer_margin(0.0), - ) + .frame(Frame::none()) .show(ctx, |ui| { let mut builder = egui::UiBuilder::new(); if sizing_pass { builder.sizing_pass = true; } - ui.scope_builder(builder, f).response + ui.scope_builder(builder, |ui| { + Frame::central_panel(ui.style()) + .outer_margin(8.0) + .inner_margin(0.0) + .show(ui, |ui| f(ui)); + }) + .response }) .inner } diff --git a/crates/egui_kittest/src/wgpu.rs b/crates/egui_kittest/src/wgpu.rs index a979226ebc2..6d165c94bda 100644 --- a/crates/egui_kittest/src/wgpu.rs +++ b/crates/egui_kittest/src/wgpu.rs @@ -128,7 +128,7 @@ impl TestRenderer { view: &texture_view, resolve_target: None, ops: wgpu::Operations { - load: wgpu::LoadOp::Clear(wgpu::Color::BLACK), + load: wgpu::LoadOp::Clear(wgpu::Color::TRANSPARENT), store: StoreOp::Store, }, })], diff --git a/crates/egui_kittest/tests/snapshots/test_shrink.png b/crates/egui_kittest/tests/snapshots/test_shrink.png index cbca98e2150..10967a3d52a 100644 --- a/crates/egui_kittest/tests/snapshots/test_shrink.png +++ b/crates/egui_kittest/tests/snapshots/test_shrink.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:12f687a49cad1f9cb2d590b1e1412759f71556a1de13f30f39098ae2394055ae -size 2837 +oid sha256:7008bdb595a19782c4f724bed363e51bd93121f5211186aa0e8014c8ba1007c2 +size 3005