diff --git a/.github/workflows/cargo_machete.yml b/.github/workflows/cargo_machete.yml
index 7e5747800..1dc162e56 100644
--- a/.github/workflows/cargo_machete.yml
+++ b/.github/workflows/cargo_machete.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.88
+          toolchain: 1.92
       - name: Machete install
         ## The official cargo-machete action
         uses: bnjbvr/cargo-machete@v0.9.1
diff --git a/.github/workflows/deploy_web_demo.yml b/.github/workflows/deploy_web_demo.yml
index 21cfb159e..eb60d14fa 100644
--- a/.github/workflows/deploy_web_demo.yml
+++ b/.github/workflows/deploy_web_demo.yml
@@ -38,7 +38,7 @@ jobs:
         with:
           profile: minimal
           target: wasm32-unknown-unknown
-          toolchain: 1.88.0
+          toolchain: 1.92.0
           override: true
 
       - uses: Swatinem/rust-cache@v2
diff --git a/.github/workflows/spelling_and_links.yml b/.github/workflows/link_checker.yml
similarity index 62%
rename from .github/workflows/spelling_and_links.yml
rename to .github/workflows/link_checker.yml
index e09e01562..baf2aa402 100644
--- a/.github/workflows/spelling_and_links.yml
+++ b/.github/workflows/link_checker.yml
@@ -1,21 +1,8 @@
-name: Check spelling and links
-on: [pull_request]
+name: Link checker
+# on: [pull_request]  # Disabled because it is so broken
+on: workflow_dispatch
 
 jobs:
-  typos:
-    # https://github.com/crate-ci/typos
-    # Add exceptions to .typos.toml
-    # install and run locally: cargo install typos-cli && typos
-    name: typos
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - name: Checkout Actions Repository
-        uses: actions/checkout@v4
-
-      - name: Check spelling of entire workspace
-        uses: crate-ci/typos@v1.38.0
-
   lychee:
     name: lychee
     runs-on: ubuntu-latest
@@ -33,4 +20,3 @@ jobs:
         uses: lycheeverse/lychee-action@v2
         with:
           args: "'**/*.md' '**/*.toml' --exclude localhost --exclude reddit.com" # I guess reddit doesn't like github action IPs
-
diff --git a/.github/workflows/preview_build.yml b/.github/workflows/preview_build.yml
index fe37eb8cb..22ea08cba 100644
--- a/.github/workflows/preview_build.yml
+++ b/.github/workflows/preview_build.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
           targets: wasm32-unknown-unknown
       - uses: Swatinem/rust-cache@v2
         with:
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index f71588545..9018d251b 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -19,7 +19,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
 
       - name: Install packages (Linux)
         if: runner.os == 'Linux'
@@ -74,7 +74,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
           targets: wasm32-unknown-unknown
 
       - run: sudo apt-get update && sudo apt-get install libgtk-3-dev libatk1.0-dev
@@ -148,7 +148,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v2
         with:
-          rust-version: "1.88.0"
+          rust-version: "1.92.0"
           log-level: error
           command: check
           arguments: --target  ${{ matrix.target }}
@@ -164,7 +164,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
           targets: aarch64-linux-android
 
       - name: Set up cargo cache
@@ -186,7 +186,7 @@ jobs:
 
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
           targets: aarch64-apple-ios
 
       - name: Set up cargo cache
@@ -206,7 +206,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
 
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@v2
@@ -228,7 +228,7 @@ jobs:
           lfs: true
       - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: 1.88.0
+          toolchain: 1.92.0
 
       - name: Set up cargo cache
         uses: Swatinem/rust-cache@v2
diff --git a/.github/workflows/typos.yml b/.github/workflows/typos.yml
new file mode 100644
index 000000000..19205d51e
--- /dev/null
+++ b/.github/workflows/typos.yml
@@ -0,0 +1,17 @@
+name: Typos
+on: [pull_request]
+
+jobs:
+  typos:
+    # https://github.com/crate-ci/typos
+    # Add exceptions to .typos.toml
+    # install and run locally: cargo install typos-cli && typos
+    name: typos
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout Actions Repository
+        uses: actions/checkout@v4
+
+      - name: Check spelling of entire workspace
+        uses: crate-ci/typos@v1.38.0
diff --git a/.typos.toml b/.typos.toml
index 3ae860ad9..16659f4c7 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -5,8 +5,8 @@
 [default.extend-words]
 ime = "ime" # Input Method Editor
 nknown = "nknown" # part of @55nknown username
-isse = "isse"     # part of @IsseW username
-tye = "tye"       # part of @tye-exe username
+isse = "isse" # part of @IsseW username
+tye = "tye" # part of @tye-exe username
 ro = "ro" # read-only, also part of the username @Phen-Ro
 typ = "typ" # Often used because `type` is a keyword in Rust
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 856fe09da..12010e287 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,11 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.33.3 - 2025-12-11
+* Treat `.` as a word-splitter in text navigation [#7741](https://github.com/emilk/egui/pull/7741) by [@emilk](https://github.com/emilk)
+* Change text color of selected text [#7691](https://github.com/emilk/egui/pull/7691) by [@emilk](https://github.com/emilk)
+
+
 ## 0.33.2 - 2025-11-13
 ### ⭐ Added
 * Add `Plugin::on_widget_under_pointer` to support widget inspector [#7652](https://github.com/emilk/egui/pull/7652) by [@juancampa](https://github.com/juancampa)
diff --git a/Cargo.lock b/Cargo.lock
index 61bf459b5..a99c0d281 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -863,6 +863,15 @@ dependencies = [
  "unicode-width",
 ]
 
+[[package]]
+name = "color"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a18ef4657441fb193b65f34dc39b3781f0dfec23d3bd94d0eeb4e88cde421edb"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "color-hex"
 version = "0.2.0"
@@ -1248,7 +1257,7 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
 
 [[package]]
 name = "ecolor"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "bytemuck",
  "cint",
@@ -1260,7 +1269,7 @@ dependencies = [
 
 [[package]]
 name = "eframe"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1299,7 +1308,7 @@ dependencies = [
 
 [[package]]
 name = "egui"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "accesskit",
  "ahash",
@@ -1319,7 +1328,7 @@ dependencies = [
 
 [[package]]
 name = "egui-wgpu"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1337,7 +1346,7 @@ dependencies = [
 
 [[package]]
 name = "egui-winit"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "accesskit_winit",
  "arboard",
@@ -1360,7 +1369,7 @@ dependencies = [
 
 [[package]]
 name = "egui_demo_app"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -1390,7 +1399,7 @@ dependencies = [
 
 [[package]]
 name = "egui_demo_lib"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "chrono",
  "criterion",
@@ -1407,7 +1416,7 @@ dependencies = [
 
 [[package]]
 name = "egui_extras"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "ahash",
  "chrono",
@@ -1426,7 +1435,7 @@ dependencies = [
 
 [[package]]
 name = "egui_glow"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "bytemuck",
  "document-features",
@@ -1445,7 +1454,7 @@ dependencies = [
 
 [[package]]
 name = "egui_kittest"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "dify",
  "document-features",
@@ -1457,13 +1466,15 @@ dependencies = [
  "kittest",
  "open",
  "pollster",
+ "serde",
  "tempfile",
+ "toml",
  "wgpu",
 ]
 
 [[package]]
 name = "egui_tests"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "egui",
  "egui_extras",
@@ -1473,9 +1484,9 @@ dependencies = [
 
 [[package]]
 name = "ehttp"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59a81c221a1e4dad06cb9c9deb19aea1193a5eea084e8cd42d869068132bf876"
+checksum = "04499d3c719edecfad5c9b46031726c8540905d73be6d7e4f9788c4a298da908"
 dependencies = [
  "document-features",
  "js-sys",
@@ -1493,7 +1504,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "emath"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "bytemuck",
  "document-features",
@@ -1591,9 +1602,8 @@ dependencies = [
 
 [[package]]
 name = "epaint"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
- "ab_glyph",
  "ahash",
  "bytemuck",
  "criterion",
@@ -1607,13 +1617,16 @@ dependencies = [
  "parking_lot",
  "profiling",
  "rayon",
+ "self_cell",
  "serde",
  "similar-asserts",
+ "skrifa",
+ "vello_cpu",
 ]
 
 [[package]]
 name = "epaint_default_fonts"
-version = "0.33.2"
+version = "0.33.3"
 
 [[package]]
 name = "equivalent"
@@ -1637,6 +1650,15 @@ version = "3.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
 
+[[package]]
+name = "euclid"
+version = "0.22.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "event-listener"
 version = "5.3.1"
@@ -1704,6 +1726,15 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "fearless_simd"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fb2907d1f08b2b316b9223ced5b0e89d87028ba8deae9764741dba8ff7f3903"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "file_dialog"
 version = "0.1.0"
@@ -1747,6 +1778,15 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
+[[package]]
+name = "font-types"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39a654f404bbcbd48ea58c617c2993ee91d1cb63727a37bf2323a4edeed1b8c5"
+dependencies = [
+ "bytemuck",
+]
+
 [[package]]
 name = "fontconfig-parser"
 version = "0.5.7"
@@ -2526,6 +2566,17 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "kurbo"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce9729cc38c18d86123ab736fd2e7151763ba226ac2490ec092d1dd148825e32"
+dependencies = [
+ "arrayvec",
+ "euclid",
+ "smallvec",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -2575,6 +2626,12 @@ dependencies = [
  "redox_syscall 0.5.7",
 ]
 
+[[package]]
+name = "linebender_resource_handle"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4a5ff6bcca6c4867b1c4fd4ef63e4db7436ef363e0ad7531d1558856bae64f4"
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -3251,6 +3308,19 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
 
+[[package]]
+name = "peniko"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3c76095c9a636173600478e0373218c7b955335048c2bcd12dc6a79657649d8"
+dependencies = [
+ "bytemuck",
+ "color",
+ "kurbo 0.12.0",
+ "linebender_resource_handle",
+ "smallvec",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.3.2"
@@ -3381,9 +3451,9 @@ dependencies = [
 
 [[package]]
 name = "png"
-version = "0.17.14"
+version = "0.17.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0"
+checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -3425,7 +3495,7 @@ checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
 
 [[package]]
 name = "popups"
-version = "0.33.2"
+version = "0.33.3"
 dependencies = [
  "eframe",
  "env_logger",
@@ -3690,6 +3760,16 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "read-fonts"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6717cf23b488adf64b9d711329542ba34de147df262370221940dfabc2c91358"
+dependencies = [
+ "bytemuck",
+ "font-types",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -3983,6 +4063,12 @@ dependencies = [
  "tiny-skia",
 ]
 
+[[package]]
+name = "self_cell"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16c2f82143577edb4921b71ede051dac62ca3c16084e918bf7b40c96ae10eb33"
+
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -4036,6 +4122,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serial_windows"
 version = "0.1.0"
@@ -4101,6 +4196,16 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
+[[package]]
+name = "skrifa"
+version = "0.37.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c31071dedf532758ecf3fed987cdb4bd9509f900e026ab684b4ecb81ea49841"
+dependencies = [
+ "bytemuck",
+ "read-fonts",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -4222,7 +4327,7 @@ version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc"
 dependencies = [
- "kurbo",
+ "kurbo 0.11.1",
  "siphasher",
 ]
 
@@ -4491,11 +4596,26 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "toml"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "toml_edit"
@@ -4504,6 +4624,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
 dependencies = [
  "indexmap",
+ "serde",
+ "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
@@ -4707,7 +4829,7 @@ dependencies = [
  "flate2",
  "fontdb",
  "imagesize",
- "kurbo",
+ "kurbo 0.11.1",
  "log",
  "pico-args",
  "roxmltree",
@@ -4735,6 +4857,30 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
+[[package]]
+name = "vello_common"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a235ba928b3109ad9e7696270edb09445a52ae1c7c08e6d31a19b1cdd6cbc24a"
+dependencies = [
+ "bytemuck",
+ "fearless_simd",
+ "log",
+ "peniko",
+ "skrifa",
+ "smallvec",
+]
+
+[[package]]
+name = "vello_cpu"
+version = "0.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0bd1fcf9c1814f17a491e07113623d44e3ec1125a9f3401f5e047d6d326da21"
+dependencies = [
+ "bytemuck",
+ "vello_common",
+]
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -5645,9 +5791,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.7.3"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
@@ -5748,7 +5894,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
 [[package]]
 name = "xtask"
-version = "0.33.2"
+version = "0.33.3"
 
 [[package]]
 name = "yaml-rust"
diff --git a/Cargo.toml b/Cargo.toml
index b33ca445c..470644bb4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,8 +23,8 @@ members = [
 [workspace.package]
 edition = "2024"
 license = "MIT OR Apache-2.0"
-rust-version = "1.88"
-version = "0.33.2"
+rust-version = "1.92"
+version = "0.33.3"
 
 
 [profile.release]
@@ -55,23 +55,22 @@ opt-level = 2
 
 
 [workspace.dependencies]
-emath = { version = "0.33.2", path = "crates/emath", default-features = false }
-ecolor = { version = "0.33.2", path = "crates/ecolor", default-features = false }
-epaint = { version = "0.33.2", path = "crates/epaint", default-features = false }
-epaint_default_fonts = { version = "0.33.2", path = "crates/epaint_default_fonts" }
-egui = { version = "0.33.2", path = "crates/egui", default-features = false }
-egui-winit = { version = "0.33.2", path = "crates/egui-winit", default-features = false }
-egui_extras = { version = "0.33.2", path = "crates/egui_extras", default-features = false }
-egui-wgpu = { version = "0.33.2", path = "crates/egui-wgpu", default-features = false }
-egui_demo_lib = { version = "0.33.2", path = "crates/egui_demo_lib", default-features = false }
-egui_glow = { version = "0.33.2", path = "crates/egui_glow", default-features = false }
-egui_kittest = { version = "0.33.2", path = "crates/egui_kittest", default-features = false }
-eframe = { version = "0.33.2", path = "crates/eframe", default-features = false }
+emath = { version = "0.33.3", path = "crates/emath", default-features = false }
+ecolor = { version = "0.33.3", path = "crates/ecolor", default-features = false }
+epaint = { version = "0.33.3", path = "crates/epaint", default-features = false }
+epaint_default_fonts = { version = "0.33.3", path = "crates/epaint_default_fonts" }
+egui = { version = "0.33.3", path = "crates/egui", default-features = false }
+egui-winit = { version = "0.33.3", path = "crates/egui-winit", default-features = false }
+egui_extras = { version = "0.33.3", path = "crates/egui_extras", default-features = false }
+egui-wgpu = { version = "0.33.3", path = "crates/egui-wgpu", default-features = false }
+egui_demo_lib = { version = "0.33.3", path = "crates/egui_demo_lib", default-features = false }
+egui_glow = { version = "0.33.3", path = "crates/egui_glow", default-features = false }
+egui_kittest = { version = "0.33.3", path = "crates/egui_kittest", default-features = false }
+eframe = { version = "0.33.3", path = "crates/eframe", default-features = false }
 
 accesskit = "0.21.1"
 accesskit_consumer = "0.30.1"
 accesskit_winit = "0.29.1"
-ab_glyph = "0.2.32"
 ahash = { version = "0.8.12", default-features = false, features = [
   "no-rng", # we don't need DOS-protection, so we let users opt-in to it instead
   "std",
@@ -88,7 +87,7 @@ criterion = { version = "0.7.0", default-features = false }
 dify = { version = "0.7.4", default-features = false }
 directories = "6.0.0"
 document-features = "0.2.11"
-ehttp = { version = "0.5.0", default-features = false }
+ehttp = { version = "0.6.0", default-features = false }
 enum-map = "2.7.3"
 env_logger = { version = "0.11.8", default-features = false }
 glow = "0.16.0"
@@ -122,8 +121,10 @@ rayon = "1.11.0"
 resvg = { version = "0.45.1", default-features = false }
 rfd = "0.15.4"
 ron = "0.11.0"
+self_cell = "1.2.1"
 serde = { version = "1.0.228", features = ["derive"] }
 similar-asserts = "1.7.0"
+skrifa = { version = "0.37.0", default-features = false, features = ["std", "autohint_shaping"] }
 smallvec = "1.15.1"
 smithay-clipboard = "0.7.2"
 static_assertions = "1.1.0"
@@ -131,9 +132,11 @@ syntect = { version = "5.3.0", default-features = false }
 tempfile = "3.23.0"
 thiserror = "2.0.17"
 tokio = "1.47.1"
+toml = "0.8"
 type-map = "0.5.1"
 unicode_names2 = { version = "2.0.0", default-features = false }
 unicode-segmentation = "1.12.0"
+vello_cpu = { version = "0.0.4", default-features = false, features = ["std"] }
 wasm-bindgen = "0.2.100" # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml
 wasm-bindgen-futures = "0.4.0"
 wayland-cursor = { version = "0.31.11", default-features = false }
@@ -181,7 +184,9 @@ branches_sharing_code = "warn"
 char_lit_as_u8 = "warn"
 checked_conversions = "warn"
 clear_with_drain = "warn"
+clone_on_ref_ptr = "warn"
 cloned_instead_of_copied = "warn"
+coerce_container_to_any = "warn"
 dbg_macro = "warn"
 debug_assert_with_mut_call = "warn"
 default_union_representation = "warn"
@@ -191,7 +196,9 @@ disallowed_methods = "warn" # See clippy.toml
 disallowed_names = "warn" # See clippy.toml
 disallowed_script_idents = "warn" # See clippy.toml
 disallowed_types = "warn" # See clippy.toml
+doc_broken_link = "warn"
 doc_comment_double_space_linebreaks = "warn"
+doc_include_without_cfg = "warn"
 doc_link_with_quotes = "warn"
 doc_markdown = "warn"
 elidable_lifetime_names = "warn"
@@ -224,6 +231,7 @@ inefficient_to_string = "warn"
 infinite_loop = "warn"
 into_iter_without_iter = "warn"
 invalid_upcast_comparisons = "warn"
+ip_constant = "warn"
 iter_filter_is_ok = "warn"
 iter_filter_is_some = "warn"
 iter_not_returning_iterator = "warn"
@@ -277,6 +285,7 @@ non_zero_suggestions = "warn"
 nonstandard_macro_braces = "warn"
 option_as_ref_cloned = "warn"
 option_option = "warn"
+or_fun_call = "warn"
 path_buf_push_overwrite = "warn"
 pathbuf_init_then_push = "warn"
 precedence_bits = "warn"
@@ -295,6 +304,7 @@ ref_patterns = "warn"
 rest_pat_in_fully_bound_structs = "warn"
 return_and_then = "warn"
 same_functions_in_if_condition = "warn"
+self_only_used_in_recursion = "warn"
 semicolon_if_nothing_returned = "warn"
 set_contains_or_insert = "warn"
 single_char_pattern = "warn"
@@ -306,7 +316,6 @@ string_add = "warn"
 string_add_assign = "warn"
 string_lit_as_bytes = "warn"
 string_lit_chars_any = "warn"
-string_to_string = "warn"
 suspicious_command_arg_space = "warn"
 suspicious_xor_used_as_pow = "warn"
 todo = "warn"
@@ -315,7 +324,7 @@ trailing_empty_array = "warn"
 trait_duplication_in_bounds = "warn"
 transmute_ptr_to_ptr = "warn"
 tuple_array_conversions = "warn"
-unchecked_duration_subtraction = "warn"
+unchecked_time_subtraction = "warn"
 undocumented_unsafe_blocks = "warn"
 unimplemented = "warn"
 uninhabited_references = "warn"
@@ -335,6 +344,7 @@ unused_peekable = "warn"
 unused_rounding = "warn"
 unused_self = "warn"
 unused_trait_names = "warn"
+unwrap_used = "warn"
 use_self = "warn"
 useless_let_if_seq = "warn"
 useless_transmute = "warn"
@@ -344,10 +354,10 @@ zero_sized_map_values = "warn"
 
 
 # TODO(emilk): maybe enable more of these lints?
+cast_possible_wrap = "allow"
 comparison_chain = "allow"
 should_panic_without_expect = "allow"
 too_many_lines = "allow"
-unwrap_used = "allow" # TODO(emilk): We really wanna warn on this one
 
 # These are meh:
 assigning_clones = "allow" # No please
diff --git a/clippy.toml b/clippy.toml
index 6602fbc6c..a57ed66fe 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -3,7 +3,7 @@
 # -----------------------------------------------------------------------------
 # Section identical to scripts/clippy_wasm/clippy.toml:
 
-msrv = "1.88"
+msrv = "1.92"
 
 allow-unwrap-in-tests = true
 
@@ -39,9 +39,9 @@ disallowed-methods = [
   # but we cannot disable them all here (because of e.g. https://github.com/rust-lang/rust-clippy/issues/10406)
   # so we do that in `clipppy_wasm.toml` instead.
 
-  { path = "std::env::temp_dir", readon = "Use the tempfile crate instead" },
+  { path = "std::env::temp_dir", reason = "Use the tempfile crate instead" },
   { path = "std::panic::catch_unwind", reason = "We compile with `panic = abort" },
-  { path = "std::thread::spawn", readon = "Use `std::thread::Builder` and name the thread" },
+  { path = "std::thread::spawn", reason = "Use `std::thread::Builder` and name the thread" },
 ]
 
 # https://rust-lang.github.io/rust-clippy/master/index.html#disallowed_names
diff --git a/crates/ecolor/CHANGELOG.md b/crates/ecolor/CHANGELOG.md
index 4dee81296..a4fe1f3de 100644
--- a/crates/ecolor/CHANGELOG.md
+++ b/crates/ecolor/CHANGELOG.md
@@ -6,6 +6,10 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.33.3 - 2025-12-11
+Nothing new
+
+
 ## 0.33.2 - 2025-11-13
 Nothing new
 
diff --git a/crates/ecolor/src/hsva.rs b/crates/ecolor/src/hsva.rs
index 06adb121f..17008f5da 100644
--- a/crates/ecolor/src/hsva.rs
+++ b/crates/ecolor/src/hsva.rs
@@ -41,7 +41,7 @@ impl Hsva {
     /// From linear RGBA with premultiplied alpha
     #[inline]
     pub fn from_rgba_premultiplied(r: f32, g: f32, b: f32, a: f32) -> Self {
-        #![allow(clippy::many_single_char_names)]
+        #![expect(clippy::many_single_char_names)]
         if a <= 0.0 {
             if r == 0.0 && b == 0.0 && a == 0.0 {
                 Self::default()
@@ -57,7 +57,7 @@ impl Hsva {
     /// From linear RGBA without premultiplied alpha
     #[inline]
     pub fn from_rgba_unmultiplied(r: f32, g: f32, b: f32, a: f32) -> Self {
-        #![allow(clippy::many_single_char_names)]
+        #![expect(clippy::many_single_char_names)]
         let (h, s, v) = hsv_from_rgb([r, g, b]);
         Self { h, s, v, a }
     }
@@ -189,7 +189,7 @@ impl From<Color32> for Hsva {
 /// All ranges in 0-1, rgb is linear.
 #[inline]
 pub fn hsv_from_rgb([r, g, b]: [f32; 3]) -> (f32, f32, f32) {
-    #![allow(clippy::many_single_char_names)]
+    #![expect(clippy::many_single_char_names)]
     let min = r.min(g.min(b));
     let max = r.max(g.max(b)); // value
 
@@ -213,7 +213,7 @@ pub fn hsv_from_rgb([r, g, b]: [f32; 3]) -> (f32, f32, f32) {
 /// All ranges in 0-1, rgb is linear.
 #[inline]
 pub fn rgb_from_hsv((h, s, v): (f32, f32, f32)) -> [f32; 3] {
-    #![allow(clippy::many_single_char_names)]
+    #![expect(clippy::many_single_char_names)]
     let h = (h.fract() + 1.0).fract(); // wrap
     let s = s.clamp(0.0, 1.0);
 
diff --git a/crates/ecolor/src/lib.rs b/crates/ecolor/src/lib.rs
index f4cdf4d77..ea7cff6f7 100644
--- a/crates/ecolor/src/lib.rs
+++ b/crates/ecolor/src/lib.rs
@@ -19,7 +19,7 @@
 #![cfg_attr(feature = "document-features", doc = document_features::document_features!())]
 //!
 
-#![allow(clippy::wrong_self_convention)]
+#![expect(clippy::wrong_self_convention)]
 
 #[cfg(feature = "cint")]
 mod cint_impl;
diff --git a/crates/eframe/CHANGELOG.md b/crates/eframe/CHANGELOG.md
index 11f1c8fc9..74a705251 100644
--- a/crates/eframe/CHANGELOG.md
+++ b/crates/eframe/CHANGELOG.md
@@ -7,6 +7,10 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.33.3 - 2025-12-11
+Nothing new
+
+
 ## 0.33.2 - 2025-11-13
 * Fix jittering during window resize on MacOS for WGPU/Metal [#7641](https://github.com/emilk/egui/pull/7641) by [@aspcartman](https://github.com/aspcartman)
 * Make sure `native_pixels_per_point` is set during app creation [#7683](https://github.com/emilk/egui/pull/7683) by [@emilk](https://github.com/emilk)
diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml
index 6924633f1..86f63c50e 100644
--- a/crates/eframe/Cargo.toml
+++ b/crates/eframe/Cargo.toml
@@ -251,7 +251,10 @@ web-sys = { workspace = true, features = [
 ] }
 
 # optional web:
-egui-wgpu = { workspace = true, optional = true, features = ["capture"] } # if wgpu is used, use it without (!) winit
+egui-wgpu = { workspace = true, optional = true, features = [
+  # if wgpu is used, use it without (!) winit:
+  "capture",
+] }
 wgpu = { workspace = true, optional = true }
 
 # Native dev dependencies for testing
diff --git a/crates/eframe/src/epi.rs b/crates/eframe/src/epi.rs
index a7bcfd6ef..c37dc1cf6 100644
--- a/crates/eframe/src/epi.rs
+++ b/crates/eframe/src/epi.rs
@@ -135,6 +135,31 @@ impl CreationContext<'_> {
 
 /// Implement this trait to write apps that can be compiled for both web/wasm and desktop/native using [`eframe`](https://github.com/emilk/egui/tree/main/crates/eframe).
 pub trait App {
+    /// Called once before each call to [`Self::ui`],
+    /// and additionally also called when the UI is hidden, but [`egui::Context::request_repaint`] was called.
+    ///
+    /// You may NOT show any ui or do any painting during the call to [`Self::logic`].
+    ///
+    /// The [`egui::Context`] can be cloned and saved if you like.
+    ///
+    /// To force another call to [`Self::logic`], call [`egui::Context::request_repaint`] at any time (e.g. from another thread).
+    fn logic(&mut self, ctx: &egui::Context, frame: &mut Frame) {
+        _ = (ctx, frame);
+    }
+
+    /// Called each time the UI needs repainting, which may be many times per second.
+    ///
+    /// The given [`egui::Ui`] has no margin or background color.
+    /// You can wrap your UI code in [`egui::CentralPanel`] or a [`egui::Frame::central_panel`] to remedy this.
+    ///
+    /// The [`egui::Ui::ctx`] can be cloned and saved if you like.
+    /// To force a repaint, call [`egui::Context::request_repaint`] at any time (e.g. from another thread).
+    ///
+    /// This is called for the root viewport ([`egui::ViewportId::ROOT`]).
+    /// Use [`egui::Context::show_viewport_deferred`] to spawn additional viewports (windows).
+    /// (A "viewport" in egui means an native OS window).
+    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut Frame);
+
     /// Called each time the UI needs repainting, which may be many times per second.
     ///
     /// Put your widgets into a [`egui::Panel`], [`egui::CentralPanel`], [`egui::Window`] or [`egui::Area`].
@@ -146,7 +171,10 @@ pub trait App {
     /// This is called for the root viewport ([`egui::ViewportId::ROOT`]).
     /// Use [`egui::Context::show_viewport_deferred`] to spawn additional viewports (windows).
     /// (A "viewport" in egui means an native OS window).
-    fn update(&mut self, ctx: &egui::Context, frame: &mut Frame);
+    #[deprecated = "Use Self::ui instead"]
+    fn update(&mut self, ctx: &egui::Context, frame: &mut Frame) {
+        _ = (ctx, frame);
+    }
 
     /// Get a handle to the app.
     ///
@@ -763,6 +791,7 @@ impl Frame {
     /// This function will take the ownership of your [`glow::Texture`], so please do not delete your [`glow::Texture`] after registering.
     #[cfg(all(feature = "glow", not(target_arch = "wasm32")))]
     pub fn register_native_glow_texture(&mut self, native: glow::Texture) -> egui::TextureId {
+        #[expect(clippy::unwrap_used)]
         self.glow_register_native_texture.as_mut().unwrap()(native)
     }
 
diff --git a/crates/eframe/src/lib.rs b/crates/eframe/src/lib.rs
index d803a5249..151fb79ce 100644
--- a/crates/eframe/src/lib.rs
+++ b/crates/eframe/src/lib.rs
@@ -35,7 +35,7 @@
 //!
 //! impl MyEguiApp {
 //!     fn new(cc: &eframe::CreationContext<'_>) -> Self {
-//!         // Customize egui here with cc.egui_ctx.set_fonts and cc.egui_ctx.set_visuals.
+//!         // Customize egui here with cc.egui_ctx.set_fonts and cc.egui_ctx.set_global_style.
 //!         // Restore app state using cc.storage (requires the "persistence" feature).
 //!         // Use the cc.gl (a glow::Context) to create graphics shaders and buffers that you can use
 //!         // for e.g. egui::PaintCallback.
@@ -44,8 +44,8 @@
 //! }
 //!
 //! impl eframe::App for MyEguiApp {
-//!    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
-//!        egui::CentralPanel::default().show(ctx, |ui| {
+//!    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
+//!        egui::CentralPanel::default().show_inside(ui, |ui| {
 //!            ui.heading("Hello World!");
 //!        });
 //!    }
@@ -142,7 +142,6 @@
 //!
 
 #![warn(missing_docs)] // let's keep eframe well-documented
-#![allow(clippy::needless_doctest_main)]
 
 // Limitation imposed by `accesskit_winit`:
 // https://github.com/AccessKit/accesskit/tree/accesskit-v0.18.0/platforms/winit#android-activity-compatibility`
@@ -232,7 +231,7 @@ pub mod icon_data;
 ///
 /// impl MyEguiApp {
 ///     fn new(cc: &eframe::CreationContext<'_>) -> Self {
-///         // Customize egui here with cc.egui_ctx.set_fonts and cc.egui_ctx.set_visuals.
+///         // Customize egui here with cc.egui_ctx.set_fonts and cc.egui_ctx.set_global_style.
 ///         // Restore app state using cc.storage (requires the "persistence" feature).
 ///         // Use the cc.gl (a glow::Context) to create graphics shaders and buffers that you can use
 ///         // for e.g. egui::PaintCallback.
@@ -241,8 +240,8 @@ pub mod icon_data;
 /// }
 ///
 /// impl eframe::App for MyEguiApp {
-///    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
-///        egui::CentralPanel::default().show(ctx, |ui| {
+///    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
+///        egui::CentralPanel::default().show_inside(ui, |ui| {
 ///            ui.heading("Hello World!");
 ///        });
 ///    }
@@ -253,7 +252,7 @@ pub mod icon_data;
 /// This function can fail if we fail to set up a graphics context.
 #[cfg(not(target_arch = "wasm32"))]
 #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
-#[allow(clippy::needless_pass_by_value, clippy::allow_attributes)]
+#[allow(clippy::allow_attributes, clippy::needless_pass_by_value)]
 pub fn run_native(
     app_name: &str,
     mut native_options: NativeOptions,
@@ -312,8 +311,8 @@ pub fn run_native(
 /// }
 ///
 /// impl eframe::App for MyEguiApp {
-///    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
-///        egui::CentralPanel::default().show(ctx, |ui| {
+///    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
+///        egui::CentralPanel::default().show_inside(ui, |ui| {
 ///            ui.heading("Hello World!");
 ///        });
 ///    }
@@ -399,8 +398,9 @@ fn init_native(app_name: &str, native_options: &mut NativeOptions) -> Renderer {
 ///     let mut age = 42;
 ///
 ///     let options = eframe::NativeOptions::default();
-///     eframe::run_simple_native("My egui App", options, move |ctx, _frame| {
-///         egui::CentralPanel::default().show(ctx, |ui| {
+///     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| {
 ///             ui.heading("My egui Application");
 ///             ui.horizontal(|ui| {
 ///                 let name_label = ui.label("Your name: ");
@@ -421,6 +421,65 @@ fn init_native(app_name: &str, native_options: &mut NativeOptions) -> Renderer {
 /// This function can fail if we fail to set up a graphics context.
 #[cfg(not(target_arch = "wasm32"))]
 #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
+pub fn run_ui_native(
+    app_name: &str,
+    native_options: NativeOptions,
+    ui_fun: impl FnMut(&mut egui::Ui, &mut Frame) + 'static,
+) -> Result {
+    struct SimpleApp<U> {
+        ui_fun: U,
+    }
+
+    impl<U: FnMut(&mut egui::Ui, &mut Frame) + 'static> App for SimpleApp<U> {
+        fn ui(&mut self, ui: &mut egui::Ui, frame: &mut Frame) {
+            (self.ui_fun)(ui, frame);
+        }
+    }
+
+    run_native(
+        app_name,
+        native_options,
+        Box::new(|_cc| Ok(Box::new(SimpleApp { ui_fun }))),
+    )
+}
+
+/// The simplest way to get started when writing a native app.
+///
+/// This does NOT support persistence of custom user data. For that you need to use [`run_native`].
+/// However, it DOES support persistence of egui data (window positions and sizes, how far the user has scrolled in a
+/// [`ScrollArea`](egui::ScrollArea), etc.) if the persistence feature is enabled.
+///
+/// # Example
+/// ``` no_run
+/// fn main() -> eframe::Result {
+///     // Our application state:
+///     let mut name = "Arthur".to_owned();
+///     let mut age = 42;
+///
+///     let options = eframe::NativeOptions::default();
+///     eframe::run_simple_native("My egui App", options, move |ctx, _frame| {
+///         egui::CentralPanel::default().show(ctx, |ui| {
+///             ui.heading("My egui Application");
+///             ui.horizontal(|ui| {
+///                 let name_label = ui.label("Your name: ");
+///                 ui.text_edit_singleline(&mut name)
+///                     .labelled_by(name_label.id);
+///             });
+///             ui.add(egui::Slider::new(&mut age, 0..=120).text("age"));
+///             if ui.button("Increment").clicked() {
+///                 age += 1;
+///             }
+///             ui.label(format!("Hello '{name}', age {age}"));
+///         });
+///     })
+/// }
+/// ```
+///
+/// # Errors
+/// This function can fail if we fail to set up a graphics context.
+#[deprecated = "Use run_ui_native instead"]
+#[cfg(not(target_arch = "wasm32"))]
+#[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
 pub fn run_simple_native(
     app_name: &str,
     native_options: NativeOptions,
@@ -431,6 +490,8 @@ pub fn run_simple_native(
     }
 
     impl<U: FnMut(&egui::Context, &mut Frame) + 'static> App for SimpleApp<U> {
+        fn ui(&mut self, _ui: &mut egui::Ui, _frame: &mut Frame) {}
+
         fn update(&mut self, ctx: &egui::Context, frame: &mut Frame) {
             (self.update_fun)(ctx, frame);
         }
diff --git a/crates/eframe/src/native/app_icon.rs b/crates/eframe/src/native/app_icon.rs
index 233bf4c9d..3ac61d8e6 100644
--- a/crates/eframe/src/native/app_icon.rs
+++ b/crates/eframe/src/native/app_icon.rs
@@ -47,7 +47,7 @@ enum AppIconStatus {
     NotSetTryAgain,
 
     /// We successfully set the icon and it should be visible now.
-    #[allow(dead_code, clippy::allow_attributes)] // Not used on Linux
+    #[allow(clippy::allow_attributes, dead_code)] // Not used on Linux
     Set,
 }
 
@@ -71,7 +71,7 @@ fn set_title_and_icon(_title: &str, _icon_data: Option<&IconData>) -> AppIconSta
     #[cfg(target_os = "macos")]
     return set_title_and_icon_mac(_title, _icon_data);
 
-    #[allow(unreachable_code, clippy::allow_attributes)]
+    #[allow(clippy::allow_attributes, unreachable_code)]
     AppIconStatus::NotSetIgnored
 }
 
diff --git a/crates/eframe/src/native/epi_integration.rs b/crates/eframe/src/native/epi_integration.rs
index 447b3ea9d..96a52db88 100644
--- a/crates/eframe/src/native/epi_integration.rs
+++ b/crates/eframe/src/native/epi_integration.rs
@@ -272,14 +272,27 @@ impl EpiIntegration {
 
         app.raw_input_hook(&self.egui_ctx, &mut raw_input);
 
-        let full_output = self.egui_ctx.run(raw_input, |egui_ctx| {
+        let full_output = self.egui_ctx.run_ui(raw_input, |ui| {
             if let Some(viewport_ui_cb) = viewport_ui_cb {
                 // Child viewport
                 profiling::scope!("viewport_callback");
-                viewport_ui_cb(egui_ctx);
+                viewport_ui_cb(ui);
             } else {
-                profiling::scope!("App::update");
-                app.update(egui_ctx, &mut self.frame);
+                {
+                    profiling::scope!("App::logic");
+                    app.logic(ui.ctx(), &mut self.frame);
+                }
+
+                {
+                    profiling::scope!("App::update");
+                    #[expect(deprecated)]
+                    app.update(ui.ctx(), &mut self.frame);
+                }
+
+                {
+                    profiling::scope!("App::ui");
+                    app.ui(ui, &mut self.frame);
+                }
             }
         });
 
@@ -363,6 +376,7 @@ impl EpiIntegration {
 
 fn load_default_egui_icon() -> egui::IconData {
     profiling::function_scope!();
+    #[expect(clippy::unwrap_used)]
     crate::icon_data::from_png_bytes(&include_bytes!("../../data/icon.png")[..]).unwrap()
 }
 
diff --git a/crates/eframe/src/native/glow_integration.rs b/crates/eframe/src/native/glow_integration.rs
index c5358527a..1cd49449f 100644
--- a/crates/eframe/src/native/glow_integration.rs
+++ b/crates/eframe/src/native/glow_integration.rs
@@ -5,7 +5,8 @@
 //! There is a bunch of improvements we could do,
 //! like removing a bunch of `unwraps`.
 
-#![allow(clippy::undocumented_unsafe_blocks)]
+#![expect(clippy::undocumented_unsafe_blocks)]
+#![expect(clippy::unwrap_used)]
 
 use std::{cell::RefCell, num::NonZeroU32, rc::Rc, sync::Arc, time::Instant};
 
@@ -216,7 +217,7 @@ impl<'app> GlowWinitApp<'app> {
             storage.as_deref(),
             &mut self.native_options,
         )?;
-        let gl = painter.gl().clone();
+        let gl = Arc::clone(painter.gl());
 
         let max_texture_side = painter.max_texture_side();
         glutin.max_texture_side = Some(max_texture_side);
@@ -234,9 +235,9 @@ impl<'app> GlowWinitApp<'app> {
             &self.app_name,
             &self.native_options,
             storage,
-            Some(gl.clone()),
+            Some(Arc::clone(&gl)),
             Some(Box::new({
-                let painter = painter.clone();
+                let painter = Rc::clone(&painter);
                 move |native| painter.borrow_mut().register_native_texture(native)
             })),
             #[cfg(feature = "wgpu_no_default_features")]
@@ -244,7 +245,7 @@ impl<'app> GlowWinitApp<'app> {
         );
 
         {
-            let event_loop_proxy = self.repaint_proxy.clone();
+            let event_loop_proxy = Arc::clone(&self.repaint_proxy);
             integration
                 .egui_ctx
                 .set_request_repaint_callback(move |info| {
@@ -571,7 +572,7 @@ impl GlowWinitRunning<'_> {
             .options_mut(|opt| opt.begin_pass(&raw_input));
         let clear_color = self
             .app
-            .clear_color(&self.integration.egui_ctx.style().visuals);
+            .clear_color(&self.integration.egui_ctx.global_style().visuals);
 
         let has_many_viewports = self.glutin.borrow().viewports.len() > 1;
         let clear_before_update = !has_many_viewports; // HACK: for some reason, an early clear doesn't "take" on Mac with multiple viewports.
@@ -719,11 +720,11 @@ impl GlowWinitRunning<'_> {
             // vsync - don't count as frame-time:
             frame_timer.pause();
             profiling::scope!("swap_buffers");
-            let context = current_gl_context
-                .as_ref()
-                .ok_or(egui_glow::PainterError::from(
+            let context = current_gl_context.as_ref().ok_or_else(|| {
+                egui_glow::PainterError::from(
                     "failed to get current context to swap buffers".to_owned(),
-                ))?;
+                )
+            })?;
 
             gl_surface.swap_buffers(context)?;
             frame_timer.resume();
@@ -1362,7 +1363,7 @@ fn initialize_or_update_viewport(
     ids: ViewportIdPair,
     class: ViewportClass,
     mut builder: ViewportBuilder,
-    viewport_ui_cb: Option<Arc<dyn Fn(&egui::Context) + Send + Sync>>,
+    viewport_ui_cb: Option<Arc<dyn Fn(&mut egui::Ui) + Send + Sync>>,
 ) -> &mut Viewport {
     profiling::function_scope!();
 
@@ -1494,8 +1495,8 @@ fn render_immediate_viewport(
         shapes,
         pixels_per_point,
         viewport_output,
-    } = egui_ctx.run(input, |ctx| {
-        viewport_ui_cb(ctx);
+    } = egui_ctx.run_ui(input, |ui| {
+        viewport_ui_cb(ui);
     });
 
     // ---------------------------------------------------
diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs
index 7a3a8b4c4..0597d318c 100644
--- a/crates/eframe/src/native/run.rs
+++ b/crates/eframe/src/native/run.rs
@@ -349,8 +349,6 @@ pub fn run_glow(
     mut native_options: epi::NativeOptions,
     app_creator: epi::AppCreator<'_>,
 ) -> Result {
-    #![allow(clippy::needless_return_with_question_mark)] // False positive
-
     use super::glow_integration::GlowWinitApp;
 
     #[cfg(not(target_os = "ios"))]
@@ -387,8 +385,6 @@ pub fn run_wgpu(
     mut native_options: epi::NativeOptions,
     app_creator: epi::AppCreator<'_>,
 ) -> Result {
-    #![allow(clippy::needless_return_with_question_mark)] // False positive
-
     use super::wgpu_integration::WgpuWinitApp;
 
     #[cfg(not(target_os = "ios"))]
diff --git a/crates/eframe/src/native/wgpu_integration.rs b/crates/eframe/src/native/wgpu_integration.rs
index c6c715c8c..cb634200a 100644
--- a/crates/eframe/src/native/wgpu_integration.rs
+++ b/crates/eframe/src/native/wgpu_integration.rs
@@ -219,7 +219,7 @@ impl<'app> WgpuWinitApp<'app> {
 
         {
             profiling::scope!("set_window");
-            pollster::block_on(painter.set_window(ViewportId::ROOT, Some(window.clone())))?;
+            pollster::block_on(painter.set_window(ViewportId::ROOT, Some(Arc::clone(&window))))?;
         }
 
         let wgpu_render_state = painter.render_state();
@@ -238,7 +238,7 @@ impl<'app> WgpuWinitApp<'app> {
         );
 
         {
-            let event_loop_proxy = self.repaint_proxy.clone();
+            let event_loop_proxy = Arc::clone(&self.repaint_proxy);
 
             egui_ctx.set_request_repaint_callback(move |info| {
                 log::trace!("request_repaint_callback: {info:?}");
@@ -256,7 +256,7 @@ impl<'app> WgpuWinitApp<'app> {
             });
         }
 
-        #[allow(unused_mut, clippy::allow_attributes)] // used for accesskit
+        #[allow(clippy::allow_attributes, unused_mut)] // used for accesskit
         let mut egui_winit = egui_winit::State::new(
             egui_ctx.clone(),
             ViewportId::ROOT,
@@ -610,7 +610,7 @@ impl WgpuWinitRunning<'_> {
 
             {
                 profiling::scope!("set_window");
-                pollster::block_on(painter.set_window(viewport_id, Some(window.clone())))?;
+                pollster::block_on(painter.set_window(viewport_id, Some(Arc::clone(window))))?;
             }
 
             let Some(egui_winit) = egui_winit.as_mut() else {
@@ -690,7 +690,7 @@ impl WgpuWinitRunning<'_> {
         let vsync_secs = painter.paint_and_update_textures(
             viewport_id,
             pixels_per_point,
-            app.clear_color(&egui_ctx.style().visuals),
+            app.clear_color(&egui_ctx.global_style().visuals),
             &clipped_primitives,
             &textures_delta,
             screenshot_commands,
@@ -919,7 +919,7 @@ impl Viewport {
                 let window = Arc::new(window);
 
                 if let Err(err) =
-                    pollster::block_on(painter.set_window(viewport_id, Some(window.clone())))
+                    pollster::block_on(painter.set_window(viewport_id, Some(Arc::clone(&window))))
                 {
                     log::error!("on set_window: viewport_id {viewport_id:?} {err}");
                 }
@@ -1027,8 +1027,8 @@ fn render_immediate_viewport(
         shapes,
         pixels_per_point,
         viewport_output,
-    } = egui_ctx.run(input, |ctx| {
-        viewport_ui_cb(ctx);
+    } = egui_ctx.run_ui(input, |ui| {
+        viewport_ui_cb(ui);
     });
 
     // ------------------------------------------
@@ -1051,7 +1051,8 @@ fn render_immediate_viewport(
 
     {
         profiling::scope!("set_window");
-        if let Err(err) = pollster::block_on(painter.set_window(ids.this, Some(window.clone()))) {
+        if let Err(err) = pollster::block_on(painter.set_window(ids.this, Some(Arc::clone(window))))
+        {
             log::error!(
                 "when rendering viewport_id={:?}, set_window Error {err}",
                 ids.this
@@ -1155,7 +1156,7 @@ fn initialize_or_update_viewport<'a>(
     ids: ViewportIdPair,
     class: ViewportClass,
     mut builder: ViewportBuilder,
-    viewport_ui_cb: Option<Arc<dyn Fn(&egui::Context) + Send + Sync>>,
+    viewport_ui_cb: Option<Arc<dyn Fn(&mut egui::Ui) + Send + Sync>>,
     painter: &mut egui_wgpu::winit::Painter,
 ) -> &'a mut Viewport {
     use std::collections::btree_map::Entry;
diff --git a/crates/eframe/src/native/winit_integration.rs b/crates/eframe/src/native/winit_integration.rs
index 2cf2e9019..012c22f8e 100644
--- a/crates/eframe/src/native/winit_integration.rs
+++ b/crates/eframe/src/native/winit_integration.rs
@@ -27,7 +27,10 @@ pub fn create_egui_context(storage: Option<&dyn crate::Storage>) -> egui::Contex
 
     egui_ctx.options_mut(|o| {
         // eframe supports multi-pass (Context::request_discard).
-        o.max_passes = 2.try_into().unwrap();
+        #[expect(clippy::unwrap_used)]
+        {
+            o.max_passes = 2.try_into().unwrap();
+        }
     });
 
     let memory = crate::native::epi_integration::load_egui_memory(storage).unwrap_or_default();
diff --git a/crates/eframe/src/stopwatch.rs b/crates/eframe/src/stopwatch.rs
index e6eabcbdd..b5f956c82 100644
--- a/crates/eframe/src/stopwatch.rs
+++ b/crates/eframe/src/stopwatch.rs
@@ -1,4 +1,4 @@
-#![allow(dead_code)] // not everything is used on wasm
+#![allow(clippy::allow_attributes, dead_code)] // not used on all platforms
 
 use web_time::Instant;
 
@@ -23,7 +23,7 @@ impl Stopwatch {
     }
 
     pub fn pause(&mut self) {
-        let start = self.start.take().unwrap();
+        let start = self.start.take().expect("Stopwatch is not running");
         let duration = start.elapsed();
         self.total_time_ns += duration.as_nanos();
     }
diff --git a/crates/eframe/src/web/app_runner.rs b/crates/eframe/src/web/app_runner.rs
index 8a10a90ef..11654135d 100644
--- a/crates/eframe/src/web/app_runner.rs
+++ b/crates/eframe/src/web/app_runner.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use egui::{TexturesDelta, UserData, ViewportCommand};
 
 use crate::{App, epi, web::web_painter::WebPainter};
@@ -5,14 +7,14 @@ use crate::{App, epi, web::web_painter::WebPainter};
 use super::{NeedRepaint, now_sec, text_agent::TextAgent};
 
 pub struct AppRunner {
-    #[allow(dead_code, clippy::allow_attributes)]
+    #[allow(clippy::allow_attributes, dead_code)]
     pub(crate) web_options: crate::WebOptions,
     pub(crate) frame: epi::Frame,
     egui_ctx: egui::Context,
     painter: Box<dyn WebPainter>,
     pub(crate) input: super::WebInput,
     app: Box<dyn epi::App>,
-    pub(crate) needs_repaint: std::sync::Arc<NeedRepaint>,
+    pub(crate) needs_repaint: Arc<NeedRepaint>,
     last_save_time: f64,
     pub(crate) text_agent: TextAgent,
 
@@ -63,7 +65,7 @@ impl AppRunner {
                     canvas,
                     &web_options,
                 )?;
-                gl = Some(painter.gl().clone());
+                gl = Some(Arc::clone(painter.gl()));
                 Box::new(painter) as Box<dyn WebPainter>
             }
 
@@ -138,10 +140,9 @@ impl AppRunner {
             wgpu_render_state,
         };
 
-        let needs_repaint: std::sync::Arc<NeedRepaint> =
-            std::sync::Arc::new(NeedRepaint::new(web_options.max_fps));
+        let needs_repaint: Arc<NeedRepaint> = Arc::new(NeedRepaint::new(web_options.max_fps));
         {
-            let needs_repaint = needs_repaint.clone();
+            let needs_repaint = Arc::clone(&needs_repaint);
             egui_ctx.set_request_repaint_callback(move |info| {
                 needs_repaint.repaint_after(info.delay.as_secs_f64());
             });
@@ -273,8 +274,13 @@ impl AppRunner {
 
         self.app.raw_input_hook(&self.egui_ctx, &mut raw_input);
 
-        let full_output = self.egui_ctx.run(raw_input, |egui_ctx| {
-            self.app.update(egui_ctx, &mut self.frame);
+        let full_output = self.egui_ctx.run_ui(raw_input, |ui| {
+            self.app.logic(ui.ctx(), &mut self.frame);
+
+            #[expect(deprecated)]
+            self.app.update(ui.ctx(), &mut self.frame);
+
+            self.app.ui(ui, &mut self.frame);
         });
         let egui::FullOutput {
             platform_output,
@@ -331,7 +337,7 @@ impl AppRunner {
             }
 
             if let Err(err) = self.painter.paint_and_update_textures(
-                self.app.clear_color(&self.egui_ctx.style().visuals),
+                self.app.clear_color(&self.egui_ctx.global_style().visuals),
                 &clipped_primitives,
                 self.egui_ctx.pixels_per_point(),
                 &textures_delta,
diff --git a/crates/eframe/src/web/events.rs b/crates/eframe/src/web/events.rs
index c61a80012..d77444563 100644
--- a/crates/eframe/src/web/events.rs
+++ b/crates/eframe/src/web/events.rs
@@ -137,25 +137,24 @@ fn install_keydown(runner_ref: &WebRunner, target: &EventTarget) -> Result<(), J
                 && !modifiers.command
                 // When text agent is focused, it is responsible for handling input events
                 && !runner.text_agent.has_focus()
+                && let Some(text) = text_from_keyboard_event(&event)
             {
-                if let Some(text) = text_from_keyboard_event(&event) {
-                    let egui_event = egui::Event::Text(text);
-                    let should_stop_propagation =
-                        (runner.web_options.should_stop_propagation)(&egui_event);
-                    let should_prevent_default =
-                        (runner.web_options.should_prevent_default)(&egui_event);
-                    runner.input.raw.events.push(egui_event);
-                    runner.needs_repaint.repaint_asap();
+                let egui_event = egui::Event::Text(text);
+                let should_stop_propagation =
+                    (runner.web_options.should_stop_propagation)(&egui_event);
+                let should_prevent_default =
+                    (runner.web_options.should_prevent_default)(&egui_event);
+                runner.input.raw.events.push(egui_event);
+                runner.needs_repaint.repaint_asap();
 
-                    // If this is indeed text, then prevent any other action.
-                    if should_prevent_default {
-                        event.prevent_default();
-                    }
+                // If this is indeed text, then prevent any other action.
+                if should_prevent_default {
+                    event.prevent_default();
+                }
 
-                    // Use web options to tell if the event should be propagated to parent elements.
-                    if should_stop_propagation {
-                        event.stop_propagation();
-                    }
+                // Use web options to tell if the event should be propagated to parent elements.
+                if should_stop_propagation {
+                    event.stop_propagation();
                 }
             }
 
@@ -196,11 +195,13 @@ pub(crate) fn on_keydown(event: web_sys::KeyboardEvent, runner: &mut AppRunner)
 
         let prevent_default = should_prevent_default_for_key(runner, &modifiers, egui_key);
 
-        // log::debug!(
-        //     "On keydown {:?} {egui_key:?}, has_focus: {has_focus}, egui_wants_keyboard: {}, prevent_default: {prevent_default}",
-        //     event.key().as_str(),
-        //     runner.egui_ctx().wants_keyboard_input()
-        // );
+        if false {
+            log::debug!(
+                "On keydown {:?} {egui_key:?}, has_focus: {has_focus}, egui_wants_keyboard: {}, prevent_default: {prevent_default}",
+                event.key().as_str(),
+                runner.egui_ctx().egui_wants_keyboard_input()
+            );
+        }
 
         if prevent_default {
             event.prevent_default();
@@ -319,30 +320,28 @@ fn install_copy_cut_paste(runner_ref: &WebRunner, target: &EventTarget) -> Resul
             return; // The eframe app is not interested
         }
 
-        if let Some(data) = event.clipboard_data() {
-            if let Ok(text) = data.get_data("text") {
-                let text = text.replace("\r\n", "\n");
+        if let Some(data) = event.clipboard_data()
+            && let Ok(text) = data.get_data("text")
+        {
+            let text = text.replace("\r\n", "\n");
 
-                let mut should_stop_propagation = true;
-                let mut should_prevent_default = true;
-                if !text.is_empty() {
-                    let egui_event = egui::Event::Paste(text);
-                    should_stop_propagation =
-                        (runner.web_options.should_stop_propagation)(&egui_event);
-                    should_prevent_default =
-                        (runner.web_options.should_prevent_default)(&egui_event);
-                    runner.input.raw.events.push(egui_event);
-                    runner.needs_repaint.repaint_asap();
-                }
+            let mut should_stop_propagation = true;
+            let mut should_prevent_default = true;
+            if !text.is_empty() {
+                let egui_event = egui::Event::Paste(text);
+                should_stop_propagation = (runner.web_options.should_stop_propagation)(&egui_event);
+                should_prevent_default = (runner.web_options.should_prevent_default)(&egui_event);
+                runner.input.raw.events.push(egui_event);
+                runner.needs_repaint.repaint_asap();
+            }
 
-                // Use web options to tell if the web event should be propagated to parent elements based on the egui event.
-                if should_stop_propagation {
-                    event.stop_propagation();
-                }
+            // Use web options to tell if the web event should be propagated to parent elements based on the egui event.
+            if should_stop_propagation {
+                event.stop_propagation();
+            }
 
-                if should_prevent_default {
-                    event.prevent_default();
-                }
+            if should_prevent_default {
+                event.prevent_default();
             }
         }
     })?;
@@ -560,45 +559,44 @@ fn install_pointerup(runner_ref: &WebRunner, target: &EventTarget) -> Result<(),
             if is_interested_in_pointer_event(
                 runner,
                 egui::pos2(event.client_x() as f32, event.client_y() as f32),
-            ) {
-                if let Some(button) = button_from_mouse_event(&event) {
-                    let modifiers = runner.input.raw.modifiers;
-                    let egui_event = egui::Event::PointerButton {
-                        pos,
-                        button,
-                        pressed: false,
-                        modifiers,
-                    };
-                    let should_stop_propagation =
-                        (runner.web_options.should_stop_propagation)(&egui_event);
-                    let should_prevent_default =
-                        (runner.web_options.should_prevent_default)(&egui_event);
-                    runner.input.raw.events.push(egui_event);
+            ) && let Some(button) = button_from_mouse_event(&event)
+            {
+                let modifiers = runner.input.raw.modifiers;
+                let egui_event = egui::Event::PointerButton {
+                    pos,
+                    button,
+                    pressed: false,
+                    modifiers,
+                };
+                let should_stop_propagation =
+                    (runner.web_options.should_stop_propagation)(&egui_event);
+                let should_prevent_default =
+                    (runner.web_options.should_prevent_default)(&egui_event);
+                runner.input.raw.events.push(egui_event);
 
-                    // Previously on iOS, the canvas would not receive focus on
-                    // any touch event, which resulted in the on-screen keyboard
-                    // not working when focusing on a text field in an egui app.
-                    // This attempts to fix that by forcing the focus on any
-                    // click on the canvas.
-                    runner.canvas().focus().ok();
+                // Previously on iOS, the canvas would not receive focus on
+                // any touch event, which resulted in the on-screen keyboard
+                // not working when focusing on a text field in an egui app.
+                // This attempts to fix that by forcing the focus on any
+                // click on the canvas.
+                runner.canvas().focus().ok();
 
-                    // In Safari we are only allowed to do certain things
-                    // (like playing audio, start a download, etc)
-                    // on user action, such as a click.
-                    // So we need to run the app logic here and now:
-                    runner.logic();
+                // In Safari we are only allowed to do certain things
+                // (like playing audio, start a download, etc)
+                // on user action, such as a click.
+                // So we need to run the app logic here and now:
+                runner.logic();
 
-                    // Make sure we paint the output of the above logic call asap:
-                    runner.needs_repaint.repaint_asap();
+                // Make sure we paint the output of the above logic call asap:
+                runner.needs_repaint.repaint_asap();
 
-                    if should_prevent_default {
-                        event.prevent_default();
-                    }
+                if should_prevent_default {
+                    event.prevent_default();
+                }
 
-                    // Use web options to tell if the web event should be propagated to parent elements based on the egui event.
-                    if should_stop_propagation {
-                        event.stop_propagation();
-                    }
+                // Use web options to tell if the web event should be propagated to parent elements based on the egui event.
+                if should_stop_propagation {
+                    event.stop_propagation();
                 }
             }
         },
@@ -711,29 +709,27 @@ fn install_touchstart(runner_ref: &WebRunner, target: &EventTarget) -> Result<()
 
 fn install_touchmove(runner_ref: &WebRunner, target: &EventTarget) -> Result<(), JsValue> {
     runner_ref.add_event_listener(target, "touchmove", |event: web_sys::TouchEvent, runner| {
-        if let Some((pos, touch)) = primary_touch_pos(runner, &event) {
-            if is_interested_in_pointer_event(
+        if let Some((pos, touch)) = primary_touch_pos(runner, &event)
+            && is_interested_in_pointer_event(
                 runner,
                 egui::pos2(touch.client_x() as f32, touch.client_y() as f32),
-            ) {
-                let egui_event = egui::Event::PointerMoved(pos);
-                let should_stop_propagation =
-                    (runner.web_options.should_stop_propagation)(&egui_event);
-                let should_prevent_default =
-                    (runner.web_options.should_prevent_default)(&egui_event);
-                runner.input.raw.events.push(egui_event);
+            )
+        {
+            let egui_event = egui::Event::PointerMoved(pos);
+            let should_stop_propagation = (runner.web_options.should_stop_propagation)(&egui_event);
+            let should_prevent_default = (runner.web_options.should_prevent_default)(&egui_event);
+            runner.input.raw.events.push(egui_event);
 
-                push_touches(runner, egui::TouchPhase::Move, &event);
-                runner.needs_repaint.repaint();
+            push_touches(runner, egui::TouchPhase::Move, &event);
+            runner.needs_repaint.repaint();
 
-                // Use web options to tell if the web event should be propagated to parent elements based on the egui event.
-                if should_stop_propagation {
-                    event.stop_propagation();
-                }
+            // Use web options to tell if the web event should be propagated to parent elements based on the egui event.
+            if should_stop_propagation {
+                event.stop_propagation();
+            }
 
-                if should_prevent_default {
-                    event.prevent_default();
-                }
+            if should_prevent_default {
+                event.prevent_default();
             }
         }
     })
@@ -741,50 +737,49 @@ fn install_touchmove(runner_ref: &WebRunner, target: &EventTarget) -> Result<(),
 
 fn install_touchend(runner_ref: &WebRunner, target: &EventTarget) -> Result<(), JsValue> {
     runner_ref.add_event_listener(target, "touchend", |event: web_sys::TouchEvent, runner| {
-        if let Some((pos, touch)) = primary_touch_pos(runner, &event) {
-            if is_interested_in_pointer_event(
+        if let Some((pos, touch)) = primary_touch_pos(runner, &event)
+            && is_interested_in_pointer_event(
                 runner,
                 egui::pos2(touch.client_x() as f32, touch.client_y() as f32),
-            ) {
-                // First release mouse to click:
-                let mut should_stop_propagation = true;
-                let mut should_prevent_default = true;
-                let egui_event = egui::Event::PointerButton {
-                    pos,
-                    button: egui::PointerButton::Primary,
-                    pressed: false,
-                    modifiers: runner.input.raw.modifiers,
-                };
-                should_stop_propagation &=
-                    (runner.web_options.should_stop_propagation)(&egui_event);
-                should_prevent_default &= (runner.web_options.should_prevent_default)(&egui_event);
-                runner.input.raw.events.push(egui_event);
-                // Then remove hover effect:
-                should_stop_propagation &=
-                    (runner.web_options.should_stop_propagation)(&egui::Event::PointerGone);
-                should_prevent_default &=
-                    (runner.web_options.should_prevent_default)(&egui::Event::PointerGone);
-                runner.input.raw.events.push(egui::Event::PointerGone);
+            )
+        {
+            // First release mouse to click:
+            let mut should_stop_propagation = true;
+            let mut should_prevent_default = true;
+            let egui_event = egui::Event::PointerButton {
+                pos,
+                button: egui::PointerButton::Primary,
+                pressed: false,
+                modifiers: runner.input.raw.modifiers,
+            };
+            should_stop_propagation &= (runner.web_options.should_stop_propagation)(&egui_event);
+            should_prevent_default &= (runner.web_options.should_prevent_default)(&egui_event);
+            runner.input.raw.events.push(egui_event);
+            // Then remove hover effect:
+            should_stop_propagation &=
+                (runner.web_options.should_stop_propagation)(&egui::Event::PointerGone);
+            should_prevent_default &=
+                (runner.web_options.should_prevent_default)(&egui::Event::PointerGone);
+            runner.input.raw.events.push(egui::Event::PointerGone);
 
-                push_touches(runner, egui::TouchPhase::End, &event);
+            push_touches(runner, egui::TouchPhase::End, &event);
 
-                runner.needs_repaint.repaint_asap();
+            runner.needs_repaint.repaint_asap();
 
-                // Use web options to tell if the web event should be propagated to parent elements based on the egui event.
-                if should_stop_propagation {
-                    event.stop_propagation();
-                }
+            // Use web options to tell if the web event should be propagated to parent elements based on the egui event.
+            if should_stop_propagation {
+                event.stop_propagation();
+            }
 
-                if should_prevent_default {
-                    event.prevent_default();
-                }
+            if should_prevent_default {
+                event.prevent_default();
+            }
 
-                // Fix virtual keyboard IOS
-                // Need call focus at the same time of event
-                if runner.text_agent.has_focus() {
-                    runner.text_agent.set_focus(false);
-                    runner.text_agent.set_focus(true);
-                }
+            // Fix virtual keyboard IOS
+            // Need call focus at the same time of event
+            if runner.text_agent.has_focus() {
+                runner.text_agent.set_focus(false);
+                runner.text_agent.set_focus(true);
             }
         }
     })
diff --git a/crates/eframe/src/web/mod.rs b/crates/eframe/src/web/mod.rs
index ac4c637db..1e54d7a84 100644
--- a/crates/eframe/src/web/mod.rs
+++ b/crates/eframe/src/web/mod.rs
@@ -1,6 +1,7 @@
 //! [`egui`] bindings for web apps (compiling to WASM).
 
-#![allow(clippy::missing_errors_doc)] // So many `-> Result<_, JsValue>`
+#![expect(clippy::missing_errors_doc)] // So many `-> Result<_, JsValue>`
+#![expect(clippy::unwrap_used)] // TODO(emilk): remove unwraps
 
 mod app_runner;
 mod backend;
@@ -145,18 +146,18 @@ fn canvas_content_rect(canvas: &web_sys::HtmlCanvasElement) -> egui::Rect {
     );
 
     // We need to subtract padding and border:
-    if let Some(window) = web_sys::window() {
-        if let Ok(Some(style)) = window.get_computed_style(canvas) {
-            let get_property = |name: &str| -> Option<f32> {
-                let property = style.get_property_value(name).ok()?;
-                property.trim_end_matches("px").parse::<f32>().ok()
-            };
+    if let Some(window) = web_sys::window()
+        && let Ok(Some(style)) = window.get_computed_style(canvas)
+    {
+        let get_property = |name: &str| -> Option<f32> {
+            let property = style.get_property_value(name).ok()?;
+            property.trim_end_matches("px").parse::<f32>().ok()
+        };
 
-            rect.min.x += get_property("padding-left").unwrap_or_default();
-            rect.min.y += get_property("padding-top").unwrap_or_default();
-            rect.max.x -= get_property("padding-right").unwrap_or_default();
-            rect.max.y -= get_property("padding-bottom").unwrap_or_default();
-        }
+        rect.min.x += get_property("padding-left").unwrap_or_default();
+        rect.min.y += get_property("padding-top").unwrap_or_default();
+        rect.max.x -= get_property("padding-right").unwrap_or_default();
+        rect.max.y -= get_property("padding-bottom").unwrap_or_default();
     }
 
     rect
@@ -284,8 +285,8 @@ fn create_clipboard_item(mime: &str, bytes: &[u8]) -> Result<web_sys::ClipboardI
 
     let items = js_sys::Object::new();
 
-    // SAFETY: I hope so
     #[expect(unsafe_code, unused_unsafe)] // Weird false positive
+    // SAFETY: I hope so
     unsafe {
         js_sys::Reflect::set(&items, &JsValue::from_str(mime), &blob)?
     };
diff --git a/crates/eframe/src/web/web_logger.rs b/crates/eframe/src/web/web_logger.rs
index 01c347b7e..882f3e5de 100644
--- a/crates/eframe/src/web/web_logger.rs
+++ b/crates/eframe/src/web/web_logger.rs
@@ -38,7 +38,7 @@ impl log::Log for WebLogger {
     }
 
     fn log(&self, record: &log::Record<'_>) {
-        #![allow(clippy::match_same_arms)]
+        #![expect(clippy::match_same_arms)]
 
         if !self.enabled(record.metadata()) {
             return;
@@ -110,7 +110,7 @@ mod console {
 /// * `tokio-1.24.1/src/runtime/runtime.rs`
 /// * `rerun/src/main.rs`
 /// * `core/src/ops/function.rs`
-#[allow(dead_code, clippy::allow_attributes)] // only used on web and in tests
+#[allow(clippy::allow_attributes, dead_code)] // only used on web and in tests
 fn shorten_file_path(file_path: &str) -> &str {
     if let Some(i) = file_path.rfind("/src/") {
         if let Some(prev_slash) = file_path[..i].rfind('/') {
diff --git a/crates/eframe/src/web/web_painter_glow.rs b/crates/eframe/src/web/web_painter_glow.rs
index e2fc4a6f2..470fa40d3 100644
--- a/crates/eframe/src/web/web_painter_glow.rs
+++ b/crates/eframe/src/web/web_painter_glow.rs
@@ -28,7 +28,7 @@ impl WebPainterGlow {
         let (gl, shader_prefix) =
             init_glow_context_from_canvas(&canvas, options.webgl_context_option)?;
 
-        #[allow(clippy::arc_with_non_send_sync, clippy::allow_attributes)] // For wasm
+        #[allow(clippy::allow_attributes, clippy::arc_with_non_send_sync)] // For wasm
         let gl = std::sync::Arc::new(gl);
 
         let painter = egui_glow::Painter::new(gl, shader_prefix, None, options.dithering)
@@ -91,7 +91,7 @@ impl WebPainter for WebPainterGlow {
             for data in data {
                 events.push(Event::Screenshot {
                     viewport_id: ViewportId::default(),
-                    image: image.clone(),
+                    image: Arc::clone(&image),
                     user_data: data,
                 });
             }
@@ -192,17 +192,13 @@ fn is_safari_and_webkit_gtk(gl: &web_sys::WebGlRenderingContext) -> bool {
         .get_extension("WEBGL_debug_renderer_info")
         .unwrap()
         .is_some()
-    {
-        if let Ok(renderer) =
+        && let Ok(renderer) =
             gl.get_parameter(web_sys::WebglDebugRendererInfo::UNMASKED_RENDERER_WEBGL)
-        {
-            if let Some(renderer) = renderer.as_string() {
-                if renderer.contains("Apple") {
-                    return true;
-                }
-            }
-        }
+        && let Some(renderer) = renderer.as_string()
+        && renderer.contains("Apple")
+    {
+        true
+    } else {
+        false
     }
-
-    false
 }
diff --git a/crates/eframe/src/web/web_painter_wgpu.rs b/crates/eframe/src/web/web_painter_wgpu.rs
index efecd12ee..264ce6adc 100644
--- a/crates/eframe/src/web/web_painter_wgpu.rs
+++ b/crates/eframe/src/web/web_painter_wgpu.rs
@@ -105,7 +105,7 @@ impl WebPainterWgpu {
             surface_configuration,
             depth_stencil_format,
             depth_texture_view: None,
-            on_surface_error: options.wgpu_options.on_surface_error.clone(),
+            on_surface_error: Arc::clone(&options.wgpu_options.on_surface_error) as _,
             screen_capture_state: None,
             capture_tx,
             capture_rx,
@@ -243,13 +243,26 @@ impl WebPainter for WebPainterWgpu {
                     depth_stencil_attachment: self.depth_texture_view.as_ref().map(|view| {
                         wgpu::RenderPassDepthStencilAttachment {
                             view,
-                            depth_ops: Some(wgpu::Operations {
-                                load: wgpu::LoadOp::Clear(1.0),
-                                // It is very unlikely that the depth buffer is needed after egui finished rendering
-                                // so no need to store it. (this can improve performance on tiling GPUs like mobile chips or Apple Silicon)
-                                store: wgpu::StoreOp::Discard,
-                            }),
-                            stencil_ops: None,
+                            depth_ops: self
+                                .depth_stencil_format
+                                .is_some_and(|depth_stencil_format| {
+                                    depth_stencil_format.has_depth_aspect()
+                                })
+                                .then_some(wgpu::Operations {
+                                    load: wgpu::LoadOp::Clear(1.0),
+                                    // It is very unlikely that the depth buffer is needed after egui finished rendering
+                                    // so no need to store it. (this can improve performance on tiling GPUs like mobile chips or Apple Silicon)
+                                    store: wgpu::StoreOp::Discard,
+                                }),
+                            stencil_ops: self
+                                .depth_stencil_format
+                                .is_some_and(|depth_stencil_format| {
+                                    depth_stencil_format.has_stencil_aspect()
+                                })
+                                .then_some(wgpu::Operations {
+                                    load: wgpu::LoadOp::Clear(0),
+                                    store: wgpu::StoreOp::Discard,
+                                }),
                         }
                     }),
                     label: Some("egui_render"),
@@ -269,14 +282,12 @@ impl WebPainter for WebPainterWgpu {
 
             let mut capture_buffer = None;
 
-            if capture {
-                if let Some(capture_state) = &mut self.screen_capture_state {
-                    capture_buffer = Some(capture_state.copy_textures(
-                        &render_state.device,
-                        &output_frame,
-                        &mut encoder,
-                    ));
-                }
+            if capture && let Some(capture_state) = &mut self.screen_capture_state {
+                capture_buffer = Some(capture_state.copy_textures(
+                    &render_state.device,
+                    &output_frame,
+                    &mut encoder,
+                ));
             }
 
             Some((output_frame, capture_buffer))
@@ -288,16 +299,16 @@ impl WebPainter for WebPainterWgpu {
             .submit(user_cmd_bufs.into_iter().chain([encoder.finish()]));
 
         if let Some((frame, capture_buffer)) = frame_and_capture_buffer {
-            if let Some(capture_buffer) = capture_buffer {
-                if let Some(capture_state) = &self.screen_capture_state {
-                    capture_state.read_screen_rgba(
-                        self.ctx.clone(),
-                        capture_buffer,
-                        capture_data,
-                        self.capture_tx.clone(),
-                        ViewportId::ROOT,
-                    );
-                }
+            if let Some(capture_buffer) = capture_buffer
+                && let Some(capture_state) = &self.screen_capture_state
+            {
+                capture_state.read_screen_rgba(
+                    self.ctx.clone(),
+                    capture_buffer,
+                    capture_data,
+                    self.capture_tx.clone(),
+                    ViewportId::ROOT,
+                );
             }
 
             frame.present();
@@ -323,7 +334,7 @@ impl WebPainter for WebPainterWgpu {
                 events.push(Event::Screenshot {
                     viewport_id,
                     user_data: data,
-                    image: screenshot.clone(),
+                    image: Arc::clone(&screenshot),
                 });
             }
         }
diff --git a/crates/egui-wgpu/CHANGELOG.md b/crates/egui-wgpu/CHANGELOG.md
index be00dd049..cef640184 100644
--- a/crates/egui-wgpu/CHANGELOG.md
+++ b/crates/egui-wgpu/CHANGELOG.md
@@ -6,6 +6,10 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.33.3 - 2025-12-11
+Nothing new
+
+
 ## 0.33.2 - 2025-11-13
 * Fix jittering during window resize on MacOS for WGPU/Metal [#7641](https://github.com/emilk/egui/pull/7641) by [@aspcartman](https://github.com/aspcartman)
 
diff --git a/crates/egui-wgpu/src/capture.rs b/crates/egui-wgpu/src/capture.rs
index cd42b838c..58407fdd6 100644
--- a/crates/egui-wgpu/src/capture.rs
+++ b/crates/egui-wgpu/src/capture.rs
@@ -126,7 +126,7 @@ impl CaptureState {
         // It would be more efficient to reuse the Buffer, e.g. via some kind of ring buffer, but
         // for most screenshot use cases this should be fine. When taking many screenshots (e.g. for a video)
         // it might make sense to revisit this and implement a more efficient solution.
-        #[allow(clippy::arc_with_non_send_sync, clippy::allow_attributes)] // For wasm
+        #[allow(clippy::allow_attributes, clippy::arc_with_non_send_sync)] // For wasm
         let buffer = device.create_buffer(&wgpu::BufferDescriptor {
             label: Some("egui_screen_capture_buffer"),
             size: (self.padding.padded_bytes_per_row * self.texture.height()) as u64,
@@ -186,9 +186,9 @@ impl CaptureState {
         tx: CaptureSender,
         viewport_id: ViewportId,
     ) {
-        #[allow(clippy::arc_with_non_send_sync, clippy::allow_attributes)] // For wasm
+        #[allow(clippy::allow_attributes, clippy::arc_with_non_send_sync)] // For wasm
         let buffer = Arc::new(buffer);
-        let buffer_clone = buffer.clone();
+        let buffer_clone = Arc::clone(&buffer);
         let buffer_slice = buffer_clone.slice(..);
         let format = self.texture.format();
         let tex_extent = self.texture.size();
diff --git a/crates/egui-wgpu/src/lib.rs b/crates/egui-wgpu/src/lib.rs
index d340526af..880ab8f4a 100644
--- a/crates/egui-wgpu/src/lib.rs
+++ b/crates/egui-wgpu/src/lib.rs
@@ -16,8 +16,6 @@
 #![doc = document_features::document_features!()]
 //!
 
-#![allow(unsafe_code)]
-
 pub use wgpu;
 
 /// Low-level painting of [`egui`](https://github.com/emilk/egui) on [`wgpu`].
@@ -247,7 +245,7 @@ impl RenderState {
 
         // On wasm, depending on feature flags, wgpu objects may or may not implement sync.
         // It doesn't make sense to switch to Rc for that special usecase, so simply disable the lint.
-        #[allow(clippy::arc_with_non_send_sync, clippy::allow_attributes)] // For wasm
+        #[allow(clippy::allow_attributes, clippy::arc_with_non_send_sync)] // For wasm
         Ok(Self {
             adapter,
             #[cfg(not(target_arch = "wasm32"))]
diff --git a/crates/egui-wgpu/src/renderer.rs b/crates/egui-wgpu/src/renderer.rs
index 108aa31c3..d3d21f19c 100644
--- a/crates/egui-wgpu/src/renderer.rs
+++ b/crates/egui-wgpu/src/renderer.rs
@@ -1,4 +1,4 @@
-#![allow(unsafe_code)]
+#![expect(clippy::unwrap_used)] // TODO(emilk): avoid unwraps
 
 use std::{borrow::Cow, num::NonZeroU64, ops::Range};
 
diff --git a/crates/egui-wgpu/src/setup.rs b/crates/egui-wgpu/src/setup.rs
index bd587350e..0c3cb8c39 100644
--- a/crates/egui-wgpu/src/setup.rs
+++ b/crates/egui-wgpu/src/setup.rs
@@ -48,7 +48,7 @@ impl WgpuSetup {
     pub async fn new_instance(&self) -> wgpu::Instance {
         match self {
             Self::CreateNew(create_new) => {
-                #[allow(unused_mut, clippy::allow_attributes)]
+                #[allow(clippy::allow_attributes, unused_mut)]
                 let mut backends = create_new.instance_descriptor.backends;
 
                 // Don't try WebGPU if we're not in a secure context.
@@ -134,7 +134,7 @@ impl Clone for WgpuSetupCreateNew {
             instance_descriptor: self.instance_descriptor.clone(),
             power_preference: self.power_preference,
             native_adapter_selector: self.native_adapter_selector.clone(),
-            device_descriptor: self.device_descriptor.clone(),
+            device_descriptor: Arc::clone(&self.device_descriptor),
         }
     }
 }
diff --git a/crates/egui-wgpu/src/winit.rs b/crates/egui-wgpu/src/winit.rs
index 3a286cc9e..167d10c79 100644
--- a/crates/egui-wgpu/src/winit.rs
+++ b/crates/egui-wgpu/src/winit.rs
@@ -1,5 +1,7 @@
-#![allow(clippy::missing_errors_doc)]
-#![allow(clippy::undocumented_unsafe_blocks)]
+#![expect(clippy::missing_errors_doc)]
+#![expect(clippy::undocumented_unsafe_blocks)]
+#![expect(clippy::unwrap_used)] // TODO(emilk): avoid unwraps
+#![expect(unsafe_code)]
 
 use crate::{RenderState, SurfaceErrorAction, WgpuConfiguration, renderer};
 use crate::{
@@ -526,13 +528,28 @@ impl Painter {
                 depth_stencil_attachment: self.depth_texture_view.get(&viewport_id).map(|view| {
                     wgpu::RenderPassDepthStencilAttachment {
                         view,
-                        depth_ops: Some(wgpu::Operations {
-                            load: wgpu::LoadOp::Clear(1.0),
-                            // It is very unlikely that the depth buffer is needed after egui finished rendering
-                            // so no need to store it. (this can improve performance on tiling GPUs like mobile chips or Apple Silicon)
-                            store: wgpu::StoreOp::Discard,
-                        }),
-                        stencil_ops: None,
+                        depth_ops: self
+                            .options
+                            .depth_stencil_format
+                            .is_some_and(|depth_stencil_format| {
+                                depth_stencil_format.has_depth_aspect()
+                            })
+                            .then_some(wgpu::Operations {
+                                load: wgpu::LoadOp::Clear(1.0),
+                                // It is very unlikely that the depth buffer is needed after egui finished rendering
+                                // so no need to store it. (this can improve performance on tiling GPUs like mobile chips or Apple Silicon)
+                                store: wgpu::StoreOp::Discard,
+                            }),
+                        stencil_ops: self
+                            .options
+                            .depth_stencil_format
+                            .is_some_and(|depth_stencil_format| {
+                                depth_stencil_format.has_stencil_aspect()
+                            })
+                            .then_some(wgpu::Operations {
+                                load: wgpu::LoadOp::Clear(0),
+                                store: wgpu::StoreOp::Discard,
+                            }),
                     }
                 }),
                 timestamp_writes: None,
@@ -614,7 +631,7 @@ impl Painter {
                 events.push(Event::Screenshot {
                     viewport_id,
                     user_data: data,
-                    image: screenshot.clone(),
+                    image: Arc::clone(&screenshot),
                 });
             }
         }
diff --git a/crates/egui-winit/CHANGELOG.md b/crates/egui-winit/CHANGELOG.md
index 8e555a7bc..f88a8c84a 100644
--- a/crates/egui-winit/CHANGELOG.md
+++ b/crates/egui-winit/CHANGELOG.md
@@ -5,6 +5,10 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.33.3 - 2025-12-11
+Nothing new
+
+
 ## 0.33.2 - 2025-11-13
 * Don't enable `arboard` on iOS [#7663](https://github.com/emilk/egui/pull/7663) by [@irh](https://github.com/irh)
 
diff --git a/crates/egui-winit/src/clipboard.rs b/crates/egui-winit/src/clipboard.rs
index fc7334388..75d0469ec 100644
--- a/crates/egui-winit/src/clipboard.rs
+++ b/crates/egui-winit/src/clipboard.rs
@@ -175,7 +175,7 @@ fn init_arboard() -> Option<arboard::Clipboard> {
 fn init_smithay_clipboard(
     raw_display_handle: Option<RawDisplayHandle>,
 ) -> Option<smithay_clipboard::Clipboard> {
-    #![allow(clippy::undocumented_unsafe_blocks)]
+    #![expect(clippy::undocumented_unsafe_blocks)]
 
     profiling::function_scope!();
 
diff --git a/crates/egui-winit/src/lib.rs b/crates/egui-winit/src/lib.rs
index 7660e3cef..7cbaec624 100644
--- a/crates/egui-winit/src/lib.rs
+++ b/crates/egui-winit/src/lib.rs
@@ -7,7 +7,7 @@
 #![cfg_attr(feature = "document-features", doc = document_features::document_features!())]
 //!
 
-#![allow(clippy::manual_range_contains)]
+#![expect(clippy::manual_range_contains)]
 
 #[cfg(feature = "accesskit")]
 pub use accesskit_winit;
@@ -309,21 +309,21 @@ impl State {
                 self.on_mouse_button_input(*state, *button);
                 EventResponse {
                     repaint: true,
-                    consumed: self.egui_ctx.wants_pointer_input(),
+                    consumed: self.egui_ctx.egui_wants_pointer_input(),
                 }
             }
             WindowEvent::MouseWheel { delta, phase, .. } => {
                 self.on_mouse_wheel(window, *delta, *phase);
                 EventResponse {
                     repaint: true,
-                    consumed: self.egui_ctx.wants_pointer_input(),
+                    consumed: self.egui_ctx.egui_wants_pointer_input(),
                 }
             }
             WindowEvent::CursorMoved { position, .. } => {
                 self.on_cursor_moved(window, *position);
                 EventResponse {
                     repaint: true,
-                    consumed: self.egui_ctx.is_using_pointer(),
+                    consumed: self.egui_ctx.egui_is_using_pointer(),
                 }
             }
             WindowEvent::CursorLeft { .. } => {
@@ -340,8 +340,10 @@ impl State {
                 let consumed = match touch.phase {
                     winit::event::TouchPhase::Started
                     | winit::event::TouchPhase::Ended
-                    | winit::event::TouchPhase::Cancelled => self.egui_ctx.wants_pointer_input(),
-                    winit::event::TouchPhase::Moved => self.egui_ctx.is_using_pointer(),
+                    | winit::event::TouchPhase::Cancelled => {
+                        self.egui_ctx.egui_wants_pointer_input()
+                    }
+                    winit::event::TouchPhase::Moved => self.egui_ctx.egui_is_using_pointer(),
                 };
                 EventResponse {
                     repaint: true,
@@ -392,7 +394,7 @@ impl State {
 
                 EventResponse {
                     repaint: true,
-                    consumed: self.egui_ctx.wants_keyboard_input(),
+                    consumed: self.egui_ctx.egui_wants_keyboard_input(),
                 }
             }
             WindowEvent::KeyboardInput {
@@ -413,7 +415,7 @@ impl State {
                     self.on_keyboard_input(event);
 
                     // When pressing the Tab key, egui focuses the first focusable element, hence Tab always consumes.
-                    let consumed = self.egui_ctx.wants_keyboard_input()
+                    let consumed = self.egui_ctx.egui_wants_keyboard_input()
                         || event.logical_key
                             == winit::keyboard::Key::Named(winit::keyboard::NamedKey::Tab);
                     EventResponse {
@@ -528,7 +530,7 @@ impl State {
                 self.egui_input.events.push(egui::Event::Zoom(zoom_factor));
                 EventResponse {
                     repaint: true,
-                    consumed: self.egui_ctx.wants_pointer_input(),
+                    consumed: self.egui_ctx.egui_wants_pointer_input(),
                 }
             }
 
@@ -541,7 +543,7 @@ impl State {
                     .push(egui::Event::Rotate(-delta.to_radians()));
                 EventResponse {
                     repaint: true,
-                    consumed: self.egui_ctx.wants_pointer_input(),
+                    consumed: self.egui_ctx.egui_wants_pointer_input(),
                 }
             }
 
@@ -556,7 +558,7 @@ impl State {
                 });
                 EventResponse {
                     repaint: true,
-                    consumed: self.egui_ctx.wants_pointer_input(),
+                    consumed: self.egui_ctx.egui_wants_pointer_input(),
                 }
             }
         }
diff --git a/crates/egui-winit/src/safe_area.rs b/crates/egui-winit/src/safe_area.rs
index d29d654a3..5f4a9f9cf 100644
--- a/crates/egui-winit/src/safe_area.rs
+++ b/crates/egui-winit/src/safe_area.rs
@@ -25,7 +25,7 @@ mod ios {
 
         let app = UIApplication::sharedApplication(main_thread_marker);
 
-        #[allow(unsafe_code)]
+        #[expect(unsafe_code)]
         unsafe {
             // Look for the first window scene that's in the foreground
             for scene in app.connectedScenes() {
diff --git a/crates/egui/src/atomics/atom_kind.rs b/crates/egui/src/atomics/atom_kind.rs
index 3c54c496b..10ca3353b 100644
--- a/crates/egui/src/atomics/atom_kind.rs
+++ b/crates/egui/src/atomics/atom_kind.rs
@@ -82,7 +82,7 @@ impl<'a> AtomKind<'a> {
     ) -> (Vec2, SizedAtomKind<'a>) {
         match self {
             AtomKind::Text(text) => {
-                let wrap_mode = wrap_mode.unwrap_or(ui.wrap_mode());
+                let wrap_mode = wrap_mode.unwrap_or_else(|| ui.wrap_mode());
                 let galley = text.into_galley(ui, Some(wrap_mode), available_size.x, fallback_font);
                 (galley.intrinsic_size(), SizedAtomKind::Text(galley))
             }
diff --git a/crates/egui/src/atomics/atom_layout.rs b/crates/egui/src/atomics/atom_layout.rs
index 1df890250..8132a7dc9 100644
--- a/crates/egui/src/atomics/atom_layout.rs
+++ b/crates/egui/src/atomics/atom_layout.rs
@@ -168,7 +168,7 @@ impl<'a> AtomLayout<'a> {
 
         let fallback_font = fallback_font.unwrap_or_default();
 
-        let wrap_mode = wrap_mode.unwrap_or(ui.wrap_mode());
+        let wrap_mode = wrap_mode.unwrap_or_else(|| ui.wrap_mode());
 
         // If the TextWrapMode is not Extend, ensure there is some item marked as `shrink`.
         // If none is found, mark the first text item as `shrink`.
@@ -188,7 +188,7 @@ impl<'a> AtomLayout<'a> {
 
         let fallback_text_color =
             fallback_text_color.unwrap_or_else(|| ui.style().visuals.text_color());
-        let gap = gap.unwrap_or(ui.spacing().icon_spacing);
+        let gap = gap.unwrap_or_else(|| ui.spacing().icon_spacing);
 
         // The size available for the content
         let available_inner_size = ui.available_size() - frame.total_margin().sum();
diff --git a/crates/egui/src/atomics/atoms.rs b/crates/egui/src/atomics/atoms.rs
index 4b19c9e26..1db7c63c6 100644
--- a/crates/egui/src/atomics/atoms.rs
+++ b/crates/egui/src/atomics/atoms.rs
@@ -198,8 +198,7 @@ macro_rules! all_the_atoms {
             $($T: IntoAtoms<'a>),*
         {
             fn collect(self, _atoms: &mut Atoms<'a>) {
-                #[allow(clippy::allow_attributes)]
-                #[allow(non_snake_case)]
+                #[allow(clippy::allow_attributes, non_snake_case)]
                 let ($($T),*) = self;
                 $($T.collect(_atoms);)*
             }
diff --git a/crates/egui/src/cache/cache_storage.rs b/crates/egui/src/cache/cache_storage.rs
index d4c3c9aef..255eca2d5 100644
--- a/crates/egui/src/cache/cache_storage.rs
+++ b/crates/egui/src/cache/cache_storage.rs
@@ -28,6 +28,7 @@ pub struct CacheStorage {
 
 impl CacheStorage {
     pub fn cache<Cache: CacheTrait + Default>(&mut self) -> &mut Cache {
+        #[expect(clippy::unwrap_used)]
         self.caches
             .entry(std::any::TypeId::of::<Cache>())
             .or_insert_with(|| Box::<Cache>::default())
diff --git a/crates/egui/src/containers/area.rs b/crates/egui/src/containers/area.rs
index 3ebac1d65..3b6d4006e 100644
--- a/crates/egui/src/containers/area.rs
+++ b/crates/egui/src/containers/area.rs
@@ -172,7 +172,7 @@ impl Area {
 
     /// Set the [`UiStackInfo`] of the area's [`Ui`].
     ///
-    /// Default to [`UiStackInfo::new(UiKind::GenericArea)`].
+    /// Default to [`UiStackInfo`] with kind [`UiKind::GenericArea`].
     #[inline]
     pub fn info(mut self, info: UiStackInfo) -> Self {
         self.info = info;
@@ -459,7 +459,7 @@ impl Area {
             state.pivot_pos = Some(new_pos);
         }
         state.pivot_pos.get_or_insert_with(|| {
-            default_pos.unwrap_or_else(|| automatic_area_position(ctx, layer_id))
+            default_pos.unwrap_or_else(|| automatic_area_position(ctx, constrain_rect, layer_id))
         });
         state.interactable = interactable;
 
@@ -469,7 +469,7 @@ impl Area {
             // during the sizing pass we will use this as the max size
             let mut size = default_size;
 
-            let default_area_size = ctx.style().spacing.default_area_size;
+            let default_area_size = ctx.global_style().spacing.default_area_size;
             if size.x.is_nan() {
                 size.x = default_area_size.x;
             }
@@ -523,6 +523,7 @@ impl Area {
                     enabled,
                 },
                 true,
+                Default::default(),
             );
 
             // Used to prevent drift
@@ -634,7 +635,8 @@ impl Prepared {
         {
             let age =
                 ctx.input(|i| (i.time - last_became_visible_at) as f32 + i.predicted_dt / 2.0);
-            let opacity = crate::remap_clamp(age, 0.0..=ctx.style().animation_time, 0.0..=1.0);
+            let opacity =
+                crate::remap_clamp(age, 0.0..=ctx.global_style().animation_time, 0.0..=1.0);
             let opacity = emath::easing::quadratic_out(opacity); // slow fade-out = quick fade-in
             ui.multiply_opacity(opacity);
             if opacity < 1.0 {
@@ -698,7 +700,7 @@ fn pointer_pressed_on_area(ctx: &Context, layer_id: LayerId) -> bool {
     }
 }
 
-fn automatic_area_position(ctx: &Context, layer_id: LayerId) -> Pos2 {
+fn automatic_area_position(ctx: &Context, constrain_rect: Rect, layer_id: LayerId) -> Pos2 {
     let mut existing: Vec<Rect> = ctx.memory(|mem| {
         mem.areas()
             .visible_windows()
@@ -709,13 +711,9 @@ fn automatic_area_position(ctx: &Context, layer_id: LayerId) -> Pos2 {
     });
     existing.sort_by_key(|r| r.left().round() as i32);
 
-    // NOTE: for the benefit of the egui demo, we position the windows so they don't
-    // cover the side panels, which means we use `available_rect` here instead of `constrain_rect` or `screen_rect`.
-    let available_rect = ctx.available_rect();
-
     let spacing = 16.0;
-    let left = available_rect.left() + spacing;
-    let top = available_rect.top() + spacing;
+    let left = constrain_rect.left() + spacing;
+    let top = constrain_rect.top() + spacing;
 
     if existing.is_empty() {
         return pos2(left, top);
@@ -725,6 +723,7 @@ fn automatic_area_position(ctx: &Context, layer_id: LayerId) -> Pos2 {
     let mut column_bbs = vec![existing[0]];
 
     for &rect in &existing {
+        #[expect(clippy::unwrap_used)]
         let current_column_bb = column_bbs.last_mut().unwrap();
         if rect.left() < current_column_bb.right() {
             // same column
@@ -749,14 +748,15 @@ fn automatic_area_position(ctx: &Context, layer_id: LayerId) -> Pos2 {
 
     // Find first column with some available space at the bottom of it:
     for col_bb in &column_bbs {
-        if col_bb.bottom() < available_rect.center().y {
+        if col_bb.bottom() < constrain_rect.center().y {
             return pos2(col_bb.left(), col_bb.bottom() + spacing);
         }
     }
 
     // Maybe we can fit a new column?
+    #[expect(clippy::unwrap_used)]
     let rightmost = column_bbs.last().unwrap().right();
-    if rightmost + 200.0 < available_rect.right() {
+    if rightmost + 200.0 < constrain_rect.right() {
         return pos2(rightmost + spacing, top);
     }
 
diff --git a/crates/egui/src/containers/collapsing_header.rs b/crates/egui/src/containers/collapsing_header.rs
index 3afb77682..aca8ab138 100644
--- a/crates/egui/src/containers/collapsing_header.rs
+++ b/crates/egui/src/containers/collapsing_header.rs
@@ -69,7 +69,7 @@ impl CollapsingState {
 
     pub fn toggle(&mut self, ui: &Ui) {
         self.state.open = !self.state.open;
-        ui.ctx().request_repaint();
+        ui.request_repaint();
     }
 
     /// 0 for closed, 1 for open, with tweening
diff --git a/crates/egui/src/containers/frame.rs b/crates/egui/src/containers/frame.rs
index e4de2ca48..d556f827e 100644
--- a/crates/egui/src/containers/frame.rs
+++ b/crates/egui/src/containers/frame.rs
@@ -336,7 +336,7 @@ impl Frame {
 impl Frame {
     /// How much extra space the frame uses up compared to the content.
     ///
-    /// [`Self::inner_margin`] + [`Self.stroke`]`.width` + [`Self::outer_margin`].
+    /// [`Self::inner_margin`] + [`Self::stroke`]`.width` + [`Self::outer_margin`].
     #[inline]
     pub fn total_margin(&self) -> MarginF32 {
         MarginF32::from(self.inner_margin)
diff --git a/crates/egui/src/containers/menu.rs b/crates/egui/src/containers/menu.rs
index 756d68dd3..1bd5954c8 100644
--- a/crates/egui/src/containers/menu.rs
+++ b/crates/egui/src/containers/menu.rs
@@ -207,7 +207,7 @@ impl MenuState {
 /// egui::MenuBar::new().ui(ui, |ui| {
 ///     ui.menu_button("File", |ui| {
 ///         if ui.button("Quit").clicked() {
-///             ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close);
+///             ui.send_viewport_cmd(egui::ViewportCommand::Close);
 ///         }
 ///     });
 /// });
@@ -444,11 +444,8 @@ impl SubMenu {
         let mut menu_config = self.config.unwrap_or_else(|| parent_config.clone());
         menu_config.bar = false;
 
-        let menu_root_response = ui
-            .ctx()
-            .read_response(menu_id)
-            // Since we are a child of that ui, this should always exist
-            .unwrap();
+        #[expect(clippy::unwrap_used)] // Since we are a child of that ui, this should always exist
+        let menu_root_response = ui.ctx().read_response(menu_id).unwrap();
 
         let hover_pos = ui.ctx().pointer_hover_pos();
 
@@ -556,7 +553,7 @@ impl SubMenu {
             if is_moving_towards_rect {
                 // We need to repaint while this is true, so we can detect when
                 // the pointer is no longer moving towards the rect
-                ui.ctx().request_repaint();
+                ui.request_repaint();
             }
             let hovering_other_menu_entry = is_open
                 && !is_hovered
diff --git a/crates/egui/src/containers/old_popup.rs b/crates/egui/src/containers/old_popup.rs
index 3ddf77bf6..f8e7cc900 100644
--- a/crates/egui/src/containers/old_popup.rs
+++ b/crates/egui/src/containers/old_popup.rs
@@ -1,5 +1,5 @@
 //! Old and deprecated API for popups. Use [`Popup`] instead.
-#![allow(deprecated)]
+#![expect(deprecated)]
 
 use crate::containers::tooltip::Tooltip;
 use crate::{
diff --git a/crates/egui/src/containers/panel.rs b/crates/egui/src/containers/panel.rs
index eb60f5f21..6281e6b41 100644
--- a/crates/egui/src/containers/panel.rs
+++ b/crates/egui/src/containers/panel.rs
@@ -255,9 +255,7 @@ impl<'a> PanelSizer<'a> {
         let side = self.panel.side;
         let size_range = self.panel.size_range;
 
-        if is_resizing && pointer.is_some() {
-            let pointer = pointer.unwrap();
-
+        if is_resizing && let Some(pointer) = pointer {
             match side {
                 PanelSide::Vertical(side) => {
                     self.size = (pointer.x - side.side_x(self.panel_rect)).abs();
@@ -291,13 +289,13 @@ impl<'a> PanelSizer<'a> {
 /// See the [module level docs](crate::containers::panel) for more details.
 ///
 /// ```
-/// # egui::__run_test_ctx(|ctx| {
-/// egui::Panel::left("my_left_panel").show(ctx, |ui| {
+/// # egui::__run_test_ui(|ui| {
+/// egui::Panel::left("my_left_panel").show_inside(ui, |ui| {
 ///    ui.label("Hello World!");
 /// });
 /// # });
 /// ```
-#[must_use = "You should call .show()"]
+#[must_use = "You should call .show_inside()"]
 pub struct Panel {
     side: PanelSide,
     id: Id,
@@ -518,6 +516,7 @@ impl Panel {
     }
 
     /// Show the panel at the top level.
+    #[deprecated = "Use show_inside() instead"]
     pub fn show<R>(
         self,
         ctx: &Context,
@@ -528,12 +527,15 @@ impl Panel {
 
     /// Show the panel if `is_expanded` is `true`,
     /// otherwise don't show it, but with a nice animation between collapsed and expanded.
+    #[deprecated = "Use show_animated_inside() instead"]
     pub fn show_animated<R>(
         self,
         ctx: &Context,
         is_expanded: bool,
         add_contents: impl FnOnce(&mut Ui) -> R,
     ) -> Option<InnerResponse<R>> {
+        #![expect(deprecated)]
+
         let how_expanded = animate_expansion(ctx, self.id.with("animation"), is_expanded);
 
         let animated_panel = self.get_animated_panel(ctx, is_expanded)?;
@@ -572,6 +574,7 @@ impl Panel {
     }
 
     /// Show either a collapsed or a expanded panel, with a nice animation between.
+    #[deprecated = "Use show_animated_between_inside() instead"]
     pub fn show_animated_between<R>(
         ctx: &Context,
         is_expanded: bool,
@@ -579,6 +582,8 @@ impl Panel {
         expanded_panel: Self,
         add_contents: impl FnOnce(&mut Ui, f32) -> R,
     ) -> Option<InnerResponse<R>> {
+        #![expect(deprecated)]
+
         let how_expanded = animate_expansion(ctx, expanded_panel.id.with("animation"), is_expanded);
 
         // Get either the fake or the real panel to animate
@@ -713,7 +718,7 @@ impl Panel {
         }
 
         if resize_hover || is_resizing {
-            ui.ctx().set_cursor_icon(self.cursor_icon(&panel_sizer));
+            ui.set_cursor_icon(self.cursor_icon(&panel_sizer));
         }
 
         PanelState { rect }.store(ui.ctx(), id);
@@ -753,6 +758,8 @@ impl Panel {
         ctx: &Context,
         add_contents: Box<dyn FnOnce(&mut Ui) -> R + 'c>,
     ) -> InnerResponse<R> {
+        #![expect(deprecated)]
+
         let side = self.side;
         let available_rect = ctx.available_rect();
         let mut panel_ui = Ui::new(
@@ -802,9 +809,7 @@ impl Panel {
         let resize_id = self.id.with("__resize");
         let resize_response = ui.ctx().read_response(resize_id);
 
-        if resize_response.is_some() {
-            let resize_response = resize_response.unwrap();
-
+        if let Some(resize_response) = resize_response {
             // NOTE(sharky98): The original code was initializing to
             // false first, but it doesn't seem necessary.
             let is_resizing = resize_response.dragged();
@@ -934,14 +939,14 @@ impl Panel {
         };
 
         let get_spacing_size = || match panel.side {
-            PanelSide::Vertical(_) => ctx.style().spacing.interact_size.x,
-            PanelSide::Horizontal(_) => ctx.style().spacing.interact_size.y,
+            PanelSide::Vertical(_) => ctx.global_style().spacing.interact_size.x,
+            PanelSide::Horizontal(_) => ctx.global_style().spacing.interact_size.y,
         };
 
         PanelState::load(ctx, panel.id)
             .map(get_rect_state_size)
             .or(panel.default_size)
-            .unwrap_or(get_spacing_size())
+            .unwrap_or_else(get_spacing_size)
     }
 }
 
@@ -950,6 +955,9 @@ impl Panel {
 /// A panel that covers the remainder of the screen,
 /// i.e. whatever area is left after adding other panels.
 ///
+/// This acts very similar to [`Frame::central_panel`], but always expands
+/// to use up all available space.
+///
 /// The order in which you add panels matter!
 /// The first panel you add will always be the outermost, and the last you add will always be the innermost.
 ///
@@ -960,31 +968,41 @@ impl Panel {
 /// See the [module level docs](crate::containers::panel) for more details.
 ///
 /// ```
-/// # egui::__run_test_ctx(|ctx| {
-/// egui::Panel::top("my_panel").show(ctx, |ui| {
+/// # egui::__run_test_ui(|ui| {
+/// egui::Panel::top("my_panel").show_inside(ui, |ui| {
 ///    ui.label("Hello World! From `Panel`, that must be before `CentralPanel`!");
 /// });
-/// egui::CentralPanel::default().show(ctx, |ui| {
+/// egui::CentralPanel::default().show_inside(ui, |ui| {
 ///    ui.label("Hello World!");
 /// });
 /// # });
 /// ```
-#[must_use = "You should call .show()"]
+#[must_use = "You should call .show_inside()"]
 #[derive(Default)]
 pub struct CentralPanel {
     frame: Option<Frame>,
 }
 
 impl CentralPanel {
+    /// A central panel with no margin or background color
+    pub fn no_frame() -> Self {
+        Self {
+            frame: Some(Frame::NONE),
+        }
+    }
+
+    /// A central panel with a background color and some inner margins
+    pub fn default_margins() -> Self {
+        Self { frame: None }
+    }
+
     /// Change the background color, margins, etc.
     #[inline]
     pub fn frame(mut self, frame: Frame) -> Self {
         self.frame = Some(frame);
         self
     }
-}
 
-impl CentralPanel {
     /// Show the panel inside a [`Ui`].
     pub fn show_inside<R>(
         self,
@@ -1012,13 +1030,19 @@ impl CentralPanel {
         panel_ui.set_clip_rect(panel_rect); // If we overflow, don't do so visibly (#4475)
 
         let frame = frame.unwrap_or_else(|| Frame::central_panel(ui.style()));
-        frame.show(&mut panel_ui, |ui| {
+        let response = frame.show(&mut panel_ui, |ui| {
             ui.expand_to_include_rect(ui.max_rect()); // Expand frame to include it all
             add_contents(ui)
-        })
+        });
+
+        // Use up space in the parent:
+        ui.advance_cursor_after_rect(response.response.rect);
+
+        response
     }
 
     /// Show the panel at the top level.
+    #[deprecated = "Use show_inside() instead"]
     pub fn show<R>(
         self,
         ctx: &Context,
@@ -1033,6 +1057,8 @@ impl CentralPanel {
         ctx: &Context,
         add_contents: Box<dyn FnOnce(&mut Ui) -> R + 'c>,
     ) -> InnerResponse<R> {
+        #![expect(deprecated)]
+
         let id = Id::new((ctx.viewport_id(), "central_panel"));
 
         let mut panel_ui = Ui::new(
diff --git a/crates/egui/src/containers/popup.rs b/crates/egui/src/containers/popup.rs
index a9c00661d..0fb2a9f2a 100644
--- a/crates/egui/src/containers/popup.rs
+++ b/crates/egui/src/containers/popup.rs
@@ -465,7 +465,7 @@ impl<'a> Popup<'a> {
     pub fn get_best_align(&self) -> RectAlign {
         let expected_popup_size = self
             .get_expected_size()
-            .unwrap_or(vec2(self.width.unwrap_or(0.0), 0.0));
+            .unwrap_or_else(|| vec2(self.width.unwrap_or(0.0), 0.0));
 
         let Some(anchor_rect) = self.anchor.rect(self.id, &self.ctx) else {
             return self.rect_align;
@@ -473,6 +473,7 @@ impl<'a> Popup<'a> {
 
         RectAlign::find_best_align(
             #[expect(clippy::iter_on_empty_collections)]
+            #[expect(clippy::or_fun_call)]
             once(self.rect_align).chain(
                 self.alternative_aligns
                     // Need the empty slice so the iters have the same type so we can unwrap_or
diff --git a/crates/egui/src/containers/resize.rs b/crates/egui/src/containers/resize.rs
index 50cc28774..7ff943b3f 100644
--- a/crates/egui/src/containers/resize.rs
+++ b/crates/egui/src/containers/resize.rs
@@ -213,7 +213,7 @@ impl Resize {
         });
 
         let mut state = State::load(ui.ctx(), id).unwrap_or_else(|| {
-            ui.ctx().request_repaint(); // counter frame delay
+            ui.request_repaint(); // counter frame delay
 
             let default_size = self
                 .default_size
@@ -362,20 +362,20 @@ impl Resize {
             paint_resize_corner(ui, &corner_response);
 
             if corner_response.hovered() || corner_response.dragged() {
-                ui.ctx().set_cursor_icon(CursorIcon::ResizeNwSe);
+                ui.set_cursor_icon(CursorIcon::ResizeNwSe);
             }
         }
 
         state.store(ui.ctx(), id);
 
         #[cfg(debug_assertions)]
-        if ui.ctx().style().debug.show_resize {
-            ui.ctx().debug_painter().debug_rect(
+        if ui.global_style().debug.show_resize {
+            ui.debug_painter().debug_rect(
                 Rect::from_min_size(content_ui.min_rect().left_top(), state.desired_size),
                 Color32::GREEN,
                 "desired_size",
             );
-            ui.ctx().debug_painter().debug_rect(
+            ui.debug_painter().debug_rect(
                 Rect::from_min_size(content_ui.min_rect().left_top(), state.last_content_size),
                 Color32::LIGHT_BLUE,
                 "last_content_size",
diff --git a/crates/egui/src/containers/scene.rs b/crates/egui/src/containers/scene.rs
index 36222b138..093452289 100644
--- a/crates/egui/src/containers/scene.rs
+++ b/crates/egui/src/containers/scene.rs
@@ -244,8 +244,8 @@ impl Scene {
             && resp.contains_pointer()
         {
             let pointer_in_scene = to_global.inverse() * mouse_pos;
-            let zoom_delta = ui.ctx().input(|i| i.zoom_delta());
-            let pan_delta = ui.ctx().input(|i| i.smooth_scroll_delta());
+            let zoom_delta = ui.input(|i| i.zoom_delta());
+            let pan_delta = ui.input(|i| i.smooth_scroll_delta());
 
             // Most of the time we can return early. This is also important to
             // avoid `ui_from_scene` to change slightly due to floating point errors.
diff --git a/crates/egui/src/containers/scroll_area.rs b/crates/egui/src/containers/scroll_area.rs
index 5ed4c31f3..afe1239c7 100644
--- a/crates/egui/src/containers/scroll_area.rs
+++ b/crates/egui/src/containers/scroll_area.rs
@@ -1,6 +1,6 @@
 //! See [`ScrollArea`] for docs.
 
-#![allow(clippy::needless_range_loop)]
+#![expect(clippy::needless_range_loop)]
 
 use std::ops::{Add, AddAssign, BitOr, BitOrAssign};
 
@@ -9,7 +9,8 @@ use epaint::Margin;
 
 use crate::{
     Context, CursorIcon, Id, NumExt as _, Pos2, Rangef, Rect, Response, Sense, Ui, UiBuilder,
-    UiKind, UiStackInfo, Vec2, Vec2b, emath, epaint, lerp, pass_state, pos2, remap, remap_clamp,
+    UiKind, UiStackInfo, Vec2, Vec2b, WidgetInfo, emath, epaint, lerp, pass_state, pos2, remap,
+    remap_clamp,
 };
 
 #[derive(Clone, Copy, Debug)]
@@ -856,11 +857,11 @@ impl ScrollArea {
                     if response.dragged()
                         && let Some(cursor) = on_drag_cursor
                     {
-                        ui.ctx().set_cursor_icon(cursor);
+                        ui.set_cursor_icon(cursor);
                     } else if response.hovered()
                         && let Some(cursor) = on_hover_cursor
                     {
-                        ui.ctx().set_cursor_icon(cursor);
+                        ui.set_cursor_icon(cursor);
                     }
                 }
 
@@ -1125,7 +1126,7 @@ impl Prepared {
                             target_offset,
                         });
                     }
-                    ui.ctx().request_repaint();
+                    ui.request_repaint();
                 }
             }
         }
@@ -1178,7 +1179,7 @@ impl Prepared {
                 && direction_enabled[0] != direction_enabled[1];
             for d in 0..2 {
                 if direction_enabled[d] {
-                    let scroll_delta = ui.ctx().input(|input| {
+                    let scroll_delta = ui.input(|input| {
                         if always_scroll_enabled_direction {
                             // no bidirectional scrolling; allow horizontal scrolling without pressing shift
                             input.smooth_scroll_delta()[0] + input.smooth_scroll_delta()[1]
@@ -1195,7 +1196,7 @@ impl Prepared {
                         state.offset[d] -= scroll_delta;
 
                         // Clear scroll delta so no parent scroll will use it:
-                        ui.ctx().input_mut(|input| {
+                        ui.input_mut(|input| {
                             if always_scroll_enabled_direction {
                                 input.smooth_scroll_delta()[0] = 0.0;
                                 input.smooth_scroll_delta()[1] = 0.0;
@@ -1241,46 +1242,17 @@ impl Prepared {
                 continue;
             }
 
+            let interact_id = id.with(d);
+
             // Margin on either side of the scroll bar:
             let inner_margin = show_factor * scroll_style.bar_inner_margin;
             let outer_margin = show_factor * scroll_style.bar_outer_margin;
 
-            // top/bottom of a horizontal scroll (d==0).
-            // left/rigth of a vertical scroll (d==1).
-            let mut cross = if scroll_style.floating {
-                // The bounding rect of a fully visible bar.
-                // When we hover this area, we should show the full bar:
-                let max_bar_rect = if d == 0 {
-                    outer_rect.with_min_y(outer_rect.max.y - outer_margin - scroll_style.bar_width)
-                } else {
-                    outer_rect.with_min_x(outer_rect.max.x - outer_margin - scroll_style.bar_width)
-                };
+            // bottom of a horizontal scroll (d==0).
+            // right of a vertical scroll (d==1).
+            let mut max_cross = outer_rect.max[1 - d] - outer_margin;
 
-                let is_hovering_bar_area = is_hovering_outer_rect
-                    && ui.rect_contains_pointer(max_bar_rect)
-                    && !is_dragging_background
-                    || state.scroll_bar_interaction[d];
-
-                let is_hovering_bar_area_t = ui
-                    .ctx()
-                    .animate_bool_responsive(id.with((d, "bar_hover")), is_hovering_bar_area);
-
-                let width = show_factor
-                    * lerp(
-                        scroll_style.floating_width..=scroll_style.bar_width,
-                        is_hovering_bar_area_t,
-                    );
-
-                let max_cross = outer_rect.max[1 - d] - outer_margin;
-                let min_cross = max_cross - width;
-                Rangef::new(min_cross, max_cross)
-            } else {
-                let min_cross = inner_rect.max[1 - d] + inner_margin;
-                let max_cross = outer_rect.max[1 - d] - outer_margin;
-                Rangef::new(min_cross, max_cross)
-            };
-
-            if ui.clip_rect().max[1 - d] < cross.max + outer_margin {
+            if ui.clip_rect().max[1 - d] - outer_margin < max_cross {
                 // Move the scrollbar so it is visible. This is needed in some cases.
                 // For instance:
                 // * When we have a vertical-only scroll area in a top level panel,
@@ -1290,21 +1262,59 @@ impl Prepared {
                 //   is outside the clip rectangle.
                 // Really this should use the tighter clip_rect that ignores clip_rect_margin, but we don't store that.
                 // clip_rect_margin is quite a hack. It would be nice to get rid of it.
-                let width = cross.max - cross.min;
-                cross.max = ui.clip_rect().max[1 - d] - outer_margin;
-                cross.min = cross.max - width;
+                max_cross = ui.clip_rect().max[1 - d] - outer_margin;
             }
 
-            let outer_scroll_bar_rect = if d == 0 {
-                Rect::from_min_max(
-                    pos2(scroll_bar_rect.left(), cross.min),
-                    pos2(scroll_bar_rect.right(), cross.max),
-                )
+            let full_width = scroll_style.bar_width;
+
+            // The bounding rect of a fully visible bar.
+            // When we hover this area, we should show the full bar:
+            let max_bar_rect = if d == 0 {
+                outer_rect.with_min_y(max_cross - full_width)
             } else {
-                Rect::from_min_max(
-                    pos2(cross.min, scroll_bar_rect.top()),
-                    pos2(cross.max, scroll_bar_rect.bottom()),
-                )
+                outer_rect.with_min_x(max_cross - full_width)
+            };
+
+            let sense = if scroll_source.scroll_bar && ui.is_enabled() {
+                Sense::click_and_drag()
+            } else {
+                Sense::hover()
+            };
+
+            // We always sense interaction with the full width, even if we antimate it growing/shrinking.
+            // This is to present a more consistent target for our hit test code,
+            // and to avoid producing jitter in "thin widget" heuristics there.
+            // Also: it make sense to detect any hover where the scroll bar _will_ be.
+            let response = ui.interact(max_bar_rect, interact_id, sense);
+
+            response.widget_info(|| WidgetInfo::new(crate::WidgetType::ScrollBar));
+
+            // top/bottom of a horizontal scroll (d==0).
+            // left/rigth of a vertical scroll (d==1).
+            let cross = if scroll_style.floating {
+                let is_hovering_bar_area = response.hovered() || state.scroll_bar_interaction[d];
+
+                let is_hovering_bar_area_t = ui
+                    .ctx()
+                    .animate_bool_responsive(id.with((d, "bar_hover")), is_hovering_bar_area);
+
+                let width = show_factor
+                    * lerp(
+                        scroll_style.floating_width..=full_width,
+                        is_hovering_bar_area_t,
+                    );
+
+                let min_cross = max_cross - width;
+                Rangef::new(min_cross, max_cross)
+            } else {
+                let min_cross = inner_rect.max[1 - d] + inner_margin;
+                Rangef::new(min_cross, max_cross)
+            };
+
+            let outer_scroll_bar_rect = if d == 0 {
+                Rect::from_x_y_ranges(scroll_bar_rect.x_range(), cross)
+            } else {
+                Rect::from_x_y_ranges(cross, scroll_bar_rect.y_range())
             };
 
             let from_content = |content| {
@@ -1344,14 +1354,6 @@ impl Prepared {
 
             let handle_rect = calculate_handle_rect(d, &state.offset);
 
-            let interact_id = id.with(d);
-            let sense = if scroll_source.scroll_bar && ui.is_enabled() {
-                Sense::click_and_drag()
-            } else {
-                Sense::hover()
-            };
-            let response = ui.interact(outer_scroll_bar_rect, interact_id, sense);
-
             state.scroll_bar_interaction[d] = response.hovered() || response.dragged();
 
             if let Some(pointer_pos) = response.interact_pointer_pos() {
@@ -1475,7 +1477,7 @@ impl Prepared {
         ui.advance_cursor_after_rect(outer_rect);
 
         if show_scroll_this_frame != state.show_scroll {
-            ui.ctx().request_repaint();
+            ui.request_repaint();
         }
 
         let available_offset = content_size - inner_rect.size();
diff --git a/crates/egui/src/containers/tooltip.rs b/crates/egui/src/containers/tooltip.rs
index c46e21d57..78c5a726b 100644
--- a/crates/egui/src/containers/tooltip.rs
+++ b/crates/egui/src/containers/tooltip.rs
@@ -41,7 +41,7 @@ impl Tooltip<'_> {
         parent_widget: Id,
         anchor: impl Into<PopupAnchor>,
     ) -> Self {
-        let width = ctx.style().spacing.tooltip_width;
+        let width = ctx.global_style().spacing.tooltip_width;
         Self {
             popup: Popup::new(parent_widget, ctx, anchor.into(), parent_layer)
                 .kind(PopupKind::Tooltip)
@@ -58,7 +58,7 @@ impl Tooltip<'_> {
         let popup = Popup::from_response(response)
             .kind(PopupKind::Tooltip)
             .gap(4.0)
-            .width(response.ctx.style().spacing.tooltip_width)
+            .width(response.ctx.global_style().spacing.tooltip_width)
             .sense(Sense::hover());
         Self {
             popup,
@@ -229,7 +229,7 @@ impl Tooltip<'_> {
             return false;
         }
 
-        let style = response.ctx.style();
+        let style = response.ctx.global_style();
 
         let tooltip_delay = style.interaction.tooltip_delay;
         let tooltip_grace_time = style.interaction.tooltip_grace_time;
diff --git a/crates/egui/src/containers/window.rs b/crates/egui/src/containers/window.rs
index 8d7a95be7..6dc7927ae 100644
--- a/crates/egui/src/containers/window.rs
+++ b/crates/egui/src/containers/window.rs
@@ -70,6 +70,41 @@ impl<'open> Window<'open> {
         }
     }
 
+    /// Construct a [`Window`] that follows the given viewport.
+    pub fn from_viewport(id: ViewportId, viewport: ViewportBuilder) -> Self {
+        let ViewportBuilder {
+            title,
+            app_id,
+            inner_size,
+            min_inner_size,
+            max_inner_size,
+            resizable,
+            decorations,
+            title_shown,
+            minimize_button,
+            .. // A lot of things not implemented yet
+        } = viewport;
+
+        let mut window = Self::new(title.or(app_id).unwrap_or_else(String::new)).id(Id::new(id));
+
+        if let Some(inner_size) = inner_size {
+            window = window.default_size(inner_size);
+        }
+        if let Some(min_inner_size) = min_inner_size {
+            window = window.min_size(min_inner_size);
+        }
+        if let Some(max_inner_size) = max_inner_size {
+            window = window.max_size(max_inner_size);
+        }
+        if let Some(resizable) = resizable {
+            window = window.resizable(resizable);
+        }
+        window = window.title_bar(decorations.unwrap_or(true) && title_shown.unwrap_or(true));
+        window = window.collapsible(minimize_button.unwrap_or(true));
+
+        window
+    }
+
     /// Assign a unique id to the Window. Required if the title changes, or is shared with another window.
     #[inline]
     pub fn id(mut self, id: Id) -> Self {
@@ -440,9 +475,11 @@ impl Window<'_> {
             fade_out,
         } = self;
 
+        let style = ctx.global_style();
+
         let header_color =
-            frame.map_or_else(|| ctx.style().visuals.widgets.open.weak_bg_fill, |f| f.fill);
-        let mut window_frame = frame.unwrap_or_else(|| Frame::window(&ctx.style()));
+            frame.map_or_else(|| style.visuals.widgets.open.weak_bg_fill, |f| f.fill);
+        let mut window_frame = frame.unwrap_or_else(|| Frame::window(&style));
 
         let is_explicitly_closed = matches!(open, Some(false));
         let is_open = !is_explicitly_closed || ctx.memory(|mem| mem.everything_is_visible());
@@ -474,7 +511,6 @@ impl Window<'_> {
 
         // Calculate roughly how much larger the full window inner size is compared to the content rect
         let (title_bar_height_with_margin, title_content_spacing) = if with_title_bar {
-            let style = ctx.style();
             let title_bar_inner_height = ctx
                 .fonts_mut(|fonts| title.font_height(fonts, &style))
                 .at_least(style.spacing.interact_size.y);
@@ -505,7 +541,7 @@ impl Window<'_> {
 
         // First check for resize to avoid frame delay:
         let last_frame_outer_rect = area.state().rect();
-        let resize_interaction = resize_interaction(
+        let resize_interaction = do_resize_interaction(
             ctx,
             possible,
             area.id(),
@@ -586,6 +622,17 @@ impl Window<'_> {
                 .map_or((None, None), |ir| (Some(ir.inner), Some(ir.response)));
 
             let outer_rect = frame.end(&mut area_content_ui).rect;
+
+            // Do resize interaction _again_, to move their widget rectangles on TOP of the rest of the window.
+            let resize_interaction = do_resize_interaction(
+                ctx,
+                possible,
+                area.id(),
+                area_layer_id,
+                last_frame_outer_rect,
+                window_frame,
+            );
+
             paint_resize_corner(
                 &area_content_ui,
                 &possible,
@@ -887,7 +934,7 @@ fn move_and_resize_window(ctx: &Context, id: Id, interaction: &ResizeInteraction
     Some(rect.round_ui())
 }
 
-fn resize_interaction(
+fn do_resize_interaction(
     ctx: &Context,
     possible: PossibleInteractions,
     _accessibility_parent: Id,
@@ -921,7 +968,16 @@ fn resize_interaction(
                 enabled: true,
             },
             true,
+            InteractOptions {
+                // We call this multiple times.
+                // First to read the result (to avoid frame delay)
+                // and the second time to move it to the top, above the window contents.
+                move_to_top: true,
+            },
         );
+
+        response.widget_info(|| WidgetInfo::new(crate::WidgetType::ResizeHandle));
+
         SideResponse {
             hover: response.hovered(),
             drag: response.dragged(),
@@ -930,8 +986,10 @@ fn resize_interaction(
 
     let id = Id::new(layer_id).with("edge_drag");
 
-    let side_grab_radius = ctx.style().interaction.resize_grab_radius_side;
-    let corner_grab_radius = ctx.style().interaction.resize_grab_radius_corner;
+    let style = ctx.global_style();
+
+    let side_grab_radius = style.interaction.resize_grab_radius_side;
+    let corner_grab_radius = style.interaction.resize_grab_radius_corner;
 
     let vetrtical_rect = |a: Pos2, b: Pos2| {
         Rect::from_min_max(a, b).expand2(vec2(side_grab_radius, -corner_grab_radius))
@@ -1141,8 +1199,7 @@ impl TitleBar {
         title_bar_height_with_margin: f32,
     ) -> Self {
         if false {
-            ui.ctx()
-                .debug_painter()
+            ui.debug_painter()
                 .debug_rect(ui.min_rect(), Color32::GREEN, "outer_min_rect");
         }
 
@@ -1170,8 +1227,7 @@ impl TitleBar {
         let min_rect = Rect::from_min_size(ui.min_rect().min, min_inner_size);
 
         if false {
-            ui.ctx()
-                .debug_painter()
+            ui.debug_painter()
                 .debug_rect(min_rect, Color32::LIGHT_BLUE, "min_rect");
         }
 
@@ -1208,8 +1264,7 @@ impl TitleBar {
         let title_inner_rect = self.inner_rect;
 
         if false {
-            ui.ctx()
-                .debug_painter()
+            ui.debug_painter()
                 .debug_rect(self.inner_rect, Color32::RED, "TitleBar");
         }
 
@@ -1240,7 +1295,7 @@ impl TitleBar {
         let text_pos = text_pos - self.title_galley.rect.min.to_vec2();
         ui.painter().galley(
             text_pos,
-            self.title_galley.clone(),
+            Arc::clone(&self.title_galley),
             ui.visuals().text_color(),
         );
 
@@ -1248,8 +1303,7 @@ impl TitleBar {
             // Paint separator between title and content:
             let content_rect = content_response.rect;
             if false {
-                ui.ctx()
-                    .debug_painter()
+                ui.debug_painter()
                     .debug_rect(content_rect, Color32::RED, "content_rect");
             }
             let y = title_inner_rect.bottom() + window_frame.stroke.width / 2.0;
@@ -1263,11 +1317,8 @@ impl TitleBar {
         let double_click_rect = title_inner_rect.shrink2(vec2(32.0, 0.0));
 
         if false {
-            ui.ctx().debug_painter().debug_rect(
-                double_click_rect,
-                Color32::GREEN,
-                "double_click_rect",
-            );
+            ui.debug_painter()
+                .debug_rect(double_click_rect, Color32::GREEN, "double_click_rect");
         }
 
         let id = ui.unique_id().with("__window_title_bar");
diff --git a/crates/egui/src/context.rs b/crates/egui/src/context.rs
index 2ca7af4fc..f8996b8a3 100644
--- a/crates/egui/src/context.rs
+++ b/crates/egui/src/context.rs
@@ -19,8 +19,8 @@ use crate::{
     ImmediateViewportRendererCallback, Key, KeyboardShortcut, Label, LayerId, Memory,
     ModifierNames, Modifiers, NumExt as _, Order, Painter, RawInput, Response, RichText,
     SafeAreaInsets, ScrollArea, Sense, Style, TextStyle, TextureHandle, TextureOptions, Ui,
-    ViewportBuilder, ViewportCommand, ViewportId, ViewportIdMap, ViewportIdPair, ViewportIdSet,
-    ViewportOutput, Widget as _, WidgetRect, WidgetText,
+    UiBuilder, ViewportBuilder, ViewportCommand, ViewportId, ViewportIdMap, ViewportIdPair,
+    ViewportIdSet, ViewportOutput, Visuals, Widget as _, WidgetRect, WidgetText,
     animation_manager::AnimationManager,
     containers::{self, area::AreaState},
     data::output::PlatformOutput,
@@ -34,8 +34,7 @@ use crate::{
     os::OperatingSystem,
     output::FullOutput,
     pass_state::PassState,
-    plugin,
-    plugin::TypedPluginHandle,
+    plugin::{self, TypedPluginHandle},
     resize, response, scroll_area,
     util::IdTypeMap,
     viewport::ViewportClass,
@@ -194,7 +193,7 @@ impl ContextImpl {
 pub struct ViewportState {
     /// The type of viewport.
     ///
-    /// This will never be [`ViewportClass::Embedded`],
+    /// This will never be [`ViewportClass::EmbeddedWindow`],
     /// since those don't result in real viewports.
     pub class: ViewportClass,
 
@@ -564,7 +563,10 @@ impl ContextImpl {
             log::trace!("Adding new fonts");
         }
 
-        let text_alpha_from_coverage = self.memory.options.style().visuals.text_alpha_from_coverage;
+        let Visuals {
+            mut text_options, ..
+        } = self.memory.options.style().visuals;
+        text_options.max_texture_side = max_texture_side;
 
         let mut is_new = false;
 
@@ -573,21 +575,17 @@ impl ContextImpl {
 
             is_new = true;
             profiling::scope!("Fonts::new");
-            Fonts::new(
-                max_texture_side,
-                text_alpha_from_coverage,
-                self.font_definitions.clone(),
-            )
+            Fonts::new(text_options, self.font_definitions.clone())
         });
 
         {
             profiling::scope!("Fonts::begin_pass");
-            fonts.begin_pass(max_texture_side, text_alpha_from_coverage);
+            fonts.begin_pass(text_options);
         }
     }
 
-    fn accesskit_node_builder(&mut self, id: Id) -> &mut accesskit::Node {
-        let state = self.viewport().this_pass.accesskit_state.as_mut().unwrap();
+    fn accesskit_node_builder(&mut self, id: Id) -> Option<&mut accesskit::Node> {
+        let state = self.viewport().this_pass.accesskit_state.as_mut()?;
         let builders = &mut state.nodes;
 
         if let std::collections::hash_map::Entry::Vacant(entry) = builders.entry(id) {
@@ -611,13 +609,13 @@ impl ContextImpl {
             }
 
             let parent_id = find_accesskit_parent(&state.parent_map, builders, id)
-                .unwrap_or(crate::accesskit_root_id());
+                .unwrap_or_else(crate::accesskit_root_id);
 
-            let parent_builder = builders.get_mut(&parent_id).unwrap();
+            let parent_builder = builders.get_mut(&parent_id)?;
             parent_builder.push_child(id.accesskit_id());
         }
 
-        builders.get_mut(&id).unwrap()
+        builders.get_mut(&id)
     }
 
     fn pixels_per_point(&mut self) -> f32 {
@@ -758,6 +756,63 @@ impl Context {
         writer(&mut self.0.write())
     }
 
+    /// Run the ui code for one frame.
+    ///
+    /// At most [`Options::max_passes`] calls will be issued to `run_ui`,
+    /// and only on the rare occasion that [`Context::request_discard`] is called.
+    /// Usually, it `run_ui` will only be called once.
+    ///
+    /// The [`Ui`] given to the callback will cover the entire [`Self::content_rect`],
+    /// with no margin or background color. Use [`crate::Frame`] to add that.
+    ///
+    /// You can organize your GUI using [`crate::Panel`].
+    ///
+    /// Instead of calling `run_ui`, you can alternatively use [`Self::begin_pass`] and [`Context::end_pass`].
+    ///
+    /// ```
+    /// // One egui context that you keep reusing:
+    /// let mut ctx = egui::Context::default();
+    ///
+    /// // Each frame:
+    /// let input = egui::RawInput::default();
+    /// let full_output = ctx.run_ui(input, |ui| {
+    ///     ui.label("Hello egui!");
+    /// });
+    /// // handle full_output
+    /// ```
+    ///
+    /// ## See also
+    /// * [`Self::run`]
+    #[must_use]
+    pub fn run_ui(&self, new_input: RawInput, mut run_ui: impl FnMut(&mut Ui)) -> FullOutput {
+        self.run_ui_dyn(new_input, &mut run_ui)
+    }
+
+    #[must_use]
+    fn run_ui_dyn(&self, new_input: RawInput, run_ui: &mut dyn FnMut(&mut Ui)) -> FullOutput {
+        let plugins = self.read(|ctx| ctx.plugins.ordered_plugins());
+        #[expect(deprecated)]
+        self.run(new_input, |ctx| {
+            let mut top_ui = Ui::new(
+                ctx.clone(),
+                Id::new((ctx.viewport_id(), "__top_ui")),
+                UiBuilder::new()
+                    .layer_id(LayerId::background())
+                    .max_rect(ctx.available_rect().round_ui()),
+            );
+
+            {
+                plugins.on_begin_pass(&mut top_ui);
+                run_ui(&mut top_ui);
+                plugins.on_end_pass(&mut top_ui);
+            }
+
+            // Inform ctx about what we actually used, so we can shrink the native window to fit.
+            // TODO(emilk): make better use of this somehow
+            ctx.pass_state_mut(|state| state.allocate_central_panel(top_ui.min_rect()));
+        })
+    }
+
     /// Run the ui code for one frame.
     ///
     /// At most [`Options::max_passes`] calls will be issued to `run_ui`,
@@ -781,8 +836,17 @@ impl Context {
     /// });
     /// // handle full_output
     /// ```
+    ///
+    /// ## See also
+    /// * [`Self::run_ui`]
     #[must_use]
-    pub fn run(&self, mut new_input: RawInput, mut run_ui: impl FnMut(&Self)) -> FullOutput {
+    #[deprecated = "Call run_ui instead"]
+    pub fn run(&self, new_input: RawInput, mut run_ui: impl FnMut(&Self)) -> FullOutput {
+        self.run_dyn(new_input, &mut run_ui)
+    }
+
+    #[must_use]
+    fn run_dyn(&self, mut new_input: RawInput, run_ui: &mut dyn FnMut(&Self)) -> FullOutput {
         profiling::function_scope!();
         let viewport_id = new_input.viewport_id;
         let max_passes = self.write(|ctx| ctx.memory.options.max_passes.get());
@@ -877,9 +941,6 @@ impl Context {
         plugins.on_input(&mut new_input);
 
         self.write(|ctx| ctx.begin_pass(new_input));
-
-        // Plugins run just after the pass starts:
-        plugins.on_begin_pass(self);
     }
 
     /// See [`Self::begin_pass`].
@@ -1101,7 +1162,7 @@ impl Context {
             let content_rect = self.content_rect();
 
             let text = format!("🔥 {text}");
-            let color = self.style().visuals.error_fg_color;
+            let color = self.global_style().visuals.error_fg_color;
             let painter = self.debug_painter();
             painter.rect_stroke(widget_rect, 0.0, (1.0, color), StrokeKind::Outside);
 
@@ -1165,7 +1226,12 @@ impl Context {
     ///
     /// `allow_focus` should usually be true, unless you call this function multiple times with the
     /// same widget, then `allow_focus` should only be true once (like in [`Ui::new`] (true) and [`Ui::remember_min_rect`] (false)).
-    pub(crate) fn create_widget(&self, w: WidgetRect, allow_focus: bool) -> Response {
+    pub(crate) fn create_widget(
+        &self,
+        w: WidgetRect,
+        allow_focus: bool,
+        options: crate::InteractOptions,
+    ) -> Response {
         let interested_in_focus = w.enabled
             && w.sense.is_focusable()
             && self.memory(|mem| mem.allows_interaction(w.layer_id));
@@ -1177,7 +1243,7 @@ impl Context {
             // We add all widgets here, even non-interactive ones,
             // because we need this list not only for checking for blocking widgets,
             // but also to know when we have reached the widget we are checking for cover.
-            viewport.this_pass.widgets.insert(w.layer_id, w);
+            viewport.this_pass.widgets.insert(w.layer_id, w, options);
 
             if allow_focus && interested_in_focus {
                 ctx.memory.interested_in_focus(w.id, w.layer_id);
@@ -1193,7 +1259,7 @@ impl Context {
             self.check_for_id_clash(w.id, w.rect, "widget");
         }
 
-        #[allow(clippy::let_and_return, clippy::allow_attributes)]
+        #[allow(clippy::allow_attributes, clippy::let_and_return)]
         let res = self.get_response(w);
 
         #[cfg(debug_assertions)]
@@ -1458,7 +1524,7 @@ impl Context {
         Painter::new(self.clone(), layer_id, content_rect)
     }
 
-    /// Paint on top of everything else
+    /// Paint on top of _everything_ else (even on top of tooltips and popups).
     pub fn debug_painter(&self) -> Painter {
         Self::layer_painter(self, LayerId::debug())
     }
@@ -1556,7 +1622,7 @@ impl Context {
             ..
         } = ModifierNames::SYMBOLS;
 
-        let font_id = TextStyle::Body.resolve(&self.style());
+        let font_id = TextStyle::Body.resolve(&self.global_style());
         self.fonts_mut(|f| {
             let mut font = f.fonts.font(&font_id.family);
             font.has_glyphs(alt)
@@ -1898,7 +1964,7 @@ impl Context {
     pub fn add_plugin(&self, plugin: impl plugin::Plugin + 'static) {
         let handle = plugin::PluginHandle::new(plugin);
 
-        let added = self.write(|ctx| ctx.plugins.add(handle.clone()));
+        let added = self.write(|ctx| ctx.plugins.add(Arc::clone(&handle)));
 
         if added {
             handle.lock().dyn_plugin_mut().setup(self);
@@ -1957,15 +2023,12 @@ impl Context {
     pub fn set_fonts(&self, font_definitions: FontDefinitions) {
         profiling::function_scope!();
 
-        let mut update_fonts = true;
-
-        self.read(|ctx| {
-            if let Some(current_fonts) = ctx.fonts.as_ref() {
-                // NOTE: this comparison is expensive since it checks TTF data for equality
-                if current_fonts.definitions() == &font_definitions {
-                    update_fonts = false; // no need to update
-                }
-            }
+        let update_fonts = self.read(|ctx| {
+            // NOTE: this comparison is expensive since it checks TTF data for equality
+            // TODO(valadaptive): add_font only checks the *names* for equality. Change this?
+            ctx.fonts
+                .as_ref()
+                .is_none_or(|fonts| fonts.definitions() != &font_definitions)
         });
 
         if update_fonts {
@@ -2008,13 +2071,13 @@ impl Context {
     }
 
     /// The [`Theme`] used to select the appropriate [`Style`] (dark or light)
-    /// used by all subsequent windows, panels etc.
+    /// used by all subsequent popups, menus, etc.
     pub fn theme(&self) -> Theme {
         self.options(|opt| opt.theme())
     }
 
     /// The [`Theme`] used to select between dark and light [`Self::style`]
-    /// as the active style used by all subsequent windows, panels etc.
+    /// as the active style used by all subsequent popups, menus, etc.
     ///
     /// Example:
     /// ```
@@ -2025,37 +2088,70 @@ impl Context {
         self.options_mut(|opt| opt.theme_preference = theme_preference.into());
     }
 
-    /// The currently active [`Style`] used by all subsequent windows, panels etc.
-    pub fn style(&self) -> Arc<Style> {
-        self.options(|opt| opt.style().clone())
+    /// The currently active [`Style`] used by all subsequent popups, menus, etc.
+    pub fn global_style(&self) -> Arc<Style> {
+        self.options(|opt| Arc::clone(opt.style()))
     }
 
-    /// Mutate the currently active [`Style`] used by all subsequent windows, panels etc.
+    /// The currently active [`Style`] used by all subsequent popups, menus, etc.
+    #[deprecated = "Renamed to `global_style` to avoid confusion with `ui.style()`"]
+    pub fn style(&self) -> Arc<Style> {
+        self.options(|opt| Arc::clone(opt.style()))
+    }
+
+    /// Mutate the currently active [`Style`] used by all subsequent popups, menus, etc.
     /// Use [`Self::all_styles_mut`] to mutate both dark and light mode styles.
     ///
     /// Example:
     /// ```
     /// # let mut ctx = egui::Context::default();
-    /// ctx.style_mut(|style| {
+    /// ctx.global_style_mut(|style| {
     ///     style.spacing.item_spacing = egui::vec2(10.0, 20.0);
     /// });
     /// ```
+    pub fn global_style_mut(&self, mutate_style: impl FnOnce(&mut Style)) {
+        self.options_mut(|opt| mutate_style(Arc::make_mut(opt.style_mut())));
+    }
+
+    /// Mutate the currently active [`Style`] used by all subsequent popups, menus, etc.
+    /// Use [`Self::all_styles_mut`] to mutate both dark and light mode styles.
+    ///
+    /// Example:
+    /// ```
+    /// # let mut ctx = egui::Context::default();
+    /// ctx.global_style_mut(|style| {
+    ///     style.spacing.item_spacing = egui::vec2(10.0, 20.0);
+    /// });
+    /// ```
+    #[deprecated = "Renamed to `global_style_mut` to avoid confusion with `ui.style_mut()`"]
     pub fn style_mut(&self, mutate_style: impl FnOnce(&mut Style)) {
         self.options_mut(|opt| mutate_style(Arc::make_mut(opt.style_mut())));
     }
 
-    /// The currently active [`Style`] used by all new windows, panels etc.
+    /// The currently active [`Style`] used by all new popups, menus, etc.
+    ///
+    /// Use [`Self::all_styles_mut`] to mutate both dark and light mode styles.
+    ///
+    /// You can also change this using [`Self::global_style_mut`].
+    ///
+    /// You can use [`Ui::style_mut`] to change the style of a single [`Ui`].
+    pub fn set_global_style(&self, style: impl Into<Arc<Style>>) {
+        self.options_mut(|opt| *opt.style_mut() = style.into());
+    }
+
+    /// The currently active [`Style`] used by all new popups, menus, etc.
     ///
     /// Use [`Self::all_styles_mut`] to mutate both dark and light mode styles.
     ///
     /// You can also change this using [`Self::style_mut`].
     ///
     /// You can use [`Ui::style_mut`] to change the style of a single [`Ui`].
+    #[deprecated = "Renamed to `set_global_style` to avoid confusion with `ui.set_style()`"]
     pub fn set_style(&self, style: impl Into<Arc<Style>>) {
         self.options_mut(|opt| *opt.style_mut() = style.into());
     }
 
-    /// Mutate the [`Style`]s used by all subsequent windows, panels etc. in both dark and light mode.
+    /// Mutate the [`Style`]s used by all subsequent popups, menus, etc. in both dark and light mode.
     ///
     /// Example:
     /// ```
@@ -2071,15 +2167,15 @@ impl Context {
         });
     }
 
-    /// The [`Style`] used by all subsequent windows, panels etc.
+    /// The [`Style`] used by all subsequent popups, menus, etc.
     pub fn style_of(&self, theme: Theme) -> Arc<Style> {
         self.options(|opt| match theme {
-            Theme::Dark => opt.dark_style.clone(),
-            Theme::Light => opt.light_style.clone(),
+            Theme::Dark => Arc::clone(&opt.dark_style),
+            Theme::Light => Arc::clone(&opt.light_style),
         })
     }
 
-    /// Mutate the [`Style`] used by all subsequent windows, panels etc.
+    /// Mutate the [`Style`] used by all subsequent popups, menus, etc.
     ///
     /// Example:
     /// ```
@@ -2095,7 +2191,7 @@ impl Context {
         });
     }
 
-    /// The [`Style`] used by all new windows, panels etc.
+    /// The [`Style`] used by all new popups, menus, etc.
     /// Use [`Self::set_theme`] to choose between dark and light mode.
     ///
     /// You can also change this using [`Self::style_mut_of`].
@@ -2109,7 +2205,7 @@ impl Context {
         });
     }
 
-    /// The [`crate::Visuals`] used by all subsequent windows, panels etc.
+    /// The [`crate::Visuals`] used by all subsequent popups, menus, etc.
     ///
     /// You can also use [`Ui::visuals_mut`] to change the visuals of a single [`Ui`].
     ///
@@ -2122,7 +2218,7 @@ impl Context {
         self.style_mut_of(theme, |style| style.visuals = visuals);
     }
 
-    /// The [`crate::Visuals`] used by all subsequent windows, panels etc.
+    /// The [`crate::Visuals`] used by all subsequent popups, menus, etc.
     ///
     /// You can also use [`Ui::visuals_mut`] to change the visuals of a single [`Ui`].
     ///
@@ -2269,7 +2365,7 @@ impl Context {
     ///
     /// You can show stats about the allocated textures using [`Self::texture_ui`].
     pub fn tex_manager(&self) -> Arc<RwLock<epaint::textures::TextureManager>> {
-        self.read(|ctx| ctx.tex_manager.0.clone())
+        self.read(|ctx| Arc::clone(&ctx.tex_manager.0))
     }
 
     // ---------------------------------------------------------------------
@@ -2301,15 +2397,14 @@ impl Context {
             crate::gui_zoom::zoom_with_keyboard(self);
         }
 
-        // Plugins run just before the pass ends.
-        let plugins = self.read(|ctx| ctx.plugins.ordered_plugins());
-        plugins.on_end_pass(self);
-
         #[cfg(debug_assertions)]
         self.debug_painting();
 
         let mut output = self.write(|ctx| ctx.end_pass());
+
+        let plugins = self.read(|ctx| ctx.plugins.ordered_plugins());
         plugins.on_output(&mut output);
+
         output
     }
 
@@ -2341,7 +2436,7 @@ impl Context {
             }
         };
 
-        if self.style().debug.show_interactive_widgets {
+        if self.global_style().debug.show_interactive_widgets {
             // Show all interactive widgets:
             let rects = self.write(|ctx| ctx.viewport().this_pass.widgets.clone());
             for (layer_id, rects) in rects.layers() {
@@ -2419,7 +2514,7 @@ impl Context {
             }
         }
 
-        if self.style().debug.show_widget_hits {
+        if self.global_style().debug.show_widget_hits {
             let hits = self.write(|ctx| ctx.viewport().hits.clone());
             let WidgetHits {
                 close,
@@ -2721,12 +2816,13 @@ impl Context {
     }
 
     /// How much space is still available after panels have been added.
+    #[deprecated = "Use content_rect (or viewport_rect) instead"]
     pub fn available_rect(&self) -> Rect {
         self.pass_state(|s| s.available_rect()).round_ui()
     }
 
-    /// How much space is used by panels and windows.
-    pub fn used_rect(&self) -> Rect {
+    /// How much space is used by windows and the top-level [`Ui`].
+    pub fn globally_used_rect(&self) -> Rect {
         self.write(|ctx| {
             let mut used = ctx.viewport().this_pass.used_by_panels;
             for (_id, window) in ctx.memory.areas().visible_windows() {
@@ -2736,17 +2832,24 @@ impl Context {
         })
     }
 
-    /// How much space is used by panels and windows.
+    /// How much space is used by windows and the top-level [`Ui`].
+    #[deprecated = "Renamed to globally_used_rect"]
+    pub fn used_rect(&self) -> Rect {
+        self.globally_used_rect()
+    }
+
+    /// How much space is used by windows and the top-level [`Ui`].
     ///
     /// You can shrink your egui area to this size and still fit all egui components.
+    #[deprecated = "Use globally_used_rect instead"]
     pub fn used_size(&self) -> Vec2 {
-        (self.used_rect().max - Pos2::ZERO).round_ui()
+        (self.globally_used_rect().max - Pos2::ZERO).round_ui()
     }
 
     // ---------------------------------------------------------------------
 
     /// Is the pointer (mouse/touch) over any egui area?
-    pub fn is_pointer_over_area(&self) -> bool {
+    pub fn is_pointer_over_egui(&self) -> bool {
         let pointer_pos = self.input(|i| i.pointer.interact_pos());
         if let Some(pointer_pos) = pointer_pos {
             if let Some(layer) = self.layer_id_at(pointer_pos) {
@@ -2763,29 +2866,60 @@ impl Context {
         }
     }
 
+    /// Is the pointer (mouse/touch) over any egui area?
+    #[deprecated = "Renamed to is_pointer_over_egui"]
+    pub fn is_pointer_over_area(&self) -> bool {
+        self.is_pointer_over_egui()
+    }
+
     /// True if egui is currently interested in the pointer (mouse or touch).
     ///
     /// Could be the pointer is hovering over a [`crate::Window`] or the user is dragging a widget.
     /// If `false`, the pointer is outside of any egui area and so
     /// you may be interested in what it is doing (e.g. controlling your game).
     /// Returns `false` if a drag started outside of egui and then moved over an egui area.
+    pub fn egui_wants_pointer_input(&self) -> bool {
+        self.egui_is_using_pointer()
+            || (self.is_pointer_over_egui() && !self.input(|i| i.pointer.any_down()))
+    }
+
+    /// True if egui is currently interested in the pointer (mouse or touch).
+    ///
+    /// Could be the pointer is hovering over a [`crate::Window`] or the user is dragging a widget.
+    /// If `false`, the pointer is outside of any egui area and so
+    /// you may be interested in what it is doing (e.g. controlling your game).
+    /// Returns `false` if a drag started outside of egui and then moved over an egui area.
+    #[deprecated = "Renamed to egui_wants_pointer_input"]
     pub fn wants_pointer_input(&self) -> bool {
-        self.is_using_pointer()
-            || (self.is_pointer_over_area() && !self.input(|i| i.pointer.any_down()))
+        self.egui_wants_pointer_input()
     }
 
     /// Is egui currently using the pointer position (e.g. dragging a slider)?
     ///
     /// NOTE: this will return `false` if the pointer is just hovering over an egui area.
-    pub fn is_using_pointer(&self) -> bool {
+    pub fn egui_is_using_pointer(&self) -> bool {
         self.memory(|m| m.interaction().is_using_pointer())
     }
 
+    /// Is egui currently using the pointer position (e.g. dragging a slider)?
+    ///
+    /// NOTE: this will return `false` if the pointer is just hovering over an egui area.
+    #[deprecated = "Renamed to egui_is_using_pointer"]
+    pub fn is_using_pointer(&self) -> bool {
+        self.egui_is_using_pointer()
+    }
+
     /// If `true`, egui is currently listening on text input (e.g. typing text in a [`crate::TextEdit`]).
-    pub fn wants_keyboard_input(&self) -> bool {
+    pub fn egui_wants_keyboard_input(&self) -> bool {
         self.memory(|m| m.focused().is_some())
     }
 
+    /// If `true`, egui is currently listening on text input (e.g. typing text in a [`crate::TextEdit`]).
+    #[deprecated = "Renamed to egui_wants_keyboard_input"]
+    pub fn wants_keyboard_input(&self) -> bool {
+        self.egui_wants_keyboard_input()
+    }
+
     /// Highlight this widget, to make it look like it is hovered, even if it isn't.
     ///
     /// If you call this after the widget has been fully rendered,
@@ -2800,7 +2934,7 @@ impl Context {
     ///
     /// This only works with the old, deprecated [`crate::menu`] API.
     #[expect(deprecated)]
-    #[deprecated = "Use `is_popup_open` instead"]
+    #[deprecated = "Use `any_popup_open` instead"]
     pub fn is_context_menu_open(&self) -> bool {
         self.data(|d| {
             d.get_temp::<crate::menu::BarState>(crate::menu::CONTEXT_MENU_ID_STR.into())
@@ -2811,6 +2945,18 @@ impl Context {
     /// Is a popup or (context) menu open?
     ///
     /// Will return false for [`crate::Tooltip`]s (which are technically popups as well).
+    pub fn any_popup_open(&self) -> bool {
+        self.pass_state_mut(|fs| {
+            fs.layers
+                .values()
+                .any(|layer| !layer.open_popups.is_empty())
+        })
+    }
+
+    /// Is a popup or (context) menu open?
+    ///
+    /// Will return false for [`crate::Tooltip`]s (which are technically popups as well).
+    #[deprecated = "Renamed to any_popup_open"]
     pub fn is_popup_open(&self) -> bool {
         self.pass_state_mut(|fs| {
             fs.layers
@@ -2836,7 +2982,7 @@ impl Context {
         self.input(|i| i.pointer.hover_pos())
     }
 
-    /// If you detect a click or drag and wants to know where it happened, use this.
+    /// If you detect a click or drag and want to know where it happened, use this.
     ///
     /// Latest position of the mouse, but ignoring any [`crate::Event::PointerGone`]
     /// if there were interactions this pass.
@@ -2909,7 +3055,7 @@ impl Context {
 
     /// Moves the given area to the top in its [`Order`].
     ///
-    /// [`crate::Area`]:s and [`crate::Window`]:s also do this automatically when being clicked on or interacted with.
+    /// [`crate::Area`]s and [`crate::Window`]s also do this automatically when being clicked on or interacted with.
     pub fn move_to_top(&self, layer_id: LayerId) {
         self.memory_mut(|mem| mem.areas_mut().move_to_top(layer_id));
     }
@@ -2991,7 +3137,7 @@ impl Context {
     /// The animation time is taken from [`Style::animation_time`].
     #[track_caller] // To track repaint cause
     pub fn animate_bool(&self, id: Id, value: bool) -> f32 {
-        let animation_time = self.style().animation_time;
+        let animation_time = self.global_style().animation_time;
         self.animate_bool_with_time_and_easing(id, value, animation_time, emath::easing::linear)
     }
 
@@ -3007,7 +3153,7 @@ impl Context {
     /// Like [`Self::animate_bool`] but allows you to control the easing function.
     #[track_caller] // To track repaint cause
     pub fn animate_bool_with_easing(&self, id: Id, value: bool, easing: fn(f32) -> f32) -> f32 {
-        let animation_time = self.style().animation_time;
+        let animation_time = self.global_style().animation_time;
         self.animate_bool_with_time_and_easing(id, value, animation_time, easing)
     }
 
@@ -3028,7 +3174,7 @@ impl Context {
     /// for a responsive start and a slow end.
     ///
     /// The easing function flips when `target_value` is `false`,
-    /// so that when going back towards 0.0, we get
+    /// so that when going back towards 0.0, we get the reverse behavior.
     #[track_caller] // To track repaint cause
     pub fn animate_bool_with_time_and_easing(
         &self,
@@ -3140,16 +3286,16 @@ impl Context {
 
                 ui.label("Is using pointer")
                     .on_hover_text("Is egui currently using the pointer actively (e.g. dragging a slider)?");
-                ui.monospace(self.is_using_pointer().to_string());
+                ui.monospace(self.egui_is_using_pointer().to_string());
                 ui.end_row();
 
                 ui.label("Wants pointer input")
                     .on_hover_text("Is egui currently interested in the location of the pointer (either because it is in use, or because it is hovering over a window).");
-                ui.monospace(self.wants_pointer_input().to_string());
+                ui.monospace(self.egui_wants_pointer_input().to_string());
                 ui.end_row();
 
                 ui.label("Wants keyboard input").on_hover_text("Is egui currently listening for text input?");
-                ui.monospace(self.wants_keyboard_input().to_string());
+                ui.monospace(self.egui_wants_keyboard_input().to_string());
                 ui.end_row();
 
                 ui.label("Keyboard focus widget").on_hover_text("Is egui currently listening for text input?");
@@ -3414,9 +3560,7 @@ impl Context {
                     let response =
                         ui.add(Label::new(RichText::new(text).monospace()).sense(Sense::click()));
                     if response.hovered() && is_visible {
-                        ui.ctx()
-                            .debug_painter()
-                            .debug_rect(area.rect(), Color32::RED, "");
+                        ui.debug_painter().debug_rect(area.rect(), Color32::RED, "");
                     }
                 } else {
                     ui.monospace(layer_id.short_debug_format());
@@ -3489,7 +3633,7 @@ impl Context {
     /// If AccessKit support is active for the current frame, get or create
     /// a node builder with the specified ID and return a mutable reference to it.
     /// For newly created nodes, the parent is the parent [`Ui`]s ID.
-    /// And an [`Ui`]s parent can be set with [`crate::UiBuilder::accessibility_parent`].
+    /// And an [`Ui`]s parent can be set with [`UiBuilder::accessibility_parent`].
     ///
     /// The `Context` lock is held while the given closure is called!
     ///
@@ -3500,14 +3644,7 @@ impl Context {
         id: Id,
         writer: impl FnOnce(&mut accesskit::Node) -> R,
     ) -> Option<R> {
-        self.write(|ctx| {
-            ctx.viewport()
-                .this_pass
-                .accesskit_state
-                .is_some()
-                .then(|| ctx.accesskit_node_builder(id))
-                .map(writer)
-        })
+        self.write(|ctx| ctx.accesskit_node_builder(id).map(writer))
     }
 
     pub(crate) fn register_accesskit_parent(&self, id: Id, parent_id: Id) {
@@ -3748,7 +3885,7 @@ impl Context {
 
     /// The loaders of bytes, images, and textures.
     pub fn loaders(&self) -> Arc<Loaders> {
-        self.read(|this| this.loaders.clone())
+        self.read(|this| Arc::clone(&this.loaders))
     }
 
     /// Returns `true` if any image is currently being loaded.
@@ -3875,21 +4012,23 @@ impl Context {
     ///
     /// If [`Context::embed_viewports`] is `true` (e.g. if the current egui
     /// backend does not support multiple viewports), the given callback
-    /// will be called immediately, embedding the new viewport in the current one.
-    /// You can check this with the [`ViewportClass`] given in the callback.
-    /// If you find [`ViewportClass::Embedded`], you need to create a new [`crate::Window`] for you content.
+    /// will be called immediately, embedding the new viewport in the current one,
+    /// inside of a [`crate::Window`].
+    /// You can know by checking for [`ViewportClass::EmbeddedWindow`].
     ///
     /// See [`crate::viewport`] for more information about viewports.
     pub fn show_viewport_deferred(
         &self,
         new_viewport_id: ViewportId,
         viewport_builder: ViewportBuilder,
-        viewport_ui_cb: impl Fn(&Self, ViewportClass) + Send + Sync + 'static,
+        viewport_ui_cb: impl Fn(&mut Ui, ViewportClass) + Send + Sync + 'static,
     ) {
         profiling::function_scope!();
 
         if self.embed_viewports() {
-            viewport_ui_cb(self, ViewportClass::Embedded);
+            crate::Window::from_viewport(new_viewport_id, viewport_builder).show(self, |ui| {
+                viewport_ui_cb(ui, ViewportClass::EmbeddedWindow);
+            });
         } else {
             self.write(|ctx| {
                 ctx.viewport_parents
@@ -3899,8 +4038,8 @@ impl Context {
                 viewport.class = ViewportClass::Deferred;
                 viewport.builder = viewport_builder;
                 viewport.used = true;
-                viewport.viewport_ui_cb = Some(Arc::new(move |ctx| {
-                    (viewport_ui_cb)(ctx, ViewportClass::Deferred);
+                viewport.viewport_ui_cb = Some(Arc::new(move |ui| {
+                    (viewport_ui_cb)(ui, ViewportClass::Deferred);
                 }));
             });
         }
@@ -3909,7 +4048,7 @@ impl Context {
     /// Show an immediate viewport, creating a new native window, if possible.
     ///
     /// This is the easier type of viewport to use, but it is less performant
-    /// at it requires both parent and child to repaint if any one of them needs repainting,
+    /// as it requires both parent and child to repaint if any one of them needs repainting,
     /// which effectively produce double work for two viewports, and triple work for three viewports, etc.
     /// To avoid this, use [`Self::show_viewport_deferred`] instead.
     ///
@@ -3927,28 +4066,32 @@ impl Context {
     ///
     /// If [`Context::embed_viewports`] is `true` (e.g. if the current egui
     /// backend does not support multiple viewports), the given callback
-    /// will be called immediately, embedding the new viewport in the current one.
-    /// You can check this with the [`ViewportClass`] given in the callback.
-    /// If you find [`ViewportClass::Embedded`], you need to create a new [`crate::Window`] for you content.
+    /// will be called immediately, embedding the new viewport in the current one,
+    /// inside of a [`crate::Window`].
+    /// You can know by checking for [`ViewportClass::EmbeddedWindow`].
     ///
     /// See [`crate::viewport`] for more information about viewports.
     pub fn show_viewport_immediate<T>(
         &self,
         new_viewport_id: ViewportId,
         builder: ViewportBuilder,
-        mut viewport_ui_cb: impl FnMut(&Self, ViewportClass) -> T,
+        mut viewport_ui_cb: impl FnMut(&mut Ui, ViewportClass) -> T,
     ) -> T {
         profiling::function_scope!();
 
         if self.embed_viewports() {
-            return viewport_ui_cb(self, ViewportClass::Embedded);
+            return self.show_embedded_viewport(new_viewport_id, builder, |ui| {
+                viewport_ui_cb(ui, ViewportClass::EmbeddedWindow)
+            });
         }
 
         IMMEDIATE_VIEWPORT_RENDERER.with(|immediate_viewport_renderer| {
             let immediate_viewport_renderer = immediate_viewport_renderer.borrow();
             let Some(immediate_viewport_renderer) = immediate_viewport_renderer.as_ref() else {
                 // This egui backend does not support multiple viewports.
-                return viewport_ui_cb(self, ViewportClass::Embedded);
+                return self.show_embedded_viewport(new_viewport_id, builder, |ui| {
+                    viewport_ui_cb(ui, ViewportClass::EmbeddedWindow)
+                });
             };
 
             let ids = self.write(|ctx| {
@@ -3972,8 +4115,8 @@ impl Context {
                 let viewport = ImmediateViewport {
                     ids,
                     builder,
-                    viewport_ui_cb: Box::new(move |context| {
-                        *out = Some(viewport_ui_cb(context, ViewportClass::Immediate));
+                    viewport_ui_cb: Box::new(move |ui| {
+                        *out = Some((viewport_ui_cb)(ui, ViewportClass::Immediate));
                     }),
                 };
 
@@ -3985,6 +4128,20 @@ impl Context {
             )
         })
     }
+
+    fn show_embedded_viewport<T>(
+        &self,
+        new_viewport_id: ViewportId,
+        builder: ViewportBuilder,
+        viewport_ui_cb: impl FnOnce(&mut Ui) -> T,
+    ) -> T {
+        crate::Window::from_viewport(new_viewport_id, builder)
+            .collapsible(false)
+            .show(self, |ui| viewport_ui_cb(ui))
+            .unwrap_or_else(|| panic!("Window did not show"))
+            .inner
+            .unwrap_or_else(|| panic!("Window was collapsed"))
+    }
 }
 
 /// ## Interaction
@@ -4008,7 +4165,7 @@ impl Context {
     /// Is this specific widget being dragged?
     ///
     /// A widget that sense both clicks and drags is only marked as "dragged"
-    /// when the mouse has moved a bit
+    /// when the mouse has moved a bit.
     ///
     /// See also: [`crate::Response::dragged`].
     pub fn is_being_dragged(&self, id: Id) -> bool {
@@ -4022,7 +4179,7 @@ impl Context {
         self.interaction_snapshot(|i| i.drag_started)
     }
 
-    /// This widget was being dragged, but was released this pass
+    /// This widget was being dragged, but was released this pass.
     pub fn drag_stopped_id(&self) -> Option<Id> {
         self.interaction_snapshot(|i| i.drag_stopped)
     }
@@ -4084,11 +4241,11 @@ mod test {
         // A single call, no request to discard:
         {
             let mut num_calls = 0;
-            let output = ctx.run(Default::default(), |ctx| {
+            let output = ctx.run_ui(Default::default(), |ui| {
                 num_calls += 1;
-                assert_eq!(ctx.output(|o| o.num_completed_passes), 0);
-                assert!(!ctx.output(|o| o.requested_discard()));
-                assert!(!ctx.will_discard());
+                assert_eq!(ui.output(|o| o.num_completed_passes), 0);
+                assert!(!ui.output(|o| o.requested_discard()));
+                assert!(!ui.will_discard());
             });
             assert_eq!(num_calls, 1);
             assert_eq!(output.platform_output.num_completed_passes, 1);
@@ -4098,10 +4255,10 @@ mod test {
         // A single call, with a denied request to discard:
         {
             let mut num_calls = 0;
-            let output = ctx.run(Default::default(), |ctx| {
+            let output = ctx.run_ui(Default::default(), |ui| {
                 num_calls += 1;
-                ctx.request_discard("test");
-                assert!(!ctx.will_discard(), "The request should have been denied");
+                ui.request_discard("test");
+                assert!(!ui.will_discard(), "The request should have been denied");
             });
             assert_eq!(num_calls, 1);
             assert_eq!(output.platform_output.num_completed_passes, 1);
@@ -4129,10 +4286,10 @@ mod test {
         // Normal single pass:
         {
             let mut num_calls = 0;
-            let output = ctx.run(Default::default(), |ctx| {
-                assert_eq!(ctx.output(|o| o.num_completed_passes), 0);
-                assert!(!ctx.output(|o| o.requested_discard()));
-                assert!(!ctx.will_discard());
+            let output = ctx.run_ui(Default::default(), |ui| {
+                assert_eq!(ui.output(|o| o.num_completed_passes), 0);
+                assert!(!ui.output(|o| o.requested_discard()));
+                assert!(!ui.will_discard());
                 num_calls += 1;
             });
             assert_eq!(num_calls, 1);
@@ -4143,13 +4300,13 @@ mod test {
         // Request discard once:
         {
             let mut num_calls = 0;
-            let output = ctx.run(Default::default(), |ctx| {
-                assert_eq!(ctx.output(|o| o.num_completed_passes), num_calls);
+            let output = ctx.run_ui(Default::default(), |ui| {
+                assert_eq!(ui.output(|o| o.num_completed_passes), num_calls);
 
-                assert!(!ctx.will_discard());
+                assert!(!ui.will_discard());
                 if num_calls == 0 {
-                    ctx.request_discard("test");
-                    assert!(ctx.will_discard());
+                    ui.request_discard("test");
+                    assert!(ui.will_discard());
                 }
 
                 num_calls += 1;
@@ -4165,15 +4322,15 @@ mod test {
         // Request discard twice:
         {
             let mut num_calls = 0;
-            let output = ctx.run(Default::default(), |ctx| {
-                assert_eq!(ctx.output(|o| o.num_completed_passes), num_calls);
+            let output = ctx.run_ui(Default::default(), |ui| {
+                assert_eq!(ui.output(|o| o.num_completed_passes), num_calls);
 
-                assert!(!ctx.will_discard());
-                ctx.request_discard("test");
+                assert!(!ui.will_discard());
+                ui.request_discard("test");
                 if num_calls == 0 {
-                    assert!(ctx.will_discard(), "First request granted");
+                    assert!(ui.will_discard(), "First request granted");
                 } else {
-                    assert!(!ctx.will_discard(), "Second request should be denied");
+                    assert!(!ui.will_discard(), "Second request should be denied");
                 }
 
                 num_calls += 1;
@@ -4195,13 +4352,13 @@ mod test {
         // Request discard three times:
         {
             let mut num_calls = 0;
-            let output = ctx.run(Default::default(), |ctx| {
-                assert_eq!(ctx.output(|o| o.num_completed_passes), num_calls);
+            let output = ctx.run_ui(Default::default(), |ui| {
+                assert_eq!(ui.output(|o| o.num_completed_passes), num_calls);
 
-                assert!(!ctx.will_discard());
+                assert!(!ui.will_discard());
                 if num_calls <= 2 {
-                    ctx.request_discard("test");
-                    assert!(ctx.will_discard());
+                    ui.request_discard("test");
+                    assert!(ui.will_discard());
                 }
 
                 num_calls += 1;
diff --git a/crates/egui/src/data/output.rs b/crates/egui/src/data/output.rs
index 2c6edba84..2d2c74430 100644
--- a/crates/egui/src/data/output.rs
+++ b/crates/egui/src/data/output.rs
@@ -679,6 +679,8 @@ impl WidgetInfo {
             WidgetType::Panel => "panel",
             WidgetType::ProgressIndicator => "progress indicator",
             WidgetType::Window => "window",
+            WidgetType::ScrollBar => "scroll bar",
+            WidgetType::ResizeHandle => "resize handle",
             WidgetType::Label | WidgetType::Other => "",
         };
 
diff --git a/crates/egui/src/debug_text.rs b/crates/egui/src/debug_text.rs
index cabde8c62..64d06ddac 100644
--- a/crates/egui/src/debug_text.rs
+++ b/crates/egui/src/debug_text.rs
@@ -5,7 +5,7 @@
 //! to get callbacks on certain events ([`Plugin::on_begin_pass`], [`Plugin::on_end_pass`]).
 
 use crate::{
-    Align, Align2, Color32, Context, FontFamily, FontId, Plugin, Rect, Shape, Vec2, WidgetText,
+    Align, Align2, Color32, Context, FontFamily, FontId, Plugin, Rect, Shape, Ui, Vec2, WidgetText,
     text,
 };
 
@@ -57,9 +57,9 @@ impl Plugin for DebugTextPlugin {
         "DebugTextPlugin"
     }
 
-    fn on_end_pass(&mut self, ctx: &Context) {
+    fn on_end_pass(&mut self, ui: &mut Ui) {
         let entries = std::mem::take(&mut self.entries);
-        Self::paint_entries(ctx, entries);
+        Self::paint_entries(ui, entries);
     }
 }
 
@@ -99,7 +99,7 @@ impl DebugTextPlugin {
                 let available_width = ctx.content_rect().max.x - pos.x;
                 let galley = text.into_galley_impl(
                     ctx,
-                    &ctx.style(),
+                    &ctx.global_style(),
                     text::TextWrapping::wrap_at_width(available_width),
                     font_id.clone().into(),
                     Align::TOP,
diff --git a/crates/egui/src/drag_and_drop.rs b/crates/egui/src/drag_and_drop.rs
index 21468ed46..305effec9 100644
--- a/crates/egui/src/drag_and_drop.rs
+++ b/crates/egui/src/drag_and_drop.rs
@@ -1,6 +1,6 @@
 use std::{any::Any, sync::Arc};
 
-use crate::{Context, CursorIcon, Plugin};
+use crate::{Context, CursorIcon, Plugin, Ui};
 
 /// Plugin for tracking drag-and-drop payload.
 ///
@@ -32,12 +32,12 @@ impl Plugin for DragAndDrop {
     /// Interrupt drag-and-drop if the user presses the escape key.
     ///
     /// This needs to happen at frame start so we can properly capture the escape key.
-    fn on_begin_pass(&mut self, ctx: &Context) {
+    fn on_begin_pass(&mut self, ui: &mut Ui) {
         let has_any_payload = self.payload.is_some();
 
         if has_any_payload {
             let abort_dnd_due_to_escape_key =
-                ctx.input_mut(|i| i.consume_key(crate::Modifiers::NONE, crate::Key::Escape));
+                ui.input_mut(|i| i.consume_key(crate::Modifiers::NONE, crate::Key::Escape));
 
             if abort_dnd_due_to_escape_key {
                 self.payload = None;
@@ -50,18 +50,18 @@ impl Plugin for DragAndDrop {
     /// This is a catch-all safety net in case user code doesn't capture the drag payload itself.
     /// This must happen at end-of-frame such that we don't shadow the mouse release event from user
     /// code.
-    fn on_end_pass(&mut self, ctx: &Context) {
+    fn on_end_pass(&mut self, ui: &mut Ui) {
         let has_any_payload = self.payload.is_some();
 
         if has_any_payload {
-            let abort_dnd_due_to_mouse_release = ctx.input_mut(|i| i.pointer.any_released());
+            let abort_dnd_due_to_mouse_release = ui.input_mut(|i| i.pointer.any_released());
 
             if abort_dnd_due_to_mouse_release {
                 self.payload = None;
             } else {
                 // We set the cursor icon only if its default, as the user code might have
                 // explicitly set it already.
-                ctx.output_mut(|o| {
+                ui.output_mut(|o| {
                     if o.cursor_icon == CursorIcon::Default {
                         o.cursor_icon = CursorIcon::Grabbing;
                     }
@@ -97,11 +97,7 @@ impl DragAndDrop {
     where
         Payload: Any + Send + Sync,
     {
-        ctx.plugin::<Self>()
-            .lock()
-            .payload
-            .as_ref()?
-            .clone()
+        Arc::clone(ctx.plugin::<Self>().lock().payload.as_ref()?)
             .downcast()
             .ok()
     }
diff --git a/crates/egui/src/grid.rs b/crates/egui/src/grid.rs
index 31f9e7a71..0cf5c95df 100644
--- a/crates/egui/src/grid.rs
+++ b/crates/egui/src/grid.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use emath::GuiRounding as _;
 
 use crate::{
@@ -102,7 +104,7 @@ impl GridLayout {
 
         Self {
             ctx: ui.ctx().clone(),
-            style: ui.style().clone(),
+            style: Arc::clone(ui.style()),
             id,
             is_first_frame,
             prev_state,
@@ -449,7 +451,7 @@ impl Grid {
 
             if ui.is_visible() {
                 // Try to cover up the glitchy initial frame:
-                ui.ctx().request_discard("new Grid");
+                ui.request_discard("new Grid");
             }
 
             // Hide the ui this frame, and make things as narrow as possible:
diff --git a/crates/egui/src/hit_test.rs b/crates/egui/src/hit_test.rs
index 954ff5d71..8fe962b36 100644
--- a/crates/egui/src/hit_test.rs
+++ b/crates/egui/src/hit_test.rs
@@ -2,7 +2,7 @@ use ahash::HashMap;
 
 use emath::TSTransform;
 
-use crate::{LayerId, Pos2, Rect, Sense, WidgetRect, WidgetRects, ahash, emath, id::IdSet};
+use crate::{LayerId, Pos2, Sense, WidgetRect, WidgetRects, ahash, emath, id::IdSet};
 
 /// Result of a hit-test against [`WidgetRects`].
 ///
@@ -201,7 +201,7 @@ fn contains_circle(interact_rect: emath::Rect, pos: Pos2, radius: f32) -> bool {
 }
 
 fn hit_test_on_close(close: &[WidgetRect], pos: Pos2) -> WidgetHits {
-    #![allow(clippy::collapsible_else_if)]
+    #![expect(clippy::collapsible_else_if)]
 
     // First find the best direct hits:
     let hit_click = find_closest_within(
@@ -361,7 +361,10 @@ fn hit_test_on_close(close: &[WidgetRect], pos: Pos2) -> WidgetHits {
 
         (Some(hit_click), Some(hit_drag)) => {
             // We have a perfect hit on both click and drag. Which is the topmost?
+            #[expect(clippy::unwrap_used)]
             let click_idx = close.iter().position(|w| *w == hit_click).unwrap();
+
+            #[expect(clippy::unwrap_used)]
             let drag_idx = close.iter().position(|w| *w == hit_drag).unwrap();
 
             let click_is_on_top_of_drag = drag_idx < click_idx;
@@ -424,16 +427,6 @@ fn find_closest_within(
 
         let dist_sq = widget.interact_rect.distance_sq_to_pos(pos);
 
-        if let Some(closest) = closest
-            && dist_sq == closest_dist_sq
-        {
-            // It's a tie! Pick the thin candidate over the thick one.
-            // This makes it easier to hit a thin resize-handle, for instance:
-            if should_prioritize_hits_on_back(closest.interact_rect, widget.interact_rect) {
-                continue;
-            }
-        }
-
         // In case of a tie, take the last one = the one on top.
         if dist_sq <= closest_dist_sq {
             closest_dist_sq = dist_sq;
@@ -444,27 +437,6 @@ fn find_closest_within(
     closest
 }
 
-/// Should we prioritize hits on `back` over those on `front`?
-///
-/// `back` should be behind the `front` widget.
-///
-/// Returns true if `back` is a small hit-target and `front` is not.
-fn should_prioritize_hits_on_back(back: Rect, front: Rect) -> bool {
-    if front.contains_rect(back) {
-        return false; // back widget is fully occluded; no way to hit it
-    }
-
-    // Reduce each rect to its width or height, whichever is smaller:
-    let back = back.width().min(back.height());
-    let front = front.width().min(front.height());
-
-    // These are hard-coded heuristics that could surely be improved.
-    let back_is_much_thinner = back <= 0.5 * front;
-    let back_is_thin = back <= 16.0;
-
-    back_is_much_thinner && back_is_thin
-}
-
 #[cfg(test)]
 mod tests {
     #![expect(clippy::print_stdout)]
diff --git a/crates/egui/src/input_state/mod.rs b/crates/egui/src/input_state/mod.rs
index 0c99b6ac3..bec4bec59 100644
--- a/crates/egui/src/input_state/mod.rs
+++ b/crates/egui/src/input_state/mod.rs
@@ -631,8 +631,10 @@ impl InputState {
     /// A positive Y-value indicates the content is being moved down, as when swiping down on a touch-screen or track-pad with natural scrolling.
     #[inline(always)]
     pub fn translation_delta(&self) -> Vec2 {
-        self.multi_touch()
-            .map_or(self.smooth_scroll_delta(), |touch| touch.translation_delta)
+        self.multi_touch().map_or_else(
+            || self.smooth_scroll_delta(),
+            |touch| touch.translation_delta,
+        )
     }
 
     /// True if there is an active scroll action that might scroll more when using [`Self::smooth_scroll_delta`].
@@ -1549,11 +1551,9 @@ impl InputState {
             options: _,
         } = self;
 
-        ui.style_mut()
-            .text_styles
-            .get_mut(&crate::TextStyle::Body)
-            .unwrap()
-            .family = crate::FontFamily::Monospace;
+        if let Some(style) = ui.style_mut().text_styles.get_mut(&crate::TextStyle::Body) {
+            style.family = crate::FontFamily::Monospace;
+        }
 
         ui.collapsing("Raw Input", |ui| raw.ui(ui));
 
diff --git a/crates/egui/src/input_state/touch_state.rs b/crates/egui/src/input_state/touch_state.rs
index 102b91fff..578e45e69 100644
--- a/crates/egui/src/input_state/touch_state.rs
+++ b/crates/egui/src/input_state/touch_state.rs
@@ -288,6 +288,7 @@ impl TouchState {
             // touch individually, and then calculate the average of all individual changes in
             // direction. But this approach cannot be implemented locally in this method, making
             // everything a bit more complicated.
+            #[expect(clippy::unwrap_used)] // guarded against already
             let first_touch = self.active_touches.values().next().unwrap();
             state.heading = (state.avg_pos - first_touch.pos).angle();
 
@@ -323,13 +324,14 @@ enum PinchType {
 
 impl PinchType {
     fn classify(touches: &BTreeMap<TouchId, ActiveTouch>) -> Self {
+        #![expect(clippy::unwrap_used)]
+
         // For non-proportional 2d zooming:
         // If the user is pinching with two fingers that have roughly the same Y coord,
         // then the Y zoom is unstable and should be 1.
         // Similarly, if the fingers are directly above/below each other,
         // we should only zoom on the Y axis.
         // If the fingers are roughly on a diagonal, we revert to the proportional zooming.
-
         if touches.len() == 2 {
             let mut touches = touches.values();
             let t0 = touches.next().unwrap().pos;
diff --git a/crates/egui/src/lib.rs b/crates/egui/src/lib.rs
index 43fa49b46..4f310ba8f 100644
--- a/crates/egui/src/lib.rs
+++ b/crates/egui/src/lib.rs
@@ -3,7 +3,7 @@
 //! Try the live web demo: <https://www.egui.rs/#demo>. Read more about egui at <https://github.com/emilk/egui>.
 //!
 //! `egui` is in heavy development, with each new version having breaking changes.
-//! You need to have rust 1.88.0 or later to use `egui`.
+//! You need to have rust 1.92.0 or later to use `egui`.
 //!
 //! To quickly get started with egui, you can take a look at [`eframe_template`](https://github.com/emilk/eframe_template)
 //! which uses [`eframe`](https://docs.rs/eframe).
@@ -43,23 +43,6 @@
 //! In some GUI frameworks this would require defining multiple types and functions with callbacks or message handlers,
 //! but thanks to `egui` being immediate mode everything is one self-contained function!
 //!
-//! ### Getting a [`Ui`]
-//!
-//! Use one of [`Panel`], [`CentralPanel`], [`Window`] or [`Area`] to
-//! get access to an [`Ui`] where you can put widgets. For example:
-//!
-//! ```
-//! # egui::__run_test_ctx(|ctx| {
-//! egui::CentralPanel::default().show(&ctx, |ui| {
-//!     ui.add(egui::Label::new("Hello World!"));
-//!     ui.label("A shorter and more convenient way to add a label.");
-//!     if ui.button("Click me").clicked() {
-//!         // take some action here
-//!     }
-//! });
-//! # });
-//! ```
-//!
 //! ### Quick start
 //!
 //! ```
@@ -195,7 +178,7 @@
 //! * lays out the letters `click me` in order to figure out the size of the button
 //! * decides where on screen to place the button
 //! * check if the mouse is hovering or clicking that location
-//! * chose button colors based on if it is being hovered or clicked
+//! * choose button colors based on if it is being hovered or clicked
 //! * add a [`Shape::Rect`] and [`Shape::Text`] to the list of shapes to be painted later this frame
 //! * return a [`Response`] with the [`clicked`](`Response::clicked`) member so the user can check for interactions
 //!
@@ -402,8 +385,8 @@
 //! egui apps can run significantly (~20%) faster by using a custom allocator, like [mimalloc](https://crates.io/crates/mimalloc) or [talc](https://crates.io/crates/talc).
 //!
 
-#![allow(clippy::float_cmp)]
-#![allow(clippy::manual_range_contains)]
+#![expect(clippy::float_cmp)]
+#![expect(clippy::manual_range_contains)]
 
 mod animation_manager;
 mod atomics;
@@ -511,7 +494,7 @@ pub use self::{
     ui_builder::UiBuilder,
     ui_stack::*,
     viewport::*,
-    widget_rect::{WidgetRect, WidgetRects},
+    widget_rect::{InteractOptions, WidgetRect, WidgetRects},
     widget_text::{RichText, WidgetText},
     widgets::*,
 };
@@ -680,6 +663,10 @@ pub enum WidgetType {
 
     Window,
 
+    ResizeHandle,
+
+    ScrollBar,
+
     /// If you cannot fit any of the above slots.
     ///
     /// If this is something you think should be added, file an issue.
@@ -692,8 +679,8 @@ pub enum WidgetType {
 pub fn __run_test_ctx(mut run_ui: impl FnMut(&Context)) {
     let ctx = Context::default();
     ctx.set_fonts(FontDefinitions::empty()); // prevent fonts from being loaded (save CPU time)
-    let _ = ctx.run(Default::default(), |ctx| {
-        run_ui(ctx);
+    let _ = ctx.run_ui(Default::default(), |ui| {
+        run_ui(ui.ctx());
     });
 }
 
@@ -701,10 +688,8 @@ pub fn __run_test_ctx(mut run_ui: impl FnMut(&Context)) {
 pub fn __run_test_ui(add_contents: impl Fn(&mut Ui)) {
     let ctx = Context::default();
     ctx.set_fonts(FontDefinitions::empty()); // prevent fonts from being loaded (save CPU time)
-    let _ = ctx.run(Default::default(), |ctx| {
-        crate::CentralPanel::default().show(ctx, |ui| {
-            add_contents(ui);
-        });
+    let _ = ctx.run_ui(Default::default(), |ui| {
+        add_contents(ui);
     });
 }
 
diff --git a/crates/egui/src/load.rs b/crates/egui/src/load.rs
index 1c74e5041..fd15322fb 100644
--- a/crates/egui/src/load.rs
+++ b/crates/egui/src/load.rs
@@ -609,7 +609,7 @@ impl Default for Loaders {
     fn default() -> Self {
         let include = Arc::new(DefaultBytesLoader::default());
         Self {
-            bytes: Mutex::new(vec![include.clone()]),
+            bytes: Mutex::new(vec![Arc::clone(&include) as _]),
             image: Mutex::new(Vec::new()),
             // By default we only include `DefaultTextureLoader`.
             texture: Mutex::new(vec![Arc::new(DefaultTextureLoader::default())]),
diff --git a/crates/egui/src/memory/mod.rs b/crates/egui/src/memory/mod.rs
index d215a3bec..defb14a39 100644
--- a/crates/egui/src/memory/mod.rs
+++ b/crates/egui/src/memory/mod.rs
@@ -21,7 +21,7 @@ pub use theme::{Theme, ThemePreference};
 /// how far the user has scrolled in a [`ScrollArea`](crate::ScrollArea) etc.
 ///
 /// If you want this to persist when closing your app, you should serialize [`Memory`] and store it.
-/// For this you need to enable the `persistence`.
+/// For this you need to enable the `persistence` feature.
 ///
 /// If you want to store data for your widgets, you should look at [`Memory::data`]
 #[derive(Clone, Debug)]
@@ -306,6 +306,8 @@ impl Default for Options {
             zoom_with_keyboard: true,
             tessellation_options: Default::default(),
             repaint_on_widget_change: false,
+
+            #[expect(clippy::unwrap_used)]
             max_passes: NonZeroUsize::new(2).unwrap(),
             screen_reader: false,
             warn_on_id_clash: cfg!(debug_assertions),
diff --git a/crates/egui/src/memory/theme.rs b/crates/egui/src/memory/theme.rs
index 555edaedd..c426cc93e 100644
--- a/crates/egui/src/memory/theme.rs
+++ b/crates/egui/src/memory/theme.rs
@@ -39,7 +39,7 @@ impl Theme {
     /// This is not the best design as it doesn't allow switching back to "follow system".
     #[must_use]
     pub(crate) fn small_toggle_button(self, ui: &mut crate::Ui) -> Option<Self> {
-        #![allow(clippy::collapsible_else_if)]
+        #![expect(clippy::collapsible_else_if)]
         if self == Self::Dark {
             if ui
                 .add(Button::new("☀").frame(false))
@@ -89,7 +89,7 @@ impl ThemePreference {
     /// Show radio-buttons to switch between light mode, dark mode and following the system theme.
     pub fn radio_buttons(&mut self, ui: &mut crate::Ui) {
         ui.horizontal(|ui| {
-            let system_theme = ui.ctx().input(|i| i.raw.system_theme);
+            let system_theme = ui.input(|i| i.raw.system_theme);
 
             ui.selectable_value(self, Self::System, "💻 System")
                 .on_hover_ui(|ui| {
diff --git a/crates/egui/src/menu.rs b/crates/egui/src/menu.rs
index e5fb04b0d..7c562d726 100644
--- a/crates/egui/src/menu.rs
+++ b/crates/egui/src/menu.rs
@@ -1,4 +1,4 @@
-#![allow(deprecated)]
+#![expect(deprecated)]
 //! Deprecated menu API - Use [`crate::containers::menu`] instead.
 //!
 //! Usage:
@@ -186,7 +186,7 @@ fn menu_popup<'c, R>(
         .kind(UiKind::Menu)
         .order(Order::Foreground)
         .fixed_pos(pos)
-        .default_width(ctx.style().spacing.menu_width)
+        .default_width(ctx.global_style().spacing.menu_width)
         .sense(Sense::hover());
 
     let mut sizing_pass = false;
@@ -198,7 +198,7 @@ fn menu_popup<'c, R>(
 
         Frame::menu(ui.style())
             .show(ui, |ui| {
-                ui.set_menu_state(Some(menu_state_arc.clone()));
+                ui.set_menu_state(Some(Arc::clone(menu_state_arc)));
                 ui.with_layout(Layout::top_down_justified(Align::LEFT), add_contents)
                     .inner
             })
@@ -395,9 +395,9 @@ impl MenuRoot {
             // or button hovered while other menu is open
             let mut pos = button.rect.left_bottom();
 
-            let menu_frame = Frame::menu(&button.ctx.style());
+            let menu_frame = Frame::menu(&button.ctx.global_style());
             pos.x -= menu_frame.total_margin().left; // Make fist button in menu align with the parent button
-            pos.y += button.ctx.style().spacing.menu_spacing;
+            pos.y += button.ctx.global_style().spacing.menu_spacing;
 
             if let Some(root) = root.inner.as_mut() {
                 let menu_rect = root.menu_state.read().rect;
@@ -701,7 +701,7 @@ impl MenuState {
         if self.moving_towards_current_submenu(&pointer) {
             // We don't close the submenu if the pointer is on its way to hover it.
             // ensure to repaint once even when pointer is not moving
-            ui.ctx().request_repaint();
+            ui.request_repaint();
         } else if !open && button.hovered() {
             // TODO(emilk): open menu to the left if there isn't enough space to the right
             let mut pos = button.rect.right_top();
diff --git a/crates/egui/src/painter.rs b/crates/egui/src/painter.rs
index f121c8557..b01d673e4 100644
--- a/crates/egui/src/painter.rs
+++ b/crates/egui/src/painter.rs
@@ -322,7 +322,7 @@ impl Painter {
     }
 
     pub fn error(&self, pos: Pos2, text: impl std::fmt::Display) -> Rect {
-        let color = self.ctx.style().visuals.error_fg_color;
+        let color = self.ctx.global_style().visuals.error_fg_color;
         self.debug_text(pos, Align2::LEFT_TOP, color, format!("🔥 {text}"))
     }
 
diff --git a/crates/egui/src/pass_state.rs b/crates/egui/src/pass_state.rs
index 9b323bfa0..56564541d 100644
--- a/crates/egui/src/pass_state.rs
+++ b/crates/egui/src/pass_state.rs
@@ -95,7 +95,7 @@ impl DebugRect {
         // Paint rectangle around widget:
         {
             // Print width and height:
-            let text_color = if ctx.style().visuals.dark_mode {
+            let text_color = if ctx.global_style().visuals.dark_mode {
                 Color32::WHITE
             } else {
                 Color32::BLACK
diff --git a/crates/egui/src/plugin.rs b/crates/egui/src/plugin.rs
index 80afc4510..3967e737d 100644
--- a/crates/egui/src/plugin.rs
+++ b/crates/egui/src/plugin.rs
@@ -1,4 +1,4 @@
-use crate::{Context, FullOutput, RawInput};
+use crate::{Context, FullOutput, RawInput, Ui};
 use ahash::HashMap;
 use epaint::mutex::{Mutex, MutexGuard};
 use std::sync::Arc;
@@ -23,13 +23,13 @@ pub trait Plugin: Send + Sync + std::any::Any + 'static {
 
     /// Called at the start of each pass.
     ///
-    /// Can be used to show ui, e.g. a [`crate::Window`] or [`crate::SidePanel`].
-    fn on_begin_pass(&mut self, ctx: &Context) {}
+    /// Can be used to show ui, e.g. a [`crate::Window`] or [`crate::Panel`].
+    fn on_begin_pass(&mut self, ui: &mut Ui) {}
 
     /// Called at the end of each pass.
     ///
     /// Can be used to show ui, e.g. a [`crate::Window`].
-    fn on_end_pass(&mut self, ctx: &Context) {}
+    fn on_end_pass(&mut self, ui: &mut Ui) {}
 
     /// Called just before the input is processed.
     ///
@@ -147,17 +147,17 @@ impl PluginsOrdered {
         }
     }
 
-    pub fn on_begin_pass(&self, ctx: &Context) {
+    pub fn on_begin_pass(&self, ui: &mut Ui) {
         profiling::scope!("plugins", "on_begin_pass");
         self.for_each_dyn(|p| {
-            p.on_begin_pass(ctx);
+            p.on_begin_pass(ui);
         });
     }
 
-    pub fn on_end_pass(&self, ctx: &Context) {
+    pub fn on_end_pass(&self, ui: &mut Ui) {
         profiling::scope!("plugins", "on_end_pass");
         self.for_each_dyn(|p| {
-            p.on_end_pass(ctx);
+            p.on_end_pass(ui);
         });
     }
 
@@ -202,7 +202,7 @@ impl Plugins {
             return false;
         }
 
-        self.plugins.insert(type_id, handle.clone());
+        self.plugins.insert(type_id, Arc::clone(&handle));
         self.plugins_ordered.0.push(handle);
 
         true
@@ -214,7 +214,7 @@ impl Plugins {
 }
 
 /// Generic event callback.
-pub type ContextCallback = Arc<dyn Fn(&Context) + Send + Sync>;
+pub type ContextCallback = Arc<dyn Fn(&mut Ui) + Send + Sync>;
 
 #[derive(Default)]
 pub(crate) struct CallbackPlugin {
@@ -227,21 +227,21 @@ impl Plugin for CallbackPlugin {
         "CallbackPlugins"
     }
 
-    fn on_begin_pass(&mut self, ctx: &Context) {
+    fn on_begin_pass(&mut self, ui: &mut Ui) {
         profiling::function_scope!();
 
         for (_debug_name, cb) in &self.on_begin_plugins {
             profiling::scope!("on_begin_pass", *_debug_name);
-            (cb)(ctx);
+            (cb)(ui);
         }
     }
 
-    fn on_end_pass(&mut self, ctx: &Context) {
+    fn on_end_pass(&mut self, ui: &mut Ui) {
         profiling::function_scope!();
 
         for (_debug_name, cb) in &self.on_end_plugins {
             profiling::scope!("on_end_pass", *_debug_name);
-            (cb)(ctx);
+            (cb)(ui);
         }
     }
 }
diff --git a/crates/egui/src/response.rs b/crates/egui/src/response.rs
index e89cb5252..495d5dcdf 100644
--- a/crates/egui/src/response.rs
+++ b/crates/egui/src/response.rs
@@ -14,7 +14,7 @@ use crate::{
 /// It also lets you easily show a tooltip on hover.
 ///
 /// Whenever something gets added to a [`Ui`], a [`Response`] object is returned.
-/// [`ui.add`] returns a [`Response`], as does [`ui.button`], and all similar shortcuts.
+/// [`Ui::add`] returns a [`Response`], as does [`Ui::button`], and all similar shortcuts.
 ///
 /// ⚠️ The `Response` contains a clone of [`Context`], and many methods lock the `Context`.
 /// It can therefore be a deadlock to use `Context` from within a context-locking closures,
@@ -433,7 +433,7 @@ impl Response {
     pub fn drag_motion(&self) -> Vec2 {
         if self.dragged() {
             self.ctx
-                .input(|i| i.pointer.motion().unwrap_or(i.pointer.delta()))
+                .input(|i| i.pointer.motion().unwrap_or_else(|| i.pointer.delta()))
         } else {
             Vec2::ZERO
         }
@@ -472,7 +472,7 @@ impl Response {
     ///
     /// Only returns something if [`Self::contains_pointer`] is true,
     /// the user is drag-dropping something of this type,
-    /// and they released it this frame
+    /// and they released it this frame.
     #[doc(alias = "drag and drop")]
     pub fn dnd_release_payload<Payload: Any + Send + Sync>(&self) -> Option<Arc<Payload>> {
         // NOTE: we use `response.contains_pointer` here instead of `hovered`, because
@@ -738,6 +738,7 @@ impl Response {
                 enabled: self.enabled(),
             },
             true,
+            Default::default(),
         )
     }
 
@@ -761,7 +762,7 @@ impl Response {
     /// # });
     /// ```
     pub fn scroll_to_me(&self, align: Option<Align>) {
-        self.scroll_to_me_animation(align, self.ctx.style().scroll_animation);
+        self.scroll_to_me_animation(align, self.ctx.global_style().scroll_animation);
     }
 
     /// Like [`Self::scroll_to_me`], but allows you to specify the [`crate::style::ScrollAnimation`].
@@ -871,6 +872,10 @@ impl Response {
             WidgetType::Panel => Role::Pane,
             WidgetType::ProgressIndicator => Role::ProgressIndicator,
             WidgetType::Window => Role::Window,
+
+            WidgetType::ResizeHandle => Role::Splitter,
+            WidgetType::ScrollBar => Role::ScrollBar,
+
             WidgetType::Other => Role::Unknown,
         });
         if !info.enabled {
diff --git a/crates/egui/src/style.rs b/crates/egui/src/style.rs
index b77536002..f94b9d345 100644
--- a/crates/egui/src/style.rs
+++ b/crates/egui/src/style.rs
@@ -1,9 +1,7 @@
 //! egui theme (spacing, colors, etc).
 
-#![allow(clippy::if_same_then_else)]
-
 use emath::Align;
-use epaint::{AlphaFromCoverage, CornerRadius, Shadow, Stroke, text::FontTweak};
+use epaint::{AlphaFromCoverage, CornerRadius, Shadow, Stroke, TextOptions, text::FontTweak};
 use std::{collections::BTreeMap, ops::RangeInclusive, sync::Arc};
 
 use crate::{
@@ -948,8 +946,11 @@ pub struct Visuals {
     /// this is more to provide a convenient summary of the rest of the settings.
     pub dark_mode: bool,
 
-    /// ADVANCED: Controls how we render text.
-    pub text_alpha_from_coverage: AlphaFromCoverage,
+    /// Controls how we render text.
+    ///
+    /// The [`TextOptions::max_texture_side`] is ignored and overruled by
+    /// [`crate::RawInput::max_texture_side`].
+    pub text_options: TextOptions,
 
     /// Override default text color for all text.
     ///
@@ -1233,6 +1234,11 @@ pub struct WidgetVisuals {
     pub fg_stroke: Stroke,
 
     /// Make the frame this much larger.
+    ///
+    /// The problem with "expanding" widgets is that they now want to paint outside their own bounds,
+    /// which then requires all parent UIs to have proper margins.
+    ///
+    /// It also means hovered things are no longer properly aligned with every other widget.
     pub expansion: f32,
 }
 
@@ -1391,7 +1397,7 @@ impl Default for Interaction {
     fn default() -> Self {
         Self {
             interact_radius: 5.0,
-            resize_grab_radius_side: 5.0,
+            resize_grab_radius_side: 3.0,
             resize_grab_radius_corner: 10.0,
             show_tooltips_only_when_still: true,
             tooltip_delay: 0.5,
@@ -1407,7 +1413,10 @@ impl Visuals {
     pub fn dark() -> Self {
         Self {
             dark_mode: true,
-            text_alpha_from_coverage: AlphaFromCoverage::DARK_MODE_DEFAULT,
+            text_options: TextOptions {
+                alpha_from_coverage: AlphaFromCoverage::DARK_MODE_DEFAULT,
+                ..Default::default()
+            },
             override_text_color: None,
             weak_text_alpha: 0.6,
             weak_text_color: None,
@@ -1470,7 +1479,10 @@ impl Visuals {
     pub fn light() -> Self {
         Self {
             dark_mode: false,
-            text_alpha_from_coverage: AlphaFromCoverage::LIGHT_MODE_DEFAULT,
+            text_options: TextOptions {
+                alpha_from_coverage: AlphaFromCoverage::LIGHT_MODE_DEFAULT,
+                ..Default::default()
+            },
             widgets: Widgets::light(),
             selection: Selection::light(),
             hyperlink_color: Color32::from_rgb(0, 155, 255),
@@ -1561,7 +1573,7 @@ impl Widgets {
                 bg_stroke: Stroke::new(1.0, Color32::from_gray(150)), // e.g. hover over window edge or button
                 fg_stroke: Stroke::new(1.5, Color32::from_gray(240)),
                 corner_radius: CornerRadius::same(3),
-                expansion: 1.0,
+                expansion: 0.0,
             },
             active: WidgetVisuals {
                 weak_bg_fill: Color32::from_gray(55),
@@ -1569,7 +1581,7 @@ impl Widgets {
                 bg_stroke: Stroke::new(1.0, Color32::WHITE),
                 fg_stroke: Stroke::new(2.0, Color32::WHITE),
                 corner_radius: CornerRadius::same(2),
-                expansion: 1.0,
+                expansion: 0.0,
             },
             open: WidgetVisuals {
                 weak_bg_fill: Color32::from_gray(45),
@@ -1606,7 +1618,7 @@ impl Widgets {
                 bg_stroke: Stroke::new(1.0, Color32::from_gray(105)), // e.g. hover over window edge or button
                 fg_stroke: Stroke::new(1.5, Color32::BLACK),
                 corner_radius: CornerRadius::same(3),
-                expansion: 1.0,
+                expansion: 0.0,
             },
             active: WidgetVisuals {
                 weak_bg_fill: Color32::from_gray(165),
@@ -1614,7 +1626,7 @@ impl Widgets {
                 bg_stroke: Stroke::new(1.0, Color32::BLACK),
                 fg_stroke: Stroke::new(2.0, Color32::BLACK),
                 corner_radius: CornerRadius::same(2),
-                expansion: 1.0,
+                expansion: 0.0,
             },
             open: WidgetVisuals {
                 weak_bg_fill: Color32::from_gray(220),
@@ -2107,7 +2119,7 @@ impl Visuals {
     pub fn ui(&mut self, ui: &mut crate::Ui) {
         let Self {
             dark_mode,
-            text_alpha_from_coverage,
+            text_options,
             override_text_color: _,
             weak_text_alpha,
             weak_text_color,
@@ -2207,7 +2219,7 @@ impl Visuals {
                 });
         });
 
-        ui.collapsing("Text color", |ui| {
+        ui.collapsing("Text rendering", |ui| {
             fn ui_text_color(ui: &mut Ui, color: &mut Color32, label: impl Into<RichText>) {
                 ui.label(label.into().color(*color));
                 ui.color_edit_button_srgba(color);
@@ -2259,7 +2271,15 @@ impl Visuals {
 
             ui.add_space(4.0);
 
-            text_alpha_from_coverage_ui(ui, text_alpha_from_coverage);
+            let TextOptions {
+                max_texture_side: _,
+                alpha_from_coverage,
+                font_hinting,
+            } = text_options;
+
+            text_alpha_from_coverage_ui(ui, alpha_from_coverage);
+
+            ui.checkbox(font_hinting, "Enable font hinting");
         });
 
         ui.collapsing("Text cursor", |ui| {
@@ -2370,9 +2390,9 @@ impl Visuals {
     }
 }
 
-fn text_alpha_from_coverage_ui(ui: &mut Ui, text_alpha_from_coverage: &mut AlphaFromCoverage) {
+fn text_alpha_from_coverage_ui(ui: &mut Ui, alpha_from_coverage: &mut AlphaFromCoverage) {
     let mut dark_mode_special =
-        *text_alpha_from_coverage == AlphaFromCoverage::TwoCoverageMinusCoverageSq;
+        *alpha_from_coverage == AlphaFromCoverage::TwoCoverageMinusCoverageSq;
 
     ui.horizontal(|ui| {
         ui.label("Text rendering:");
@@ -2380,9 +2400,9 @@ fn text_alpha_from_coverage_ui(ui: &mut Ui, text_alpha_from_coverage: &mut Alpha
         ui.checkbox(&mut dark_mode_special, "Dark-mode special");
 
         if dark_mode_special {
-            *text_alpha_from_coverage = AlphaFromCoverage::TwoCoverageMinusCoverageSq;
+            *alpha_from_coverage = AlphaFromCoverage::DARK_MODE_DEFAULT;
         } else {
-            let mut gamma = match text_alpha_from_coverage {
+            let mut gamma = match alpha_from_coverage {
                 AlphaFromCoverage::Linear => 1.0,
                 AlphaFromCoverage::Gamma(gamma) => *gamma,
                 AlphaFromCoverage::TwoCoverageMinusCoverageSq => 0.5, // approximately the same
@@ -2396,9 +2416,9 @@ fn text_alpha_from_coverage_ui(ui: &mut Ui, text_alpha_from_coverage: &mut Alpha
             );
 
             if gamma == 1.0 {
-                *text_alpha_from_coverage = AlphaFromCoverage::Linear;
+                *alpha_from_coverage = AlphaFromCoverage::Linear;
             } else {
-                *text_alpha_from_coverage = AlphaFromCoverage::Gamma(gamma);
+                *alpha_from_coverage = AlphaFromCoverage::Gamma(gamma);
             }
         }
     });
@@ -2812,6 +2832,7 @@ impl Widget for &mut FontTweak {
                     scale,
                     y_offset_factor,
                     y_offset,
+                    hinting_override,
                 } = self;
 
                 ui.label("Scale");
@@ -2827,6 +2848,19 @@ impl Widget for &mut FontTweak {
                 ui.add(DragValue::new(y_offset).speed(-0.02));
                 ui.end_row();
 
+                ui.label("hinting_override");
+                ComboBox::from_id_salt("hinting_override")
+                    .selected_text(match hinting_override {
+                        None => "None",
+                        Some(true) => "Enable",
+                        Some(false) => "Disable",
+                    })
+                    .show_ui(ui, |ui| {
+                        ui.selectable_value(hinting_override, None, "None");
+                        ui.selectable_value(hinting_override, Some(true), "Enable");
+                        ui.selectable_value(hinting_override, Some(false), "Disable");
+                    });
+
                 if ui.button("Reset").clicked() {
                     *self = Default::default();
                 }
diff --git a/crates/egui/src/text_selection/label_text_selection.rs b/crates/egui/src/text_selection/label_text_selection.rs
index bc2884441..1dc825ad3 100644
--- a/crates/egui/src/text_selection/label_text_selection.rs
+++ b/crates/egui/src/text_selection/label_text_selection.rs
@@ -128,8 +128,8 @@ impl Plugin for LabelSelectionState {
         "LabelSelectionState"
     }
 
-    fn on_begin_pass(&mut self, ctx: &Context) {
-        if ctx.input(|i| i.pointer.any_pressed() && !i.modifiers.shift) {
+    fn on_begin_pass(&mut self, ui: &mut Ui) {
+        if ui.input(|i| i.pointer.any_pressed() && !i.modifiers.shift) {
             // Maybe a new selection is about to begin, but the old one is over:
             // state.selection = None; // TODO(emilk): this makes sense, but doesn't work as expected.
         }
@@ -145,9 +145,9 @@ impl Plugin for LabelSelectionState {
         self.painted_selections.clear();
     }
 
-    fn on_end_pass(&mut self, ctx: &Context) {
+    fn on_end_pass(&mut self, ui: &mut Ui) {
         if self.is_dragging {
-            ctx.set_cursor_icon(CursorIcon::Text);
+            ui.set_cursor_icon(CursorIcon::Text);
         }
 
         if !self.has_reached_primary || !self.has_reached_secondary {
@@ -159,7 +159,7 @@ impl Plugin for LabelSelectionState {
             if let Some(selection) = prev_selection {
                 // This was the first frame of glitch, so hide the
                 // glitching by removing all painted selections:
-                ctx.graphics_mut(|layers| {
+                ui.graphics_mut(|layers| {
                     if let Some(list) = layers.get_mut(selection.layer_id) {
                         for (shape_idx, row_selections) in self.painted_selections.drain(..) {
                             list.mutate_shape(shape_idx, |shape| {
@@ -190,21 +190,21 @@ impl Plugin for LabelSelectionState {
             }
         }
 
-        let pressed_escape = ctx.input(|i| i.key_pressed(crate::Key::Escape));
-        let clicked_something_else = ctx.input(|i| i.pointer.any_pressed()) && !self.any_hovered;
+        let pressed_escape = ui.input(|i| i.key_pressed(crate::Key::Escape));
+        let clicked_something_else = ui.input(|i| i.pointer.any_pressed()) && !self.any_hovered;
         let delected_everything = pressed_escape || clicked_something_else;
 
         if delected_everything {
             self.selection = None;
         }
 
-        if ctx.input(|i| i.pointer.any_released()) {
+        if ui.input(|i| i.pointer.any_released()) {
             self.is_dragging = false;
         }
 
         let text_to_copy = std::mem::take(&mut self.text_to_copy);
         if !text_to_copy.is_empty() {
-            ctx.copy_text(text_to_copy);
+            ui.copy_text(text_to_copy);
         }
     }
 }
@@ -499,7 +499,7 @@ impl LabelSelectionState {
         let global_from_galley = global_from_layer * layer_from_galley;
 
         if response.hovered() {
-            ui.ctx().set_cursor_icon(CursorIcon::Text);
+            ui.set_cursor_icon(CursorIcon::Text);
         }
 
         self.any_hovered |= response.hovered();
diff --git a/crates/egui/src/text_selection/text_cursor_state.rs b/crates/egui/src/text_selection/text_cursor_state.rs
index 2a02e4577..9c9b0a263 100644
--- a/crates/egui/src/text_selection/text_cursor_state.rs
+++ b/crates/egui/src/text_selection/text_cursor_state.rs
@@ -208,25 +208,33 @@ fn ccursor_previous_line(text: &str, ccursor: CCursor) -> CCursor {
     }
 }
 
-fn next_word_boundary_char_index(text: &str, index: usize) -> usize {
-    for word in text.split_word_bound_indices() {
+fn next_word_boundary_char_index(text: &str, cursor_ci: usize) -> usize {
+    for (word_byte_index, word) in text.split_word_bound_indices() {
+        let word_ci = char_index_from_byte_index(text, word_byte_index);
+
+        // We consider `.` a word boundary.
+        // At least that's how Mac works when navigating something like `www.example.com`.
+        for (dot_ci_offset, chr) in word.chars().enumerate() {
+            let dot_ci = word_ci + dot_ci_offset;
+            if chr == '.' && cursor_ci < dot_ci {
+                return dot_ci;
+            }
+        }
+
         // Splitting considers contiguous whitespace as one word, such words must be skipped,
         // this handles cases for example ' abc' (a space and a word), the cursor is at the beginning
         // (before space) - this jumps at the end of 'abc' (this is consistent with text editors
         // or browsers)
-        let ci = char_index_from_byte_index(text, word.0);
-        if ci > index && !skip_word(word.1) {
-            return ci;
+        if cursor_ci < word_ci && !all_word_chars(word) {
+            return word_ci;
         }
     }
 
     char_index_from_byte_index(text, text.len())
 }
 
-fn skip_word(text: &str) -> bool {
-    // skip words that contain anything other than alphanumeric characters and underscore
-    // (i.e. whitespace, dashes, etc.)
-    !text.chars().any(|c| !is_word_char(c))
+fn all_word_chars(text: &str) -> bool {
+    text.chars().all(is_word_char)
 }
 
 fn next_line_boundary_char_index(it: impl Iterator<Item = char>, mut index: usize) -> usize {
@@ -337,6 +345,12 @@ mod test {
         assert_eq!(next_word_boundary_char_index("", 0), 0);
         assert_eq!(next_word_boundary_char_index("", 1), 0);
 
+        // ASCII only
+        let text = "abc.def.ghi";
+        assert_eq!(next_word_boundary_char_index(text, 1), 3);
+        assert_eq!(next_word_boundary_char_index(text, 3), 7);
+        assert_eq!(next_word_boundary_char_index(text, 7), 11);
+
         // Unicode graphemes, some of which consist of multiple Unicode characters,
         // !!! Unicode character is not always what is tranditionally considered a character,
         // the values below are correct despite not seeming that way on the first look,
diff --git a/crates/egui/src/text_selection/visuals.rs b/crates/egui/src/text_selection/visuals.rs
index 50bb1a34d..fead390fe 100644
--- a/crates/egui/src/text_selection/visuals.rs
+++ b/crates/egui/src/text_selection/visuals.rs
@@ -172,7 +172,7 @@ pub fn paint_text_cursor(
             total_duration - time_in_cycle
         };
 
-        ui.ctx().request_repaint_after_secs(wake_in);
+        ui.request_repaint_after_secs(wake_in);
     } else {
         paint_cursor_end(painter, ui.visuals(), primary_cursor_rect);
     }
diff --git a/crates/egui/src/ui.rs b/crates/egui/src/ui.rs
index 3c7fca2f3..daabd10b0 100644
--- a/crates/egui/src/ui.rs
+++ b/crates/egui/src/ui.rs
@@ -1,34 +1,13 @@
 #![warn(missing_docs)] // Let's keep `Ui` well-documented.
-#![allow(clippy::use_self)]
+#![expect(clippy::use_self)]
+
+use std::{any::Any, hash::Hash, ops::Deref, sync::Arc};
 
 use emath::GuiRounding as _;
 use epaint::mutex::RwLock;
-use epaint::text::FontsView;
-use std::{any::Any, hash::Hash, sync::Arc};
 
-use crate::ClosableTag;
-#[cfg(debug_assertions)]
-use crate::Stroke;
 use crate::containers::menu;
-use crate::{
-    Align, Color32, Context, CursorIcon, DragAndDrop, Id, InnerResponse, InputState, IntoAtoms,
-    LayerId, Memory, Order, Painter, PlatformOutput, Pos2, Rangef, Rect, Response, Rgba, RichText,
-    Sense, Style, TextStyle, TextWrapMode, UiBuilder, UiKind, UiStack, UiStackInfo, Vec2,
-    WidgetRect, WidgetText,
-    containers::{CollapsingHeader, CollapsingResponse, Frame},
-    ecolor::Hsva,
-    emath, epaint, grid,
-    layout::{Direction, Layout},
-    pass_state,
-    placer::Placer,
-    pos2, style,
-    util::IdTypeMap,
-    vec2, widgets,
-    widgets::{
-        Button, Checkbox, DragValue, Hyperlink, Image, ImageSource, Label, Link, RadioButton,
-        Separator, Spinner, TextEdit, Widget, color_picker,
-    },
-};
+use crate::{containers::*, ecolor::*, layout::*, placer::Placer, widgets::*, *};
 // ----------------------------------------------------------------------------
 
 /// This is what you use to place widgets.
@@ -74,14 +53,14 @@ pub struct Ui {
     /// This value is based on where in the hierarchy of widgets this Ui is in,
     /// and the value is increment with each added child widget.
     /// This works as an Id source only as long as new widgets aren't added or removed.
-    /// They are therefore only good for Id:s that has no state.
+    /// They are therefore only good for Id:s that have no state.
     next_auto_id_salt: u64,
 
     /// Specifies paint layer, clip rectangle and a reference to [`Context`].
     painter: Painter,
 
     /// The [`Style`] (visuals, spacing, etc) of this ui.
-    /// Commonly many [`Ui`]:s share the same [`Style`].
+    /// Commonly many [`Ui`]s share the same [`Style`].
     /// The [`Ui`] implements copy-on-write for this.
     style: Arc<Style>,
 
@@ -112,6 +91,16 @@ pub struct Ui {
     min_rect_already_remembered: bool,
 }
 
+/// Allow using [`Ui`] like a [`Context`].
+impl Deref for Ui {
+    type Target = Context;
+
+    #[inline]
+    fn deref(&self) -> &Self::Target {
+        self.ctx()
+    }
+}
+
 impl Ui {
     // ------------------------------------------------------------------------
     // Creation:
@@ -136,7 +125,7 @@ impl Ui {
             accessibility_parent,
         } = ui_builder;
 
-        let layer_id = layer_id.unwrap_or(LayerId::background());
+        let layer_id = layer_id.unwrap_or_else(LayerId::background);
 
         debug_assert!(
             id_salt.is_none(),
@@ -147,8 +136,8 @@ impl Ui {
         let clip_rect = max_rect;
         let layout = layout.unwrap_or_default();
         let disabled = disabled || invisible;
-        let style = style.unwrap_or_else(|| ctx.style());
-        let sense = sense.unwrap_or(Sense::hover());
+        let style = style.unwrap_or_else(|| ctx.global_style());
+        let sense = sense.unwrap_or_else(Sense::hover);
 
         let placer = Placer::new(max_rect, layout);
         let ui_stack = UiStack {
@@ -191,6 +180,7 @@ impl Ui {
                 enabled: ui.enabled,
             },
             true,
+            Default::default(),
         );
 
         if disabled {
@@ -277,7 +267,7 @@ impl Ui {
 
         let id_salt = id_salt.unwrap_or_else(|| Id::from("child"));
         let max_rect = max_rect.unwrap_or_else(|| self.available_rect_before_wrap());
-        let mut layout = layout.unwrap_or(*self.layout());
+        let mut layout = layout.unwrap_or_else(|| *self.layout());
         let enabled = self.enabled && !disabled && !invisible;
         if let Some(layer_id) = layer_id {
             painter.set_layer_id(layer_id);
@@ -286,8 +276,8 @@ impl Ui {
             painter.set_invisible();
         }
         let sizing_pass = self.sizing_pass || sizing_pass;
-        let style = style.unwrap_or_else(|| self.style.clone());
-        let sense = sense.unwrap_or(Sense::hover());
+        let style = style.unwrap_or_else(|| Arc::clone(&self.style));
+        let sense = sense.unwrap_or_else(Sense::hover);
 
         if sizing_pass {
             // During the sizing pass we want widgets to use up as little space as possible,
@@ -316,7 +306,7 @@ impl Ui {
             id: unique_id,
             layout_direction: layout.main_dir,
             info: ui_stack_info,
-            parent: Some(self.stack.clone()),
+            parent: Some(Arc::clone(&self.stack)),
             min_rect: placer.min_rect(),
             max_rect: placer.max_rect(),
         };
@@ -356,6 +346,7 @@ impl Ui {
                 enabled: child_ui.enabled,
             },
             true,
+            Default::default(),
         );
 
         child_ui
@@ -428,7 +419,7 @@ impl Ui {
     /// Mutably borrow internal [`Style`].
     /// Changes apply to this [`Ui`] and its subsequent children.
     ///
-    /// To set the style of all [`Ui`]:s, use [`Context::set_style_of`].
+    /// To set the style of all [`Ui`]s, use [`Context::set_style_of`].
     ///
     /// Example:
     /// ```
@@ -442,14 +433,14 @@ impl Ui {
 
     /// Changes apply to this [`Ui`] and its subsequent children.
     ///
-    /// To set the visuals of all [`Ui`]:s, use [`Context::set_visuals_of`].
+    /// To set the style of all [`Ui`]s, use [`Context::set_style_of`].
     pub fn set_style(&mut self, style: impl Into<Arc<Style>>) {
         self.style = style.into();
     }
 
     /// Reset to the default style set in [`Context`].
     pub fn reset_style(&mut self) {
-        self.style = self.ctx().style();
+        self.style = self.ctx().global_style();
     }
 
     /// The current spacing options for this [`Ui`].
@@ -459,7 +450,7 @@ impl Ui {
         &self.style.spacing
     }
 
-    /// Mutably borrow internal [`Spacing`](crate::style::Spacing).
+    /// Mutably borrow internal [`Spacing`].
     /// Changes apply to this [`Ui`] and its subsequent children.
     ///
     /// Example:
@@ -482,7 +473,7 @@ impl Ui {
     /// Mutably borrow internal `visuals`.
     /// Changes apply to this [`Ui`] and its subsequent children.
     ///
-    /// To set the visuals of all [`Ui`]:s, use [`Context::set_visuals_of`].
+    /// To set the visuals of all [`Ui`]s, use [`Context::set_visuals_of`].
     ///
     /// Example:
     /// ```
@@ -794,93 +785,6 @@ impl Ui {
     }
 }
 
-/// # Helpers for accessing the underlying [`Context`].
-/// These functions all lock the [`Context`] owned by this [`Ui`].
-/// Please see the documentation of [`Context`] for how locking works!
-impl Ui {
-    /// Read-only access to the shared [`InputState`].
-    ///
-    /// ```
-    /// # egui::__run_test_ui(|ui| {
-    /// if ui.input(|i| i.key_pressed(egui::Key::A)) {
-    ///     // …
-    /// }
-    /// # });
-    /// ```
-    #[inline]
-    pub fn input<R>(&self, reader: impl FnOnce(&InputState) -> R) -> R {
-        self.ctx().input(reader)
-    }
-
-    /// Read-write access to the shared [`InputState`].
-    #[inline]
-    pub fn input_mut<R>(&self, writer: impl FnOnce(&mut InputState) -> R) -> R {
-        self.ctx().input_mut(writer)
-    }
-
-    /// Read-only access to the shared [`Memory`].
-    #[inline]
-    pub fn memory<R>(&self, reader: impl FnOnce(&Memory) -> R) -> R {
-        self.ctx().memory(reader)
-    }
-
-    /// Read-write access to the shared [`Memory`].
-    #[inline]
-    pub fn memory_mut<R>(&self, writer: impl FnOnce(&mut Memory) -> R) -> R {
-        self.ctx().memory_mut(writer)
-    }
-
-    /// Read-only access to the shared [`IdTypeMap`], which stores superficial widget state.
-    #[inline]
-    pub fn data<R>(&self, reader: impl FnOnce(&IdTypeMap) -> R) -> R {
-        self.ctx().data(reader)
-    }
-
-    /// Read-write access to the shared [`IdTypeMap`], which stores superficial widget state.
-    #[inline]
-    pub fn data_mut<R>(&self, writer: impl FnOnce(&mut IdTypeMap) -> R) -> R {
-        self.ctx().data_mut(writer)
-    }
-
-    /// Read-only access to the shared [`PlatformOutput`].
-    ///
-    /// This is what egui outputs each frame.
-    ///
-    /// ```
-    /// # let mut ctx = egui::Context::default();
-    /// ctx.output_mut(|o| o.cursor_icon = egui::CursorIcon::Progress);
-    /// ```
-    #[inline]
-    pub fn output<R>(&self, reader: impl FnOnce(&PlatformOutput) -> R) -> R {
-        self.ctx().output(reader)
-    }
-
-    /// Read-write access to the shared [`PlatformOutput`].
-    ///
-    /// This is what egui outputs each frame.
-    ///
-    /// ```
-    /// # let mut ctx = egui::Context::default();
-    /// ctx.output_mut(|o| o.cursor_icon = egui::CursorIcon::Progress);
-    /// ```
-    #[inline]
-    pub fn output_mut<R>(&self, writer: impl FnOnce(&mut PlatformOutput) -> R) -> R {
-        self.ctx().output_mut(writer)
-    }
-
-    /// Read-only access to [`FontsView`].
-    #[inline]
-    pub fn fonts<R>(&self, reader: impl FnOnce(&FontsView<'_>) -> R) -> R {
-        self.ctx().fonts(reader)
-    }
-
-    /// Read-write access to [`FontsView`].
-    #[inline]
-    pub fn fonts_mut<R>(&self, reader: impl FnOnce(&mut FontsView<'_>) -> R) -> R {
-        self.ctx().fonts_mut(reader)
-    }
-}
-
 // ------------------------------------------------------------------------
 
 /// # Sizes etc
@@ -1123,6 +1027,17 @@ impl Ui {
 impl Ui {
     /// Check for clicks, drags and/or hover on a specific region of this [`Ui`].
     pub fn interact(&self, rect: Rect, id: Id, sense: Sense) -> Response {
+        self.interact_opt(rect, id, sense, Default::default())
+    }
+
+    /// Check for clicks, drags and/or hover on a specific region of this [`Ui`].
+    pub fn interact_opt(
+        &self,
+        rect: Rect,
+        id: Id,
+        sense: Sense,
+        options: crate::InteractOptions,
+    ) -> Response {
         self.ctx().register_accesskit_parent(id, self.unique_id);
 
         self.ctx().create_widget(
@@ -1135,6 +1050,7 @@ impl Ui {
                 enabled: self.enabled,
             },
             true,
+            options,
         )
     }
 
@@ -1150,8 +1066,8 @@ impl Ui {
         self.interact(rect, id, sense)
     }
 
-    /// Read the [`Ui`]s background [`Response`].
-    /// It's [`Sense`] will be based on the [`UiBuilder::sense`] used to create this [`Ui`].
+    /// Read the [`Ui`]'s background [`Response`].
+    /// Its [`Sense`] will be based on the [`UiBuilder::sense`] used to create this [`Ui`].
     ///
     /// The rectangle of the [`Response`] (and interactive area) will be [`Self::min_rect`]
     /// of the last pass.
@@ -1203,6 +1119,7 @@ impl Ui {
                 enabled: self.enabled,
             },
             false,
+            Default::default(),
         );
         if self.should_close() {
             response.set_close();
@@ -1251,7 +1168,7 @@ impl Ui {
     /// [`crate::Area`], [`crate::Window`], [`crate::CollapsingHeader`], etc.
     ///
     /// What exactly happens when you close a container depends on the container implementation.
-    /// [`crate::Area`] e.g. will return true from it's [`Response::should_close`] method.
+    /// [`crate::Area`] e.g. will return true from its [`Response::should_close`] method.
     ///
     /// If you want to close a specific kind of container, use [`Ui::close_kind`] instead.
     ///
@@ -1432,7 +1349,7 @@ impl Ui {
                     crate::StrokeKind::Inside,
                 );
 
-                let stroke = Stroke::new(2.5, Color32::from_rgb(200, 0, 0));
+                let stroke = crate::Stroke::new(2.5, Color32::from_rgb(200, 0, 0));
                 let paint_line_seg = |a, b| self.painter().line_segment([a, b], stroke);
 
                 if debug_expand_width && too_wide {
@@ -2292,7 +2209,7 @@ impl Ui {
     /// Show an image available at the given `uri`.
     ///
     /// ⚠ This will do nothing unless you install some image loaders first!
-    /// The easiest way to do this is via [`egui_extras::install_image_loaders`](https://docs.rs/egui_extras/latest/egui_extras/fn.install_image_loaders.html).
+    /// The easiest way to do this is via [`egui_extras::install_image_loaders`](https://docs.rs/egui_extras/latest/egui_extras/loaders/fn.install_image_loaders.html).
     ///
     /// The loaders handle caching image data, sampled textures, etc. across frames, so calling this is immediate-mode safe.
     ///
@@ -2368,7 +2285,7 @@ impl Ui {
     ///
     /// If the user clicks the button, a full color picker is shown.
     /// The given color is in `sRGBA` space without premultiplied alpha.
-    /// If unsure, what "premultiplied alpha" is, then this is probably the function you want to use.
+    /// If unsure what "premultiplied alpha" is, then this is probably the function you want to use.
     pub fn color_edit_button_srgba_unmultiplied(&mut self, srgba: &mut [u8; 4]) -> Response {
         let mut rgba = Rgba::from_srgba_unmultiplied(srgba[0], srgba[1], srgba[2], srgba[3]);
         let response =
@@ -3004,7 +2921,7 @@ impl Ui {
     ///
     /// Returns the dropped item, if it was released this frame.
     ///
-    /// The given frame is used for its margins, but it color is ignored.
+    /// The given frame is used for its margins, but the color is ignored.
     #[doc(alias = "drag and drop")]
     pub fn dnd_drop_zone<Payload, R>(
         &mut self,
@@ -3305,7 +3222,7 @@ fn register_rect(ui: &Ui, rect: Rect) {
 
     // Use the debug-painter to avoid clip rect,
     // otherwise the content of the widget may cover what we paint here!
-    let painter = ui.ctx().debug_painter();
+    let painter = ui.debug_painter();
 
     if debug.hover_shows_next {
         ui.placer.debug_paint_cursor(&painter, "next");
diff --git a/crates/egui/src/util/id_type_map.rs b/crates/egui/src/util/id_type_map.rs
index 395d1b6ca..b1312a1da 100644
--- a/crates/egui/src/util/id_type_map.rs
+++ b/crates/egui/src/util/id_type_map.rs
@@ -142,7 +142,9 @@ impl Element {
         Self::Value {
             value: Box::new(t),
             clone_fn: |x| {
-                let x = x.downcast_ref::<T>().unwrap(); // This unwrap will never panic, because we always construct this type using this `new` function and because we return &mut reference only with this type `T`, so type cannot change.
+                // This unwrap will never panic, because we always construct this type using this `new` function and because we return &mut reference only with this type `T`, so type cannot change.
+                #[expect(clippy::unwrap_used)]
+                let x = x.downcast_ref::<T>().unwrap();
                 Box::new(x.clone())
             },
             #[cfg(feature = "persistence")]
@@ -156,12 +158,16 @@ impl Element {
         Self::Value {
             value: Box::new(t),
             clone_fn: |x| {
-                let x = x.downcast_ref::<T>().unwrap(); // This unwrap will never panic, because we always construct this type using this `new` function and because we return &mut reference only with this type `T`, so type cannot change.
+                // This unwrap will never panic, because we always construct this type using this `new` function and because we return &mut reference only with this type `T`, so type cannot change.
+                #[expect(clippy::unwrap_used)]
+                let x = x.downcast_ref::<T>().unwrap();
                 Box::new(x.clone())
             },
             #[cfg(feature = "persistence")]
             serialize_fn: Some(|x| {
-                let x = x.downcast_ref::<T>().unwrap(); // This will never panic too, for same reason.
+                // This will never panic too, for same reason.
+                #[expect(clippy::unwrap_used)]
+                let x = x.downcast_ref::<T>().unwrap();
                 ron::to_string(x).ok()
             }),
         }
@@ -209,7 +215,9 @@ impl Element {
         }
 
         match self {
-            Self::Value { value, .. } => value.downcast_mut().unwrap(), // This unwrap will never panic because we already converted object to required type
+            // This unwrap will never panic because we already converted object to required type
+            #[expect(clippy::unwrap_used)]
+            Self::Value { value, .. } => value.downcast_mut().unwrap(),
             Self::Serialized(_) => unreachable!(),
         }
     }
@@ -238,7 +246,9 @@ impl Element {
         }
 
         match self {
-            Self::Value { value, .. } => value.downcast_mut().unwrap(), // This unwrap will never panic because we already converted object to required type
+            // This unwrap will never panic because we already converted object to required type
+            #[expect(clippy::unwrap_used)]
+            Self::Value { value, .. } => value.downcast_mut().unwrap(),
             Self::Serialized(_) => unreachable!(),
         }
     }
@@ -436,10 +446,14 @@ impl IdTypeMap {
         let hash = hash(TypeId::of::<T>(), id);
         use std::collections::hash_map::Entry;
         match self.map.entry(hash) {
-            Entry::Vacant(vacant) => vacant
-                .insert(Element::new_temp(insert_with()))
-                .get_mut_temp()
-                .unwrap(), // this unwrap will never panic, because we insert correct type right now
+            Entry::Vacant(vacant) => {
+                // this unwrap will never panic, because we insert correct type right now
+                #[expect(clippy::unwrap_used)]
+                vacant
+                    .insert(Element::new_temp(insert_with()))
+                    .get_mut_temp()
+                    .unwrap()
+            }
             Entry::Occupied(occupied) => {
                 occupied.into_mut().get_temp_mut_or_insert_with(insert_with)
             }
@@ -454,10 +468,14 @@ impl IdTypeMap {
         let hash = hash(TypeId::of::<T>(), id);
         use std::collections::hash_map::Entry;
         match self.map.entry(hash) {
-            Entry::Vacant(vacant) => vacant
-                .insert(Element::new_persisted(insert_with()))
-                .get_mut_persisted()
-                .unwrap(), // this unwrap will never panic, because we insert correct type right now
+            Entry::Vacant(vacant) => {
+                // this unwrap will never panic, because we insert correct type right now
+                #[expect(clippy::unwrap_used)]
+                vacant
+                    .insert(Element::new_persisted(insert_with()))
+                    .get_mut_persisted()
+                    .unwrap()
+            }
             Entry::Occupied(occupied) => occupied
                 .into_mut()
                 .get_persisted_mut_or_insert_with(insert_with),
@@ -466,7 +484,7 @@ impl IdTypeMap {
 
     /// For tests
     #[cfg(feature = "persistence")]
-    #[allow(unused, clippy::allow_attributes)]
+    #[allow(clippy::allow_attributes, unused)]
     fn get_generation<T: SerializableAny>(&self, id: Id) -> Option<usize> {
         let element = self.map.get(&hash(TypeId::of::<T>(), id))?;
         match element {
@@ -706,7 +724,7 @@ fn test_two_id_two_type() {
 
 #[test]
 fn test_two_id_x_two_types() {
-    #![allow(clippy::approx_constant)]
+    #![expect(clippy::approx_constant)]
 
     let a = Id::new("a");
     let b = Id::new("b");
diff --git a/crates/egui/src/util/undoer.rs b/crates/egui/src/util/undoer.rs
index cd11b6d16..65ad576ec 100644
--- a/crates/egui/src/util/undoer.rs
+++ b/crates/egui/src/util/undoer.rs
@@ -135,6 +135,7 @@ where
             self.flux = None;
 
             if self.undos.back() == Some(current_state) {
+                #[expect(clippy::unwrap_used)] // we just checked that undos is not empty
                 self.redos.push(self.undos.pop_back().unwrap());
             } else {
                 self.redos.push(current_state.clone());
diff --git a/crates/egui/src/viewport.rs b/crates/egui/src/viewport.rs
index 3d757e477..15741c017 100644
--- a/crates/egui/src/viewport.rs
+++ b/crates/egui/src/viewport.rs
@@ -33,7 +33,9 @@
 //! In short: immediate viewports are simpler to use, but can waste a lot of CPU time.
 //!
 //! ### Embedded viewports
-//! These are not real, independent viewports, but is a fallback mode for when the integration does not support real viewports. In your callback is called with [`ViewportClass::Embedded`] it means you need to create a [`crate::Window`] to wrap your ui in, which will then be embedded in the parent viewport, unable to escape it.
+//! These are not real, independent viewports, but is a fallback mode for when the integration does not support real viewports.
+//! In your callback is called with [`ViewportClass::EmbeddedWindow`] it means the viewport is embedded inside of
+//! a regular [`crate::Window`], trapped in the parent viewport.
 //!
 //!
 //! ## Using the viewports
@@ -71,7 +73,7 @@ use std::sync::Arc;
 
 use epaint::{Pos2, Vec2};
 
-use crate::{Context, Id};
+use crate::{Context, Id, Ui};
 
 // ----------------------------------------------------------------------------
 
@@ -101,7 +103,10 @@ pub enum ViewportClass {
 
     /// The fallback, when the egui integration doesn't support viewports,
     /// or [`crate::Context::embed_viewports`] is set to `true`.
-    Embedded,
+    ///
+    /// If you get this, it is because you are already wrapped in a [`crate::Window`]
+    /// inside of the parent viewport.
+    EmbeddedWindow,
 }
 
 // ----------------------------------------------------------------------------
@@ -258,7 +263,7 @@ impl ViewportIdPair {
 }
 
 /// The user-code that shows the ui in the viewport, used for deferred viewports.
-pub type DeferredViewportUiCallback = dyn Fn(&Context) + Sync + Send;
+pub type DeferredViewportUiCallback = dyn Fn(&mut Ui) + Sync + Send;
 
 /// Render the given viewport, calling the given ui callback.
 pub type ImmediateViewportRendererCallback = dyn for<'a> Fn(&Context, ImmediateViewport<'a>);
@@ -782,7 +787,7 @@ impl ViewportBuilder {
             };
 
             if is_new {
-                commands.push(ViewportCommand::Icon(Some(new_icon.clone())));
+                commands.push(ViewportCommand::Icon(Some(Arc::clone(&new_icon))));
                 self.icon = Some(new_icon);
             }
         }
@@ -1189,7 +1194,7 @@ pub struct ViewportOutput {
 
     /// What type of viewport are we?
     ///
-    /// This will never be [`ViewportClass::Embedded`],
+    /// This will never be [`ViewportClass::EmbeddedWindow`],
     /// since those don't result in real viewports.
     pub class: ViewportClass,
 
@@ -1246,5 +1251,5 @@ pub struct ImmediateViewport<'a> {
     pub builder: ViewportBuilder,
 
     /// The user-code that shows the GUI.
-    pub viewport_ui_cb: Box<dyn FnMut(&Context) + 'a>,
+    pub viewport_ui_cb: Box<dyn FnMut(&mut Ui) + 'a>,
 }
diff --git a/crates/egui/src/widget_rect.rs b/crates/egui/src/widget_rect.rs
index fa99c95dc..e03423623 100644
--- a/crates/egui/src/widget_rect.rs
+++ b/crates/egui/src/widget_rect.rs
@@ -63,6 +63,21 @@ impl WidgetRect {
     }
 }
 
+/// How to handle multiple calls to [`crate::Response::interact`] and [`crate::Ui::interact_opt`].
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct InteractOptions {
+    /// If we call interact on the same widget multiple times,
+    /// should we move it to the top on subsequent calls?
+    pub move_to_top: bool,
+}
+
+#[expect(clippy::derivable_impls)] // Nice to be explicit
+impl Default for InteractOptions {
+    fn default() -> Self {
+        Self { move_to_top: false }
+    }
+}
+
 /// Stores the [`WidgetRect`]s of all widgets generated during a single egui update/frame.
 ///
 /// All [`crate::Ui`]s have a [`WidgetRect`]. It is created in [`crate::Ui::new`] with [`Rect::NOTHING`]
@@ -140,13 +155,15 @@ impl WidgetRects {
     }
 
     /// Insert the given widget rect in the given layer.
-    pub fn insert(&mut self, layer_id: LayerId, widget_rect: WidgetRect) {
+    pub fn insert(&mut self, layer_id: LayerId, widget_rect: WidgetRect, options: InteractOptions) {
         let Self {
             by_layer,
             by_id,
             infos: _,
         } = self;
 
+        let InteractOptions { move_to_top } = options;
+
         let layer_widgets = by_layer.entry(layer_id).or_default();
 
         match by_id.entry(widget_rect.id) {
@@ -161,14 +178,6 @@ impl WidgetRects {
                 // e.g. calling `response.interact(…)` to add more interaction.
                 let (idx_in_layer, existing) = entry.get_mut();
 
-                debug_assert!(
-                    existing.layer_id == widget_rect.layer_id,
-                    "Widget {:?} changed layer_id during the frame from {:?} to {:?}",
-                    widget_rect.id,
-                    existing.layer_id,
-                    widget_rect.layer_id
-                );
-
                 // Update it:
                 existing.rect = widget_rect.rect; // last wins
                 existing.interact_rect = widget_rect.interact_rect; // last wins
@@ -176,7 +185,18 @@ impl WidgetRects {
                 existing.enabled |= widget_rect.enabled;
 
                 if existing.layer_id == widget_rect.layer_id {
-                    layer_widgets[*idx_in_layer] = *existing;
+                    if move_to_top {
+                        layer_widgets.remove(*idx_in_layer);
+                        *idx_in_layer = layer_widgets.len();
+                        layer_widgets.push(*existing);
+                    } else {
+                        layer_widgets[*idx_in_layer] = *existing;
+                    }
+                } else if cfg!(debug_assertions) {
+                    panic!(
+                        "DEBUG ASSERT: Widget {:?} changed layer_id during the frame from {:?} to {:?}",
+                        widget_rect.id, existing.layer_id, widget_rect.layer_id
+                    );
                 }
             }
         }
diff --git a/crates/egui/src/widget_text.rs b/crates/egui/src/widget_text.rs
index ef54d7969..5d91f4bc1 100644
--- a/crates/egui/src/widget_text.rs
+++ b/crates/egui/src/widget_text.rs
@@ -709,7 +709,7 @@ impl WidgetText {
                 default_valign,
             )),
             Self::LayoutJob(job) => job,
-            Self::Galley(galley) => galley.job.clone(),
+            Self::Galley(galley) => Arc::clone(&galley.job),
         }
     }
 
diff --git a/crates/egui/src/widgets/checkbox.rs b/crates/egui/src/widgets/checkbox.rs
index 077673a9e..3d0dbc367 100644
--- a/crates/egui/src/widgets/checkbox.rs
+++ b/crates/egui/src/widgets/checkbox.rs
@@ -71,7 +71,6 @@ impl Widget for Checkbox<'_> {
             text_style,
         } = ui.style().checkbox_style(state);
 
-        // interact_size or size ?
         let mut min_size = Vec2::splat(ui.spacing().interact_size.y);
         min_size.y = min_size.y.at_least(checkbox_size);
 
@@ -121,9 +120,8 @@ impl Widget for Checkbox<'_> {
                 );
                 let small_icon_rect =
                     Rect::from_center_size(big_icon_rect.center(), Vec2::splat(check_size));
-
                 ui.painter().add(epaint::RectShape::new(
-                    big_icon_rect,
+                    big_icon_rect.expand(checkbox_frame.inner_margin.left.into()),
                     checkbox_frame.corner_radius,
                     checkbox_frame.fill,
                     checkbox_frame.stroke,
diff --git a/crates/egui/src/widgets/color_picker.rs b/crates/egui/src/widgets/color_picker.rs
index 17d6b650b..e4dc95335 100644
--- a/crates/egui/src/widgets/color_picker.rs
+++ b/crates/egui/src/widgets/color_picker.rs
@@ -114,7 +114,7 @@ fn color_button(ui: &mut Ui, color: Color32, open: bool) -> Response {
 }
 
 fn color_slider_1d(ui: &mut Ui, value: &mut f32, color_at: impl Fn(f32) -> Color32) -> Response {
-    #![allow(clippy::identity_op)]
+    #![expect(clippy::identity_op)]
 
     let desired_size = vec2(ui.spacing().slider_width, ui.spacing().interact_size.y);
     let (rect, response) = ui.allocate_at_least(desired_size, Sense::click_and_drag());
@@ -378,7 +378,7 @@ fn color_picker_hsvag_2d(ui: &mut Ui, hsvag: &mut HsvaGamma, alpha: Alpha) {
 }
 
 fn input_type_button_ui(ui: &mut Ui) {
-    let mut input_type = ui.ctx().style().visuals.numeric_color_space;
+    let mut input_type = ui.global_style().visuals.numeric_color_space;
     if input_type.toggle_button_ui(ui).changed() {
         ui.ctx().all_styles_mut(|s| {
             s.visuals.numeric_color_space = input_type;
@@ -402,9 +402,9 @@ fn srgba_edit_ui(ui: &mut Ui, [r, g, b, a]: &mut [u8; 4], alpha: Alpha) -> bool
             .clicked()
         {
             if alpha == Alpha::Opaque {
-                ui.ctx().copy_text(format!("{r}, {g}, {b}"));
+                ui.copy_text(format!("{r}, {g}, {b}"));
             } else {
-                ui.ctx().copy_text(format!("{r}, {g}, {b}, {a}"));
+                ui.copy_text(format!("{r}, {g}, {b}, {a}"));
             }
         }
         edited |= DragValue::new(r).speed(0.5).prefix("R ").ui(ui).changed();
@@ -443,10 +443,9 @@ fn rgba_edit_ui(ui: &mut Ui, [r, g, b, a]: &mut [f32; 4], alpha: Alpha) -> bool
             .clicked()
         {
             if alpha == Alpha::Opaque {
-                ui.ctx().copy_text(format!("{r:.03}, {g:.03}, {b:.03}"));
+                ui.copy_text(format!("{r:.03}, {g:.03}, {b:.03}"));
             } else {
-                ui.ctx()
-                    .copy_text(format!("{r:.03}, {g:.03}, {b:.03}, {a:.03}"));
+                ui.copy_text(format!("{r:.03}, {g:.03}, {b:.03}, {a:.03}"));
             }
         }
 
diff --git a/crates/egui/src/widgets/drag_value.rs b/crates/egui/src/widgets/drag_value.rs
index 29d596201..7841fee61 100644
--- a/crates/egui/src/widgets/drag_value.rs
+++ b/crates/egui/src/widgets/drag_value.rs
@@ -1,4 +1,4 @@
-#![allow(clippy::needless_pass_by_value)] // False positives with `impl ToString`
+#![expect(clippy::needless_pass_by_value)] // False positives with `impl ToString`
 
 use std::{cmp::Ordering, ops::RangeInclusive};
 
@@ -624,7 +624,7 @@ impl Widget for DragValue<'_> {
                 ui.memory_mut(|mem| mem.request_focus(id));
                 select_all_text(ui, id, response.id, &value_text);
             } else if response.dragged() {
-                ui.ctx().set_cursor_icon(cursor_icon);
+                ui.set_cursor_icon(cursor_icon);
 
                 let mdelta = response.drag_delta();
                 let delta_points = mdelta.x - mdelta.y; // Increase to the right and up
diff --git a/crates/egui/src/widgets/hyperlink.rs b/crates/egui/src/widgets/hyperlink.rs
index 989643304..aa959e6cc 100644
--- a/crates/egui/src/widgets/hyperlink.rs
+++ b/crates/egui/src/widgets/hyperlink.rs
@@ -65,7 +65,7 @@ impl Widget for Link {
             }
 
             if response.hovered() {
-                ui.ctx().set_cursor_icon(CursorIcon::PointingHand);
+                ui.set_cursor_icon(CursorIcon::PointingHand);
             }
         }
 
@@ -130,12 +130,12 @@ impl Widget for Hyperlink {
         let response = ui.add(Link::new(text));
 
         if response.clicked_with_open_in_background() {
-            ui.ctx().open_url(crate::OpenUrl {
+            ui.open_url(crate::OpenUrl {
                 url: url.clone(),
                 new_tab: true,
             });
         } else if response.clicked() {
-            ui.ctx().open_url(crate::OpenUrl {
+            ui.open_url(crate::OpenUrl {
                 url: url.clone(),
                 new_tab,
             });
diff --git a/crates/egui/src/widgets/image.rs b/crates/egui/src/widgets/image.rs
index 167920adc..8a7c49209 100644
--- a/crates/egui/src/widgets/image.rs
+++ b/crates/egui/src/widgets/image.rs
@@ -681,7 +681,7 @@ pub fn paint_texture_load_result(
         }
         Ok(TexturePoll::Pending { .. }) => {
             let show_loading_spinner =
-                show_loading_spinner.unwrap_or(ui.visuals().image_loading_spinners);
+                show_loading_spinner.unwrap_or_else(|| ui.visuals().image_loading_spinners);
             if show_loading_spinner {
                 Spinner::new().paint_at(ui, rect);
             }
diff --git a/crates/egui/src/widgets/label.rs b/crates/egui/src/widgets/label.rs
index 86259ab2a..284cfd12c 100644
--- a/crates/egui/src/widgets/label.rs
+++ b/crates/egui/src/widgets/label.rs
@@ -248,7 +248,9 @@ impl Label {
                 layout_job.halign = Align::LEFT;
                 layout_job.justify = false;
             } else {
-                layout_job.halign = self.halign.unwrap_or(ui.layout().horizontal_placement());
+                layout_job.halign = self
+                    .halign
+                    .unwrap_or_else(|| ui.layout().horizontal_placement());
                 layout_job.justify = ui.layout().horizontal_justify();
             }
 
diff --git a/crates/egui/src/widgets/mod.rs b/crates/egui/src/widgets/mod.rs
index 9cdefb699..617affa0c 100644
--- a/crates/egui/src/widgets/mod.rs
+++ b/crates/egui/src/widgets/mod.rs
@@ -143,7 +143,7 @@ pub fn global_theme_preference_switch(ui: &mut Ui) {
 
 /// Show larger buttons for switching between light and dark mode (globally).
 pub fn global_theme_preference_buttons(ui: &mut Ui) {
-    let mut theme_preference = ui.ctx().options(|opt| opt.theme_preference);
+    let mut theme_preference = ui.options(|opt| opt.theme_preference);
     theme_preference.radio_buttons(ui);
     ui.ctx().set_theme(theme_preference);
 }
diff --git a/crates/egui/src/widgets/progress_bar.rs b/crates/egui/src/widgets/progress_bar.rs
index bba6be8ef..ced3d994b 100644
--- a/crates/egui/src/widgets/progress_bar.rs
+++ b/crates/egui/src/widgets/progress_bar.rs
@@ -118,7 +118,7 @@ impl Widget for ProgressBar {
 
         let desired_width =
             desired_width.unwrap_or_else(|| ui.available_size_before_wrap().x.at_least(96.0));
-        let height = desired_height.unwrap_or(ui.spacing().interact_size.y);
+        let height = desired_height.unwrap_or_else(|| ui.spacing().interact_size.y);
         let (outer_rect, response) =
             ui.allocate_exact_size(vec2(desired_width, height), Sense::hover());
 
@@ -135,7 +135,7 @@ impl Widget for ProgressBar {
 
         if ui.is_rect_visible(response.rect) {
             if animate {
-                ui.ctx().request_repaint();
+                ui.request_repaint();
             }
 
             let visuals = ui.style().visuals.clone();
diff --git a/crates/egui/src/widgets/slider.rs b/crates/egui/src/widgets/slider.rs
index 129c41c3b..69d08c44e 100644
--- a/crates/egui/src/widgets/slider.rs
+++ b/crates/egui/src/widgets/slider.rs
@@ -1,4 +1,4 @@
-#![allow(clippy::needless_pass_by_value)] // False positives with `impl ToString`
+#![expect(clippy::needless_pass_by_value)] // False positives with `impl ToString`
 
 use std::ops::RangeInclusive;
 
@@ -687,7 +687,7 @@ impl Slider<'_> {
         let mut increment = 0usize;
 
         if response.has_focus() {
-            ui.ctx().memory_mut(|m| {
+            ui.memory_mut(|m| {
                 m.set_focus_lock_filter(
                     response.id,
                     EventFilter {
diff --git a/crates/egui/src/widgets/spinner.rs b/crates/egui/src/widgets/spinner.rs
index 8b5ab5e28..25820a06e 100644
--- a/crates/egui/src/widgets/spinner.rs
+++ b/crates/egui/src/widgets/spinner.rs
@@ -37,7 +37,7 @@ impl Spinner {
     /// Paint the spinner in the given rectangle.
     pub fn paint_at(&self, ui: &Ui, rect: Rect) {
         if ui.is_rect_visible(rect) {
-            ui.ctx().request_repaint(); // because it is animated
+            ui.request_repaint(); // because it is animated
 
             let color = self
                 .color
diff --git a/crates/egui/src/widgets/text_edit/builder.rs b/crates/egui/src/widgets/text_edit/builder.rs
index 6f2da1baa..2d4f79516 100644
--- a/crates/egui/src/widgets/text_edit/builder.rs
+++ b/crates/egui/src/widgets/text_edit/builder.rs
@@ -256,7 +256,7 @@ impl<'t> TextEdit<'t> {
     /// so it is strongly suggested that you cache the results of any syntax highlighter
     /// so as not to waste CPU highlighting the same string every frame.
     ///
-    /// The arguments is the enclosing [`Ui`] (so you can access e.g. [`Ui::fonts`]),
+    /// The arguments is the enclosing [`Ui`] (so you can access e.g. [`Context::fonts`]),
     /// the text and the wrap width.
     ///
     /// ```
@@ -496,7 +496,7 @@ impl TextEdit<'_> {
         } = self;
 
         let text_color = text_color
-            .or(ui.visuals().override_text_color)
+            .or_else(|| ui.visuals().override_text_color)
             // .unwrap_or_else(|| ui.style().interact(&response).text_color()); // too bright
             .unwrap_or_else(|| ui.visuals().widgets.inactive.text_color());
 
@@ -605,12 +605,12 @@ impl TextEdit<'_> {
             if did_interact || response.clicked() {
                 ui.memory_mut(|mem| mem.request_focus(response.id));
 
-                state.last_interaction_time = ui.ctx().input(|i| i.time);
+                state.last_interaction_time = ui.input(|i| i.time);
             }
         }
 
         if interactive && response.hovered() {
-            ui.ctx().set_cursor_icon(CursorIcon::Text);
+            ui.set_cursor_icon(CursorIcon::Text);
         }
 
         let mut cursor_range = None;
@@ -691,7 +691,7 @@ impl TextEdit<'_> {
         if ui.is_rect_visible(rect) {
             if text.as_str().is_empty() && !hint_text.is_empty() {
                 let hint_text_color = ui.visuals().weak_text_color();
-                let hint_text_font_id = hint_text_font.unwrap_or(font_id.into());
+                let hint_text_font_id = hint_text_font.unwrap_or_else(|| font_id.into());
                 let galley = if multiline {
                     hint_text.into_galley(
                         ui,
@@ -721,42 +721,45 @@ impl TextEdit<'_> {
                 paint_text_selection(&mut galley, ui.visuals(), &cursor_range, None);
             }
 
-            if !clip_text {
-                // Allocate additional space if edits were made this frame that changed the size. This is important so that,
-                // if there's a ScrollArea, it can properly scroll to the cursor.
-                // Condition `!clip_text` is important to avoid breaking layout for `TextEdit::singleline` (PR #5640)
-                let extra_size = galley.size() - rect.size();
-                if extra_size.x > 0.0 || extra_size.y > 0.0 {
-                    match ui.layout().main_dir() {
-                        crate::Direction::LeftToRight | crate::Direction::TopDown => {
-                            ui.allocate_rect(
-                                Rect::from_min_size(outer_rect.max, extra_size),
-                                Sense::hover(),
-                            );
-                        }
-                        crate::Direction::RightToLeft => {
-                            ui.allocate_rect(
-                                Rect::from_min_size(
-                                    emath::pos2(outer_rect.min.x - extra_size.x, outer_rect.max.y),
-                                    extra_size,
-                                ),
-                                Sense::hover(),
-                            );
-                        }
-                        crate::Direction::BottomUp => {
-                            ui.allocate_rect(
-                                Rect::from_min_size(
-                                    emath::pos2(outer_rect.min.x, outer_rect.max.y - extra_size.y),
-                                    extra_size,
-                                ),
-                                Sense::hover(),
-                            );
-                        }
+            // Allocate additional space if edits were made this frame that changed the size. This is important so that,
+            // if there's a ScrollArea, it can properly scroll to the cursor.
+            // Condition `!clip_text` is important to avoid breaking layout for `TextEdit::singleline` (PR #5640)
+            if !clip_text
+                && let extra_size = galley.size() - rect.size()
+                && (extra_size.x > 0.0 || extra_size.y > 0.0)
+            {
+                match ui.layout().main_dir() {
+                    crate::Direction::LeftToRight | crate::Direction::TopDown => {
+                        ui.allocate_rect(
+                            Rect::from_min_size(outer_rect.max, extra_size),
+                            Sense::hover(),
+                        );
+                    }
+                    crate::Direction::RightToLeft => {
+                        ui.allocate_rect(
+                            Rect::from_min_size(
+                                emath::pos2(outer_rect.min.x - extra_size.x, outer_rect.max.y),
+                                extra_size,
+                            ),
+                            Sense::hover(),
+                        );
+                    }
+                    crate::Direction::BottomUp => {
+                        ui.allocate_rect(
+                            Rect::from_min_size(
+                                emath::pos2(outer_rect.min.x, outer_rect.max.y - extra_size.y),
+                                extra_size,
+                            ),
+                            Sense::hover(),
+                        );
                     }
                 }
+            } else {
+                // Avoid an ID shift during this pass if the textedit grow
+                ui.skip_ahead_auto_ids(1);
             }
 
-            painter.galley(galley_pos, galley.clone(), text_color);
+            painter.galley(galley_pos, Arc::clone(&galley), text_color);
 
             if has_focus && let Some(cursor_range) = state.cursor.range(&galley) {
                 let primary_cursor_rect = cursor_rect(&galley, &cursor_range.primary, row_height)
@@ -768,7 +771,7 @@ impl TextEdit<'_> {
                 }
 
                 if text.is_mutable() && interactive {
-                    let now = ui.ctx().input(|i| i.time);
+                    let now = ui.input(|i| i.time);
                     if response.changed() || selection_changed {
                         state.last_interaction_time = now;
                     }
@@ -777,7 +780,7 @@ impl TextEdit<'_> {
                     // This is for two reasons:
                     // * Don't give the impression that the user can type into a window without focus
                     // * Don't repaint the ui because of a blinking cursor in an app that is not in focus
-                    let viewport_has_focus = ui.ctx().input(|i| i.focused);
+                    let viewport_has_focus = ui.input(|i| i.focused);
                     if viewport_has_focus {
                         text_selection::visuals::paint_text_cursor(
                             ui,
@@ -824,8 +827,7 @@ impl TextEdit<'_> {
                     hint_text_str.as_str(),
                 )
             });
-        } else if selection_changed {
-            let cursor_range = cursor_range.unwrap();
+        } else if selection_changed && let Some(cursor_range) = cursor_range {
             let char_range = cursor_range.primary.index..=cursor_range.secondary.index;
             let info = WidgetInfo::text_selection_changed(
                 ui.is_enabled(),
@@ -922,7 +924,7 @@ fn events(
 
     let copy_if_not_password = |ui: &Ui, text: String| {
         if !password {
-            ui.ctx().copy_text(text);
+            ui.copy_text(text);
         }
     };
 
diff --git a/crates/egui_demo_app/src/accessibility_inspector.rs b/crates/egui_demo_app/src/accessibility_inspector.rs
index 9ba3a8082..138c05ede 100644
--- a/crates/egui_demo_app/src/accessibility_inspector.rs
+++ b/crates/egui_demo_app/src/accessibility_inspector.rs
@@ -5,11 +5,11 @@ use accesskit_consumer::{FilterResult, Node, Tree, TreeChangeHandler};
 
 use eframe::epaint::text::TextWrapMode;
 use egui::{
-    Button, Color32, Context, Event, Frame, FullOutput, Id, Key, KeyboardShortcut, Label,
-    Modifiers, Panel, RawInput, RichText, ScrollArea, Ui, collapsing_header::CollapsingState,
+    Button, Color32, Event, Frame, FullOutput, Id, Key, KeyboardShortcut, Label, Modifiers, Panel,
+    RawInput, RichText, ScrollArea, Ui, collapsing_header::CollapsingState,
 };
 
-/// This [`egui::Plugin`] adds an inspector Panel.
+/// This [`egui::Plugin`] adds an inspector panel.
 ///
 /// It can be opened with the `(Cmd/Ctrl)+Alt+I`. It shows the current AccessKit tree and details
 /// for the selected node.
@@ -71,8 +71,8 @@ impl egui::Plugin for AccessibilityInspectorPlugin {
         }
     }
 
-    fn on_begin_pass(&mut self, ctx: &Context) {
-        if ctx.input_mut(|i| {
+    fn on_begin_pass(&mut self, ui: &mut Ui) {
+        if ui.input_mut(|i| {
             i.consume_shortcut(&KeyboardShortcut::new(
                 Modifiers::COMMAND | Modifiers::ALT,
                 Key::I,
@@ -85,9 +85,9 @@ impl egui::Plugin for AccessibilityInspectorPlugin {
             return;
         }
 
-        ctx.enable_accesskit();
+        ui.enable_accesskit();
 
-        Panel::right(Self::id()).show(ctx, |ui| {
+        Panel::right(Self::id()).show_inside(ui, |ui| {
             ui.heading("🔎 AccessKit Inspector");
             if let Some(selected_node) = self.selected_node {
                 Panel::bottom(Self::id().with("details_panel"))
@@ -122,7 +122,7 @@ impl AccessibilityInspectorPlugin {
             let node_response = ui.ctx().read_response(selected_node);
 
             if let Some(widget_response) = node_response {
-                ui.ctx().debug_painter().debug_rect(
+                ui.debug_painter().debug_rect(
                     widget_response.rect,
                     ui.style_mut().visuals.selection.bg_fill,
                     "",
@@ -199,8 +199,8 @@ impl AccessibilityInspectorPlugin {
         }
         let label = node
             .label()
-            .or(node.value())
-            .unwrap_or(node.id().0.to_string());
+            .or_else(|| node.value())
+            .unwrap_or_else(|| node.id().0.to_string());
         let label = format!("({:?}) {}", node.role(), label);
 
         // Safety: This is safe since the `accesskit::NodeId` was created from an `egui::Id`.
@@ -233,8 +233,7 @@ impl AccessibilityInspectorPlugin {
                     let widget_response = ui.ctx().read_response(egui_node_id);
 
                     if let Some(widget_response) = widget_response {
-                        ui.ctx()
-                            .debug_painter()
+                        ui.debug_painter()
                             .debug_rect(widget_response.rect, Color32::RED, "");
                     }
                 }
diff --git a/crates/egui_demo_app/src/apps/custom3d_glow.rs b/crates/egui_demo_app/src/apps/custom3d_glow.rs
index 803f6156f..c218ca0ba 100644
--- a/crates/egui_demo_app/src/apps/custom3d_glow.rs
+++ b/crates/egui_demo_app/src/apps/custom3d_glow.rs
@@ -1,4 +1,4 @@
-#![allow(clippy::undocumented_unsafe_blocks)]
+#![expect(clippy::undocumented_unsafe_blocks)]
 
 use std::sync::Arc;
 
@@ -22,26 +22,27 @@ impl Custom3d {
     }
 }
 
-impl eframe::App for Custom3d {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
-            egui::ScrollArea::both()
-                .auto_shrink(false)
-                .show(ui, |ui| {
-                    ui.horizontal(|ui| {
-                        ui.spacing_mut().item_spacing.x = 0.0;
-                        ui.label("The triangle is being painted using ");
-                        ui.hyperlink_to("glow", "https://github.com/grovesNL/glow");
-                        ui.label(" (OpenGL).");
-                    });
-                    ui.label("It's not a very impressive demo, but it shows you can embed 3D inside of egui.");
-
-                    egui::Frame::canvas(ui.style()).show(ui, |ui| {
-                        self.custom_painting(ui);
-                    });
-                    ui.label("Drag to rotate!");
-                    ui.add(egui_demo_lib::egui_github_link_file!());
+impl crate::DemoApp for Custom3d {
+    fn demo_ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        // TODO(emilk): Use `ScrollArea::inner_margin`
+        egui::CentralPanel::default().show_inside(ui, |ui| {
+            egui::ScrollArea::both().auto_shrink(false).show(ui, |ui| {
+                ui.horizontal(|ui| {
+                    ui.spacing_mut().item_spacing.x = 0.0;
+                    ui.label("The triangle is being painted using ");
+                    ui.hyperlink_to("glow", "https://github.com/grovesNL/glow");
+                    ui.label(" (OpenGL).");
                 });
+                ui.label(
+                    "It's not a very impressive demo, but it shows you can embed 3D inside of egui.",
+                );
+
+                egui::Frame::canvas(ui.style()).show(ui, |ui| {
+                    self.custom_painting(ui);
+                });
+                ui.label("Drag to rotate!");
+                ui.add(egui_demo_lib::egui_github_link_file!());
+            });
         });
     }
 
diff --git a/crates/egui_demo_app/src/apps/custom3d_wgpu.rs b/crates/egui_demo_app/src/apps/custom3d_wgpu.rs
index d3b10d480..c88f7638c 100644
--- a/crates/egui_demo_app/src/apps/custom3d_wgpu.rs
+++ b/crates/egui_demo_app/src/apps/custom3d_wgpu.rs
@@ -1,3 +1,5 @@
+#![expect(clippy::unwrap_used)] // TODO(emilk): avoid unwraps
+
 use std::num::NonZeroU64;
 
 use eframe::{
@@ -98,26 +100,27 @@ impl Custom3d {
     }
 }
 
-impl eframe::App for Custom3d {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
-            egui::ScrollArea::both()
-                .auto_shrink(false)
-                .show(ui, |ui| {
-                    ui.horizontal(|ui| {
-                        ui.spacing_mut().item_spacing.x = 0.0;
-                        ui.label("The triangle is being painted using ");
-                        ui.hyperlink_to("WGPU", "https://wgpu.rs");
-                        ui.label(" (Portable Rust graphics API awesomeness)");
-                    });
-                    ui.label("It's not a very impressive demo, but it shows you can embed 3D inside of egui.");
-
-                    egui::Frame::canvas(ui.style()).show(ui, |ui| {
-                        self.custom_painting(ui);
-                    });
-                    ui.label("Drag to rotate!");
-                    ui.add(egui_demo_lib::egui_github_link_file!());
+impl crate::DemoApp for Custom3d {
+    fn demo_ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        // TODO(emilk): Use `ScrollArea::inner_margin`
+        egui::CentralPanel::default().show_inside(ui, |ui| {
+            egui::ScrollArea::both().auto_shrink(false).show(ui, |ui| {
+                ui.horizontal(|ui| {
+                    ui.spacing_mut().item_spacing.x = 0.0;
+                    ui.label("The triangle is being painted using ");
+                    ui.hyperlink_to("WGPU", "https://wgpu.rs");
+                    ui.label(" (Portable Rust graphics API awesomeness)");
                 });
+                ui.label(
+                    "It's not a very impressive demo, but it shows you can embed 3D inside of egui.",
+                );
+
+                egui::Frame::canvas(ui.style()).show(ui, |ui| {
+                    self.custom_painting(ui);
+                });
+                ui.label("Drag to rotate!");
+                ui.add(egui_demo_lib::egui_github_link_file!());
+            });
         });
     }
 }
diff --git a/crates/egui_demo_app/src/apps/fractal_clock.rs b/crates/egui_demo_app/src/apps/fractal_clock.rs
index 52a7f25b2..43ed3fb8b 100644
--- a/crates/egui_demo_app/src/apps/fractal_clock.rs
+++ b/crates/egui_demo_app/src/apps/fractal_clock.rs
@@ -41,7 +41,7 @@ impl FractalClock {
     pub fn ui(&mut self, ui: &mut Ui, seconds_since_midnight: Option<f64>) {
         if !self.paused {
             self.time = seconds_since_midnight.unwrap_or_else(|| ui.input(|i| i.time));
-            ui.ctx().request_repaint();
+            ui.request_repaint();
         }
 
         let painter = Painter::new(
diff --git a/crates/egui_demo_app/src/apps/http_app.rs b/crates/egui_demo_app/src/apps/http_app.rs
index 2630fa862..f263cef81 100644
--- a/crates/egui_demo_app/src/apps/http_app.rs
+++ b/crates/egui_demo_app/src/apps/http_app.rs
@@ -59,16 +59,16 @@ impl Default for HttpApp {
     }
 }
 
-impl eframe::App for HttpApp {
-    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
-        egui::Panel::bottom("http_bottom").show(ctx, |ui| {
+impl crate::DemoApp for HttpApp {
+    fn demo_ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
+        egui::Panel::bottom("http_bottom").show_inside(ui, |ui| {
             let layout = egui::Layout::top_down(egui::Align::Center).with_main_justify(true);
             ui.allocate_ui_with_layout(ui.available_size(), layout, |ui| {
                 ui.add(egui_demo_lib::egui_github_link_file!())
             })
         });
 
-        egui::CentralPanel::default().show(ctx, |ui| {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             let prev_url = self.url.clone();
             let trigger_fetch = ui_url(ui, frame, &mut self.url);
 
@@ -80,7 +80,7 @@ impl eframe::App for HttpApp {
             });
 
             if trigger_fetch {
-                let ctx = ctx.clone();
+                let ctx = ui.ctx().clone();
                 let (sender, promise) = Promise::new();
                 let request = ehttp::Request::get(&self.url);
                 ehttp::fetch(request, move |response| {
@@ -195,7 +195,7 @@ fn ui_resource(ui: &mut egui::Ui, resource: &Resource) {
             if let Some(text) = &text {
                 let tooltip = "Click to copy the response body";
                 if ui.button("📋").on_hover_text(tooltip).clicked() {
-                    ui.ctx().copy_text(text.clone());
+                    ui.copy_text(text.clone());
                 }
                 ui.separator();
             }
@@ -222,10 +222,10 @@ fn syntax_highlighting(
 ) -> Option<ColoredText> {
     let extension_and_rest: Vec<&str> = response.url.rsplitn(2, '.').collect();
     let extension = extension_and_rest.first()?;
-    let theme = egui_extras::syntax_highlighting::CodeTheme::from_style(&ctx.style());
+    let theme = egui_extras::syntax_highlighting::CodeTheme::from_style(&ctx.global_style());
     Some(ColoredText(egui_extras::syntax_highlighting::highlight(
         ctx,
-        &ctx.style(),
+        &ctx.global_style(),
         &theme,
         text,
         extension,
diff --git a/crates/egui_demo_app/src/apps/image_viewer.rs b/crates/egui_demo_app/src/apps/image_viewer.rs
index 052996eef..11cc68b6b 100644
--- a/crates/egui_demo_app/src/apps/image_viewer.rs
+++ b/crates/egui_demo_app/src/apps/image_viewer.rs
@@ -48,15 +48,15 @@ impl Default for ImageViewer {
     }
 }
 
-impl eframe::App for ImageViewer {
-    fn update(&mut self, ctx: &egui::Context, _: &mut eframe::Frame) {
-        egui::Panel::top("url bar").show(ctx, |ui| {
+impl crate::DemoApp for ImageViewer {
+    fn demo_ui(&mut self, ui: &mut egui::Ui, _: &mut eframe::Frame) {
+        egui::Panel::top("url bar").show_inside(ui, |ui| {
             ui.horizontal_centered(|ui| {
                 let label = ui.label("URI:");
                 ui.text_edit_singleline(&mut self.uri_edit_text)
                     .labelled_by(label.id);
                 if ui.small_button("✔").clicked() {
-                    ctx.forget_image(&self.current_uri);
+                    ui.ctx().forget_image(&self.current_uri);
                     self.uri_edit_text = self.uri_edit_text.trim().to_owned();
                     self.current_uri = self.uri_edit_text.clone();
                 }
@@ -71,7 +71,7 @@ impl eframe::App for ImageViewer {
             });
         });
 
-        egui::Panel::left("controls").show(ctx, |ui| {
+        egui::Panel::left("controls").show_inside(ui, |ui| {
             // uv
             ui.label("UV");
             ui.add(Slider::new(&mut self.image_options.uv.min.x, 0.0..=1.0).text("min x"));
@@ -197,7 +197,7 @@ impl eframe::App for ImageViewer {
             }
         });
 
-        egui::CentralPanel::default().show(ctx, |ui| {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             egui::ScrollArea::both().show(ui, |ui| {
                 let mut image = egui::Image::from_uri(&self.current_uri);
                 image = image.uv(self.image_options.uv);
diff --git a/crates/egui_demo_app/src/backend_panel.rs b/crates/egui_demo_app/src/backend_panel.rs
index e98d5179d..d3953320a 100644
--- a/crates/egui_demo_app/src/backend_panel.rs
+++ b/crates/egui_demo_app/src/backend_panel.rs
@@ -94,7 +94,7 @@ impl BackendPanel {
         self.egui_windows.checkboxes(ui);
 
         #[cfg(debug_assertions)]
-        if ui.ctx().style().debug.debug_on_hover_with_all_modifiers {
+        if ui.global_style().debug.debug_on_hover_with_all_modifiers {
             ui.separator();
             ui.label("Press down all modifiers and hover a widget to see a callstack for it");
         }
@@ -102,9 +102,9 @@ impl BackendPanel {
         #[cfg(target_arch = "wasm32")]
         {
             ui.separator();
-            let mut screen_reader = ui.ctx().options(|o| o.screen_reader);
+            let mut screen_reader = ui.options(|o| o.screen_reader);
             ui.checkbox(&mut screen_reader, "🔈 Screen reader").on_hover_text("Experimental feature: checking this will turn on the screen reader on supported platforms");
-            ui.ctx().options_mut(|o| o.screen_reader = screen_reader);
+            ui.options_mut(|o| o.screen_reader = screen_reader);
         }
 
         if cfg!(debug_assertions) && cfg!(target_arch = "wasm32") {
@@ -119,7 +119,7 @@ impl BackendPanel {
         if !cfg!(target_arch = "wasm32") {
             ui.separator();
             if ui.button("Quit").clicked() {
-                ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close);
+                ui.send_viewport_cmd(egui::ViewportCommand::Close);
             }
         }
     }
@@ -168,7 +168,7 @@ impl BackendPanel {
 
                     ui.horizontal(|ui| {
                         if ui.button("Request discard").clicked() {
-                            ui.ctx().request_discard("Manual button click");
+                            ui.request_discard("Manual button click");
 
                             if !ui.ctx().will_discard() {
                                 ui.label("Discard denied!");
@@ -305,8 +305,7 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
                     .on_hover_text("Fullscreen the window")
                     .changed()
                 {
-                    ui.ctx()
-                        .send_viewport_cmd(egui::ViewportCommand::Fullscreen(fullscreen));
+                    ui.send_viewport_cmd(egui::ViewportCommand::Fullscreen(fullscreen));
                 }
             }
 
@@ -333,10 +332,8 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
                 });
 
             if let Some(size) = size {
-                ui.ctx()
-                    .send_viewport_cmd(egui::ViewportCommand::InnerSize(size));
-                ui.ctx()
-                    .send_viewport_cmd(egui::ViewportCommand::Fullscreen(false));
+                ui.send_viewport_cmd(egui::ViewportCommand::InnerSize(size));
+                ui.send_viewport_cmd(egui::ViewportCommand::Fullscreen(false));
                 ui.close();
             }
         });
@@ -462,11 +459,13 @@ fn call_after_delay(delay: std::time::Duration, f: impl FnOnce() + Send + 'stati
             std::thread::sleep(delay);
             f();
         })
-        .unwrap();
+        .expect("Failed to spawn a thread");
 }
 
 #[cfg(target_arch = "wasm32")]
 fn call_after_delay(delay: std::time::Duration, f: impl FnOnce() + Send + 'static) {
+    #![expect(clippy::unwrap_used)]
+
     use wasm_bindgen::prelude::*;
     let window = web_sys::window().unwrap();
     let closure = Closure::once(f);
diff --git a/crates/egui_demo_app/src/lib.rs b/crates/egui_demo_app/src/lib.rs
index 05b3c4bd6..ea30bda8d 100644
--- a/crates/egui_demo_app/src/lib.rs
+++ b/crates/egui_demo_app/src/lib.rs
@@ -1,5 +1,4 @@
 //! Demo app for egui
-#![allow(clippy::missing_errors_doc)]
 
 mod apps;
 mod backend_panel;
@@ -15,6 +14,14 @@ pub(crate) fn seconds_since_midnight() -> f64 {
     time.num_seconds_from_midnight() as f64 + 1e-9 * (time.nanosecond() as f64)
 }
 
+/// Trait that wraps different parts of the demo app.
+pub trait DemoApp {
+    fn demo_ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame);
+
+    #[cfg(feature = "glow")]
+    fn on_exit(&mut self, _gl: Option<&eframe::glow::Context>) {}
+}
+
 // ----------------------------------------------------------------------------
 #[cfg(feature = "accessibility_inspector")]
 pub mod accessibility_inspector;
diff --git a/crates/egui_demo_app/src/main.rs b/crates/egui_demo_app/src/main.rs
index 37a235e89..a4ffdb5f9 100644
--- a/crates/egui_demo_app/src/main.rs
+++ b/crates/egui_demo_app/src/main.rs
@@ -1,8 +1,8 @@
 //! Demo app for egui
 
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
-#![allow(clippy::never_loop)] // False positive
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
+#![allow(clippy::allow_attributes, clippy::never_loop)]
 
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; // Much faster allocator, can give 20% speedups: https://github.com/emilk/egui/pull/7029
diff --git a/crates/egui_demo_app/src/web.rs b/crates/egui_demo_app/src/web.rs
index 104ef1dce..30940d42f 100644
--- a/crates/egui_demo_app/src/web.rs
+++ b/crates/egui_demo_app/src/web.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::mem_forget)] // False positives from #[wasm_bindgen] macro
-
 use eframe::wasm_bindgen::{self, prelude::*};
 
 use crate::WrapApp;
@@ -14,7 +12,7 @@ pub struct WebHandle {
 #[wasm_bindgen]
 impl WebHandle {
     /// Installs a panic hook, then returns.
-    #[allow(clippy::new_without_default, clippy::allow_attributes)]
+    #[allow(clippy::allow_attributes, clippy::new_without_default)]
     #[wasm_bindgen(constructor)]
     pub fn new() -> Self {
         // Redirect [`log`] message to `console.log` and friends:
@@ -31,6 +29,9 @@ impl WebHandle {
     }
 
     /// Call this once from JavaScript to start your app.
+    ///
+    /// # Errors
+    /// Returns an error if the app could not start.
     #[wasm_bindgen]
     pub async fn start(
         &self,
diff --git a/crates/egui_demo_app/src/wrap_app.rs b/crates/egui_demo_app/src/wrap_app.rs
index c118f280c..5dcc89a3e 100644
--- a/crates/egui_demo_app/src/wrap_app.rs
+++ b/crates/egui_demo_app/src/wrap_app.rs
@@ -1,4 +1,4 @@
-use egui_demo_lib::is_mobile;
+use egui_demo_lib::{DemoWindows, is_mobile};
 
 #[cfg(feature = "glow")]
 use eframe::glow;
@@ -6,29 +6,25 @@ use eframe::glow;
 #[cfg(target_arch = "wasm32")]
 use core::any::Any;
 
+use crate::DemoApp;
+
 #[derive(Default)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 struct EasyMarkApp {
     editor: egui_demo_lib::easy_mark::EasyMarkEditor,
 }
 
-impl eframe::App for EasyMarkApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        self.editor.panels(ctx);
+impl DemoApp for EasyMarkApp {
+    fn demo_ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        self.editor.panels(ui);
     }
 }
 
 // ----------------------------------------------------------------------------
 
-#[derive(Default)]
-#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
-pub struct DemoApp {
-    demo_windows: egui_demo_lib::DemoWindows,
-}
-
-impl eframe::App for DemoApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        self.demo_windows.ui(ctx);
+impl DemoApp for DemoWindows {
+    fn demo_ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        self.ui(ui);
     }
 }
 
@@ -41,17 +37,17 @@ pub struct FractalClockApp {
     pub mock_time: Option<f64>,
 }
 
-impl eframe::App for FractalClockApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default()
-            .frame(
-                egui::Frame::dark_canvas(&ctx.style())
-                    .stroke(egui::Stroke::NONE)
-                    .corner_radius(0),
-            )
-            .show(ctx, |ui| {
-                self.fractal_clock
-                    .ui(ui, self.mock_time.or(Some(crate::seconds_since_midnight())));
+impl DemoApp for FractalClockApp {
+    fn demo_ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::Frame::dark_canvas(ui.style())
+            .stroke(egui::Stroke::NONE)
+            .corner_radius(0)
+            .show(ui, |ui| {
+                self.fractal_clock.ui(
+                    ui,
+                    self.mock_time
+                        .or_else(|| Some(crate::seconds_since_midnight())),
+                );
             });
     }
 }
@@ -64,13 +60,13 @@ pub struct ColorTestApp {
     color_test: egui_demo_lib::ColorTest,
 }
 
-impl eframe::App for ColorTestApp {
-    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+impl DemoApp for ColorTestApp {
+    fn demo_ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             if frame.is_web() {
                 ui.label(
-                    "NOTE: Some old browsers stuck on WebGL1 without sRGB support will not pass the color test.",
-                );
+                        "NOTE: Some old browsers stuck on WebGL1 without sRGB support will not pass the color test.",
+                    );
                 ui.separator();
             }
             egui::ScrollArea::both().auto_shrink(false).show(ui, |ui| {
@@ -155,7 +151,7 @@ enum Command {
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[cfg_attr(feature = "serde", serde(default))]
 pub struct State {
-    demo: DemoApp,
+    demo: DemoWindows,
     easy_mark_editor: EasyMarkApp,
     #[cfg(feature = "http")]
     http: crate::apps::HttpApp,
@@ -187,7 +183,7 @@ impl WrapApp {
         cc.egui_ctx
             .add_plugin(crate::accessibility_inspector::AccessibilityInspectorPlugin::default());
 
-        #[allow(unused_mut, clippy::allow_attributes)]
+        #[allow(clippy::allow_attributes, unused_mut)]
         let mut slf = Self {
             state: State::default(),
 
@@ -209,34 +205,34 @@ impl WrapApp {
 
     pub fn apps_iter_mut(
         &mut self,
-    ) -> impl Iterator<Item = (&'static str, Anchor, &mut dyn eframe::App)> {
+    ) -> impl Iterator<Item = (&'static str, Anchor, &mut dyn DemoApp)> {
         let mut vec = vec![
             (
                 "✨ Demos",
                 Anchor::Demo,
-                &mut self.state.demo as &mut dyn eframe::App,
+                &mut self.state.demo as &mut dyn DemoApp,
             ),
             (
                 "🖹 EasyMark editor",
                 Anchor::EasyMarkEditor,
-                &mut self.state.easy_mark_editor as &mut dyn eframe::App,
+                &mut self.state.easy_mark_editor as &mut dyn DemoApp,
             ),
             #[cfg(feature = "http")]
             (
                 "⬇ HTTP",
                 Anchor::Http,
-                &mut self.state.http as &mut dyn eframe::App,
+                &mut self.state.http as &mut dyn DemoApp,
             ),
             (
                 "🕑 Fractal Clock",
                 Anchor::Clock,
-                &mut self.state.clock as &mut dyn eframe::App,
+                &mut self.state.clock as &mut dyn DemoApp,
             ),
             #[cfg(feature = "image_viewer")]
             (
                 "🖼 Image Viewer",
                 Anchor::ImageViewer,
-                &mut self.state.image_viewer as &mut dyn eframe::App,
+                &mut self.state.image_viewer as &mut dyn DemoApp,
             ),
         ];
 
@@ -245,14 +241,14 @@ impl WrapApp {
             vec.push((
                 "🔺 3D painting",
                 Anchor::Custom3d,
-                custom3d as &mut dyn eframe::App,
+                custom3d as &mut dyn DemoApp,
             ));
         }
 
         vec.push((
             "🎨 Rendering test",
             Anchor::Rendering,
-            &mut self.state.rendering_test as &mut dyn eframe::App,
+            &mut self.state.rendering_test as &mut dyn DemoApp,
         ));
 
         vec.into_iter()
@@ -275,7 +271,7 @@ impl eframe::App for WrapApp {
         color.to_normalized_gamma_f32()
     }
 
-    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
+    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
         #[cfg(target_arch = "wasm32")]
         if let Some(anchor) = frame
             .info()
@@ -289,34 +285,36 @@ impl eframe::App for WrapApp {
         }
 
         #[cfg(not(target_arch = "wasm32"))]
-        if ctx.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::F11)) {
-            let fullscreen = ctx.input(|i| i.viewport().fullscreen.unwrap_or(false));
-            ctx.send_viewport_cmd(egui::ViewportCommand::Fullscreen(!fullscreen));
+        if ui.input_mut(|i| i.consume_key(egui::Modifiers::NONE, egui::Key::F11)) {
+            let fullscreen = ui.input(|i| i.viewport().fullscreen.unwrap_or(false));
+            ui.send_viewport_cmd(egui::ViewportCommand::Fullscreen(!fullscreen));
         }
 
         let mut cmd = Command::Nothing;
         egui::Panel::top("wrap_app_top_bar")
             .frame(egui::Frame::new().inner_margin(4))
-            .show(ctx, |ui| {
+            .show_inside(ui, |ui| {
                 ui.horizontal_wrapped(|ui| {
                     ui.visuals_mut().button_frame = false;
                     self.bar_contents(ui, frame, &mut cmd);
                 });
             });
 
-        self.state.backend_panel.update(ctx, frame);
+        self.state.backend_panel.update(ui.ctx(), frame);
 
-        if !is_mobile(ctx) {
-            cmd = self.backend_panel(ctx, frame);
-        }
+        egui::CentralPanel::no_frame().show_inside(ui, |ui| {
+            if !is_mobile(ui.ctx()) {
+                cmd = self.backend_panel(ui, frame);
+            }
 
-        self.show_selected_app(ctx, frame);
+            self.show_selected_app(ui, frame);
+        });
 
-        self.state.backend_panel.end_of_frame(ctx);
+        self.state.backend_panel.end_of_frame(ui.ctx());
 
-        self.ui_file_drag_and_drop(ctx);
+        self.ui_file_drag_and_drop(ui.ctx());
 
-        self.run_cmd(ctx, cmd);
+        self.run_cmd(ui.ctx(), cmd);
     }
 
     #[cfg(feature = "glow")]
@@ -333,17 +331,16 @@ impl eframe::App for WrapApp {
 }
 
 impl WrapApp {
-    fn backend_panel(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) -> Command {
+    fn backend_panel(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) -> Command {
         // The backend-panel can be toggled on/off.
         // We show a little animation when the user switches it.
-        let is_open =
-            self.state.backend_panel.open || ctx.memory(|mem| mem.everything_is_visible());
+        let is_open = self.state.backend_panel.open || ui.memory(|mem| mem.everything_is_visible());
 
         let mut cmd = Command::Nothing;
 
         egui::Panel::left("backend_panel")
             .resizable(false)
-            .show_animated(ctx, is_open, |ui| {
+            .show_animated_inside(ui, is_open, |ui| {
                 ui.add_space(4.0);
                 ui.vertical_centered(|ui| {
                     ui.heading("💻 Backend");
@@ -382,7 +379,7 @@ impl WrapApp {
                 .on_hover_text("Forget scroll, positions, sizes etc")
                 .clicked()
             {
-                ui.ctx().memory_mut(|mem| *mem = Default::default());
+                ui.memory_mut(|mem| *mem = Default::default());
                 ui.close();
             }
 
@@ -393,11 +390,11 @@ impl WrapApp {
         });
     }
 
-    fn show_selected_app(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
+    fn show_selected_app(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
         let selected_anchor = self.state.selected_anchor;
         for (_name, anchor, app) in self.apps_iter_mut() {
-            if anchor == selected_anchor || ctx.memory(|mem| mem.everything_is_visible()) {
-                app.update(ctx, frame);
+            if anchor == selected_anchor || ui.memory(|mem| mem.everything_is_visible()) {
+                app.demo_ui(ui, frame);
             }
         }
     }
@@ -409,7 +406,7 @@ impl WrapApp {
 
         if is_mobile(ui.ctx()) {
             ui.menu_button("💻 Backend", |ui| {
-                ui.set_style(ui.ctx().style()); // ignore the "menu" style set by `menu_button`.
+                ui.set_style(ui.global_style()); // ignore the "menu" style set by `menu_button`.
                 self.backend_panel_contents(ui, frame, cmd);
             });
         } else {
@@ -426,8 +423,7 @@ impl WrapApp {
             {
                 selected_anchor = anchor;
                 if frame.is_web() {
-                    ui.ctx()
-                        .open_url(egui::OpenUrl::same_tab(format!("#{anchor}")));
+                    ui.open_url(egui::OpenUrl::same_tab(format!("#{anchor}")));
                 }
             }
         }
@@ -439,7 +435,7 @@ impl WrapApp {
                 if clock_button(ui, crate::seconds_since_midnight()).clicked() {
                     self.state.selected_anchor = Anchor::Clock;
                     if frame.is_web() {
-                        ui.ctx().open_url(egui::OpenUrl::same_tab("#clock"));
+                        ui.open_url(egui::OpenUrl::same_tab("#clock"));
                     }
                 }
             }
@@ -477,7 +473,7 @@ impl WrapApp {
                 content_rect.center(),
                 Align2::CENTER_CENTER,
                 text,
-                TextStyle::Heading.resolve(&ctx.style()),
+                TextStyle::Heading.resolve(&ctx.global_style()),
                 Color32::WHITE,
             );
         }
diff --git a/crates/egui_demo_app/tests/snapshots/clock.png b/crates/egui_demo_app/tests/snapshots/clock.png
index ec50255fd..1f6b6438f 100644
--- a/crates/egui_demo_app/tests/snapshots/clock.png
+++ b/crates/egui_demo_app/tests/snapshots/clock.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:784cbcdfd8deaf61e7b663f9416d67724e6a6a189a20ba3351908aa5c5f2deff
-size 336159
+oid sha256:5878bc5beaf4406c24f23d900aa9ac7c5507e44cb3ade83b743b8b62e7da1615
+size 335355
diff --git a/crates/egui_demo_app/tests/snapshots/custom3d.png b/crates/egui_demo_app/tests/snapshots/custom3d.png
index 3fbf0ab56..41ace3480 100644
--- a/crates/egui_demo_app/tests/snapshots/custom3d.png
+++ b/crates/egui_demo_app/tests/snapshots/custom3d.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cdde1dda0e64f584c769c72f5910a7035e6a4a86a074b590e88365f12570109
-size 94062
+oid sha256:706ad012e52a8c51175b050b985cca88e2cb306b24f618b7391641397d17cd28
+size 92804
diff --git a/crates/egui_demo_app/tests/snapshots/easymarkeditor.png b/crates/egui_demo_app/tests/snapshots/easymarkeditor.png
index b9d8b2f22..b11978ce9 100644
--- a/crates/egui_demo_app/tests/snapshots/easymarkeditor.png
+++ b/crates/egui_demo_app/tests/snapshots/easymarkeditor.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:824d941ea538fd44fc374f5df1893eee2309004c0ee5e69a97f1c84a74b2b423
-size 182128
+oid sha256:4135662f2b60a10ef8c3b155172d7a3edcf24a625d8286aeaad0614aa8819893
+size 169604
diff --git a/crates/egui_demo_app/tests/snapshots/imageviewer.png b/crates/egui_demo_app/tests/snapshots/imageviewer.png
index fee7ad891..03aa3077a 100644
--- a/crates/egui_demo_app/tests/snapshots/imageviewer.png
+++ b/crates/egui_demo_app/tests/snapshots/imageviewer.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44ea7ac8c8e22eb51fbcb63f00c8510de0e6ae126d19ab44c5d708d979b5362b
-size 100345
+oid sha256:509020d8885b718900e534c9948cb95ae88e1eee9e113bdfb77a2f75b9a68f7b
+size 96703
diff --git a/crates/egui_demo_lib/benches/benchmark.rs b/crates/egui_demo_lib/benches/benchmark.rs
index 48e7d5207..3275bfa2f 100644
--- a/crates/egui_demo_lib/benches/benchmark.rs
+++ b/crates/egui_demo_lib/benches/benchmark.rs
@@ -28,8 +28,8 @@ pub fn criterion_benchmark(c: &mut Criterion) {
         // The most end-to-end benchmark.
         c.bench_function("demo_with_tessellate__realistic", |b| {
             b.iter(|| {
-                let full_output = ctx.run(RawInput::default(), |ctx| {
-                    demo_windows.ui(ctx);
+                let full_output = ctx.run_ui(RawInput::default(), |ui| {
+                    demo_windows.ui(ui);
                 });
                 ctx.tessellate(full_output.shapes, full_output.pixels_per_point)
             });
@@ -37,14 +37,14 @@ pub fn criterion_benchmark(c: &mut Criterion) {
 
         c.bench_function("demo_no_tessellate", |b| {
             b.iter(|| {
-                ctx.run(RawInput::default(), |ctx| {
-                    demo_windows.ui(ctx);
+                ctx.run_ui(RawInput::default(), |ui| {
+                    demo_windows.ui(ui);
                 })
             });
         });
 
-        let full_output = ctx.run(RawInput::default(), |ctx| {
-            demo_windows.ui(ctx);
+        let full_output = ctx.run_ui(RawInput::default(), |ui| {
+            demo_windows.ui(ui);
         });
         c.bench_function("demo_only_tessellate", |b| {
             b.iter(|| ctx.tessellate(full_output.shapes.clone(), full_output.pixels_per_point));
@@ -57,8 +57,8 @@ pub fn criterion_benchmark(c: &mut Criterion) {
         let mut demo_windows = egui_demo_lib::DemoWindows::default();
         c.bench_function("demo_full_no_tessellate", |b| {
             b.iter(|| {
-                ctx.run(RawInput::default(), |ctx| {
-                    demo_windows.ui(ctx);
+                ctx.run_ui(RawInput::default(), |ui| {
+                    demo_windows.ui(ui);
                 })
             });
         });
@@ -66,10 +66,10 @@ pub fn criterion_benchmark(c: &mut Criterion) {
 
     {
         let ctx = egui::Context::default();
-        let _ = ctx.run(RawInput::default(), |ctx| {
+        let _ = ctx.run_ui(RawInput::default(), |ui| {
             c.bench_function("label &str", |b| {
                 b.iter_batched_ref(
-                    || create_benchmark_ui(ctx),
+                    || create_benchmark_ui(ui),
                     |ui| {
                         ui.label("the quick brown fox jumps over the lazy dog");
                     },
@@ -78,7 +78,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
             });
             c.bench_function("label format!", |b| {
                 b.iter_batched_ref(
-                    || create_benchmark_ui(ctx),
+                    || create_benchmark_ui(ui),
                     |ui| {
                         ui.label("the quick brown fox jumps over the lazy dog".to_owned());
                     },
@@ -90,7 +90,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
 
     {
         let ctx = egui::Context::default();
-        let _ = ctx.run(RawInput::default(), |ctx| {
+        let _ = ctx.run_ui(RawInput::default(), |ui| {
             let mut group = c.benchmark_group("button");
 
             // To ensure we have a valid image, let's use the font texture. The size
@@ -99,7 +99,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
 
             group.bench_function("1_button_text", |b| {
                 b.iter_batched_ref(
-                    || create_benchmark_ui(ctx),
+                    || create_benchmark_ui(ui),
                     |ui| {
                         ui.add(Button::new("Hello World"));
                     },
@@ -108,7 +108,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
             });
             group.bench_function("2_button_text_image", |b| {
                 b.iter_batched_ref(
-                    || create_benchmark_ui(ctx),
+                    || create_benchmark_ui(ui),
                     |ui| {
                         ui.add(Button::image_and_text(image, "Hello World"));
                     },
@@ -117,7 +117,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
             });
             group.bench_function("3_button_text_image_right_text", |b| {
                 b.iter_batched_ref(
-                    || create_benchmark_ui(ctx),
+                    || create_benchmark_ui(ui),
                     |ui| {
                         ui.add(Button::image_and_text(image, "Hello World").right_text("⏵"));
                     },
@@ -126,7 +126,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
             });
             group.bench_function("4_button_italic", |b| {
                 b.iter_batched_ref(
-                    || create_benchmark_ui(ctx),
+                    || create_benchmark_ui(ui),
                     |ui| {
                         ui.add(Button::new(RichText::new("Hello World").italics()));
                     },
@@ -140,19 +140,19 @@ pub fn criterion_benchmark(c: &mut Criterion) {
         let ctx = egui::Context::default();
         ctx.begin_pass(RawInput::default());
 
-        egui::CentralPanel::default().show(&ctx, |ui| {
-            c.bench_function("Painter::rect", |b| {
-                let painter = ui.painter();
-                let rect = ui.max_rect();
-                b.iter(|| {
-                    painter.rect(
-                        rect,
-                        2.0,
-                        egui::Color32::RED,
-                        (1.0, egui::Color32::WHITE),
-                        egui::StrokeKind::Inside,
-                    );
-                });
+        let painter =
+            egui::Painter::new(ctx.clone(), egui::LayerId::background(), ctx.content_rect());
+
+        c.bench_function("Painter::rect", |b| {
+            let rect = painter.clip_rect();
+            b.iter(|| {
+                painter.rect(
+                    rect,
+                    2.0,
+                    egui::Color32::RED,
+                    (1.0, egui::Color32::WHITE),
+                    egui::StrokeKind::Inside,
+                );
             });
         });
 
@@ -161,15 +161,11 @@ pub fn criterion_benchmark(c: &mut Criterion) {
 
     {
         let pixels_per_point = 1.0;
-        let max_texture_side = 8 * 1024;
         let wrap_width = 512.0;
         let font_id = egui::FontId::default();
         let text_color = egui::Color32::WHITE;
-        let mut fonts = egui::epaint::text::Fonts::new(
-            max_texture_side,
-            egui::epaint::AlphaFromCoverage::default(),
-            egui::FontDefinitions::default(),
-        );
+        let mut fonts =
+            egui::epaint::text::Fonts::new(Default::default(), egui::FontDefinitions::default());
         {
             c.bench_function("text_layout_uncached", |b| {
                 b.iter(|| {
@@ -202,6 +198,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
             let mut string = String::new();
             for _ in 0..NUM_LINES {
                 for i in 0..30_u8 {
+                    #[expect(clippy::unwrap_used)]
                     write!(string, "{i:02X} ").unwrap();
                 }
                 string.push('\n');
@@ -209,7 +206,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
 
             let mut rng = rand::rng();
             b.iter(|| {
-                fonts.begin_pass(max_texture_side, egui::epaint::AlphaFromCoverage::default());
+                fonts.begin_pass(egui::epaint::TextOptions::default());
 
                 // Delete a random character, simulating a user making an edit in a long file:
                 let mut new_string = string.clone();
diff --git a/crates/egui_demo_lib/src/demo/about.rs b/crates/egui_demo_lib/src/demo/about.rs
index 7c980e214..56e2f1eaa 100644
--- a/crates/egui_demo_lib/src/demo/about.rs
+++ b/crates/egui_demo_lib/src/demo/about.rs
@@ -8,14 +8,15 @@ impl crate::Demo for About {
         "About egui"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .default_width(320.0)
             .default_height(480.0)
             .open(open)
             .resizable([true, false])
             .scroll(false)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/code_editor.rs b/crates/egui_demo_lib/src/demo/code_editor.rs
index 6a4720311..a8a82e200 100644
--- a/crates/egui_demo_lib/src/demo/code_editor.rs
+++ b/crates/egui_demo_lib/src/demo/code_editor.rs
@@ -26,12 +26,13 @@ impl crate::Demo for CodeEditor {
         "🖮 Code Editor"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         use crate::View as _;
         egui::Window::new(self.name())
             .open(open)
             .default_height(500.0)
-            .show(ctx, |ui| self.ui(ui));
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
diff --git a/crates/egui_demo_lib/src/demo/code_example.rs b/crates/egui_demo_lib/src/demo/code_example.rs
index 23f561506..7dbcd8857 100644
--- a/crates/egui_demo_lib/src/demo/code_example.rs
+++ b/crates/egui_demo_lib/src/demo/code_example.rs
@@ -105,7 +105,7 @@ impl crate::Demo for CodeExample {
         "🖮 Code Example"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         use crate::View as _;
         egui::Window::new(self.name())
             .open(open)
@@ -113,7 +113,8 @@ impl crate::Demo for CodeExample {
             .default_size([390.0, 500.0])
             .scroll(false)
             .resizable([true, false]) // resizable so we can shrink if the text edit grows
-            .show(ctx, |ui| self.ui(ui));
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
diff --git a/crates/egui_demo_lib/src/demo/dancing_strings.rs b/crates/egui_demo_lib/src/demo/dancing_strings.rs
index cc4b578c0..137ecc2b9 100644
--- a/crates/egui_demo_lib/src/demo/dancing_strings.rs
+++ b/crates/egui_demo_lib/src/demo/dancing_strings.rs
@@ -1,5 +1,5 @@
 use egui::{
-    Color32, Context, Pos2, Rect, Ui,
+    Color32, Pos2, Rect, Ui,
     containers::{Frame, Window},
     emath, epaint,
     epaint::PathStroke,
@@ -18,13 +18,14 @@ impl crate::Demo for DancingStrings {
         "♫ Dancing Strings"
     }
 
-    fn show(&mut self, ctx: &Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut Ui, open: &mut bool) {
         use crate::View as _;
         Window::new(self.name())
             .open(open)
             .default_size(vec2(512.0, 256.0))
             .vscroll(false)
-            .show(ctx, |ui| self.ui(ui));
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
@@ -40,7 +41,7 @@ impl crate::View for DancingStrings {
             .on_hover_text("Demonstrates how a path can have varying color across its length.");
 
         Frame::canvas(ui.style()).show(ui, |ui| {
-            ui.ctx().request_repaint();
+            ui.request_repaint();
             let time = ui.input(|i| i.time);
 
             let desired_size = ui.available_width() * vec2(1.0, 0.35);
diff --git a/crates/egui_demo_lib/src/demo/demo_app_windows.rs b/crates/egui_demo_lib/src/demo/demo_app_windows.rs
index 179543680..d2cc17448 100644
--- a/crates/egui_demo_lib/src/demo/demo_app_windows.rs
+++ b/crates/egui_demo_lib/src/demo/demo_app_windows.rs
@@ -6,7 +6,7 @@ use crate::View as _;
 use crate::is_mobile;
 use egui::containers::menu;
 use egui::style::StyleModifier;
-use egui::{Context, Modifiers, ScrollArea, Ui};
+use egui::{Modifiers, ScrollArea, Ui};
 // ----------------------------------------------------------------------------
 
 struct DemoGroup {
@@ -39,11 +39,11 @@ impl DemoGroup {
         }
     }
 
-    pub fn windows(&mut self, ctx: &Context, open: &mut BTreeSet<String>) {
+    pub fn windows(&mut self, ui: &mut Ui, open: &mut BTreeSet<String>) {
         let Self { demos } = self;
         for demo in demos {
             let mut is_open = open.contains(demo.name());
-            demo.show(ctx, &mut is_open);
+            demo.show(ui, &mut is_open);
             set_open(open, demo.name(), is_open);
         }
     }
@@ -137,7 +137,7 @@ impl DemoGroups {
         tests.checkboxes(ui, open);
     }
 
-    pub fn windows(&mut self, ctx: &Context, open: &mut BTreeSet<String>) {
+    pub fn windows(&mut self, ui: &mut Ui, open: &mut BTreeSet<String>) {
         let Self {
             about,
             demos,
@@ -145,11 +145,11 @@ impl DemoGroups {
         } = self;
         {
             let mut is_open = open.contains(about.name());
-            about.show(ctx, &mut is_open);
+            about.show(ui, &mut is_open);
             set_open(open, about.name(), is_open);
         }
-        demos.windows(ctx, open);
-        tests.windows(ctx, open);
+        demos.windows(ui, open);
+        tests.windows(ui, open);
     }
 }
 
@@ -195,11 +195,11 @@ impl Default for DemoWindows {
 
 impl DemoWindows {
     /// Show the app ui (menu bar and windows).
-    pub fn ui(&mut self, ctx: &Context) {
-        if is_mobile(ctx) {
-            self.mobile_ui(ctx);
+    pub fn ui(&mut self, ui: &mut egui::Ui) {
+        if is_mobile(ui.ctx()) {
+            self.mobile_ui(ui);
         } else {
-            self.desktop_ui(ctx);
+            self.desktop_ui(ui);
         }
     }
 
@@ -207,36 +207,36 @@ impl DemoWindows {
         self.open.contains(About::default().name())
     }
 
-    fn mobile_ui(&mut self, ctx: &Context) {
+    fn mobile_ui(&mut self, ui: &mut egui::Ui) {
         if self.about_is_open() {
             let mut close = false;
-            egui::CentralPanel::default().show(ctx, |ui| {
-                egui::ScrollArea::vertical()
-                    .auto_shrink(false)
-                    .show(ui, |ui| {
-                        self.groups.about.ui(ui);
-                        ui.add_space(12.0);
-                        ui.vertical_centered_justified(|ui| {
-                            if ui
-                                .button(egui::RichText::new("Continue to the demo!").size(20.0))
-                                .clicked()
-                            {
-                                close = true;
-                            }
-                        });
+
+            egui::ScrollArea::vertical()
+                .auto_shrink(false)
+                .show(ui, |ui| {
+                    self.groups.about.ui(ui);
+                    ui.add_space(12.0);
+                    ui.vertical_centered_justified(|ui| {
+                        if ui
+                            .button(egui::RichText::new("Continue to the demo!").size(20.0))
+                            .clicked()
+                        {
+                            close = true;
+                        }
                     });
-            });
+                });
+
             if close {
                 set_open(&mut self.open, About::default().name(), false);
             }
         } else {
-            self.mobile_top_bar(ctx);
-            self.groups.windows(ctx, &mut self.open);
+            self.mobile_top_bar(ui);
+            self.groups.windows(ui, &mut self.open);
         }
     }
 
-    fn mobile_top_bar(&mut self, ctx: &Context) {
-        egui::Panel::top("menu_bar").show(ctx, |ui| {
+    fn mobile_top_bar(&mut self, ui: &mut egui::Ui) {
+        egui::Panel::top("menu_bar").show_inside(ui, |ui| {
             menu::MenuBar::new()
                 .config(menu::MenuConfig::new().style(StyleModifier::default()))
                 .ui(ui, |ui| {
@@ -261,12 +261,12 @@ impl DemoWindows {
         });
     }
 
-    fn desktop_ui(&mut self, ctx: &Context) {
+    fn desktop_ui(&mut self, ui: &mut egui::Ui) {
         egui::Panel::right("egui_demo_panel")
             .resizable(false)
             .default_size(160.0)
             .min_size(160.0)
-            .show(ctx, |ui| {
+            .show_inside(ui, |ui| {
                 ui.add_space(4.0);
                 ui.vertical_centered(|ui| {
                     ui.heading("✒ egui demos");
@@ -289,13 +289,13 @@ impl DemoWindows {
                 self.demo_list_ui(ui);
             });
 
-        egui::Panel::top("menu_bar").show(ctx, |ui| {
+        egui::Panel::top("menu_bar").show_inside(ui, |ui| {
             menu::MenuBar::new().ui(ui, |ui| {
                 file_menu_button(ui);
             });
         });
 
-        self.groups.windows(ctx, &mut self.open);
+        self.groups.windows(ui, &mut self.open);
     }
 
     fn demo_list_ui(&mut self, ui: &mut egui::Ui) {
@@ -304,7 +304,7 @@ impl DemoWindows {
                 self.groups.checkboxes(ui, &mut self.open);
                 ui.separator();
                 if ui.button("Organize windows").clicked() {
-                    ui.ctx().memory_mut(|mem| mem.reset_areas());
+                    ui.memory_mut(|mem| mem.reset_areas());
                 }
             });
         });
@@ -323,11 +323,11 @@ fn file_menu_button(ui: &mut Ui) {
     // or else they would only be checked if the "File" menu was actually open!
 
     if ui.input_mut(|i| i.consume_shortcut(&organize_shortcut)) {
-        ui.ctx().memory_mut(|mem| mem.reset_areas());
+        ui.memory_mut(|mem| mem.reset_areas());
     }
 
     if ui.input_mut(|i| i.consume_shortcut(&reset_shortcut)) {
-        ui.ctx().memory_mut(|mem| *mem = Default::default());
+        ui.memory_mut(|mem| *mem = Default::default());
     }
 
     ui.menu_button("File", |ui| {
@@ -352,7 +352,7 @@ fn file_menu_button(ui: &mut Ui) {
             )
             .clicked()
         {
-            ui.ctx().memory_mut(|mem| mem.reset_areas());
+            ui.memory_mut(|mem| mem.reset_areas());
         }
 
         if ui
@@ -363,7 +363,7 @@ fn file_menu_button(ui: &mut Ui) {
             .on_hover_text("Forget scroll, positions, sizes etc")
             .clicked()
         {
-            ui.ctx().memory_mut(|mem| *mem = Default::default());
+            ui.memory_mut(|mem| *mem = Default::default());
         }
     });
 }
@@ -372,8 +372,8 @@ fn file_menu_button(ui: &mut Ui) {
 mod tests {
     use crate::{Demo as _, demo::demo_app_windows::DemoGroups};
 
-    use egui_kittest::kittest::{NodeT as _, Queryable as _};
-    use egui_kittest::{Harness, OsThreshold, SnapshotOptions, SnapshotResults};
+    use egui::Vec2;
+    use egui_kittest::{HarnessBuilder, OsThreshold, SnapshotOptions, SnapshotResults};
 
     #[test]
     fn demos_should_match_snapshot() {
@@ -394,17 +394,15 @@ mod tests {
 
             let name = remove_leading_emoji(demo.name());
 
-            let mut harness = Harness::new(|ctx| {
-                egui_extras::install_image_loaders(ctx);
-                demo.show(ctx, &mut true);
-            });
+            let mut harness = HarnessBuilder::default()
+                .with_size(Vec2::splat(2048.0))
+                .build_ui(|ui| {
+                    egui_extras::install_image_loaders(ui);
+                    demo.show(ui, &mut true);
+                });
 
-            let window = harness.queryable_node().children().next().unwrap();
-            // TODO(lucasmerlin): Windows should probably have a label?
-            //let window = harness.get_by_label(name);
-
-            let size = window.rect().size();
-            harness.set_size(size);
+            // Resize to fit every window, plus some margin:
+            harness.set_size(harness.ctx.globally_used_rect().max.to_vec2() + Vec2::splat(16.0));
 
             // Run the app for some more frames...
             harness.run_ok();
diff --git a/crates/egui_demo_lib/src/demo/drag_and_drop.rs b/crates/egui_demo_lib/src/demo/drag_and_drop.rs
index d483ced3f..a891acaae 100644
--- a/crates/egui_demo_lib/src/demo/drag_and_drop.rs
+++ b/crates/egui_demo_lib/src/demo/drag_and_drop.rs
@@ -1,4 +1,4 @@
-use egui::{Color32, Context, Frame, Id, Ui, Window, vec2};
+use egui::{Color32, Frame, Id, Ui, Window, vec2};
 
 #[derive(Clone, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
@@ -27,14 +27,15 @@ impl crate::Demo for DragAndDropDemo {
         "✋ Drag and Drop"
     }
 
-    fn show(&mut self, ctx: &Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         use crate::View as _;
         Window::new(self.name())
             .open(open)
             .default_size(vec2(256.0, 256.0))
             .vscroll(false)
             .resizable(false)
-            .show(ctx, |ui| self.ui(ui));
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
diff --git a/crates/egui_demo_lib/src/demo/extra_viewport.rs b/crates/egui_demo_lib/src/demo/extra_viewport.rs
index d7c875f5f..89ea735cf 100644
--- a/crates/egui_demo_lib/src/demo/extra_viewport.rs
+++ b/crates/egui_demo_lib/src/demo/extra_viewport.rs
@@ -10,30 +10,25 @@ impl crate::Demo for ExtraViewport {
         "🗖 Extra Viewport"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         if !*open {
             return;
         }
 
         let id = egui::Id::new(self.name());
 
-        ctx.show_viewport_immediate(
+        ui.show_viewport_immediate(
             egui::ViewportId(id),
             egui::ViewportBuilder::default()
                 .with_title(self.name())
                 .with_inner_size([400.0, 512.0]),
-            |ctx, class| {
-                if class == egui::ViewportClass::Embedded {
+            |ui, class| {
+                if class == egui::ViewportClass::EmbeddedWindow {
                     // Not a real viewport
-                    egui::Window::new(self.name())
-                        .id(id)
-                        .open(open)
-                        .show(ctx, |ui| {
-                            ui.label("This egui integration does not support multiple viewports");
-                        });
+                    ui.label("This egui integration does not support multiple viewports");
                 } else {
-                    egui::CentralPanel::default().show(ctx, |ui| {
-                        viewport_content(ui, ctx, open);
+                    egui::CentralPanel::default().show_inside(ui, |ui| {
+                        viewport_content(ui, open);
                     });
                 }
             },
@@ -41,13 +36,13 @@ impl crate::Demo for ExtraViewport {
     }
 }
 
-fn viewport_content(ui: &mut egui::Ui, ctx: &egui::Context, open: &mut bool) {
+fn viewport_content(ui: &mut egui::Ui, open: &mut bool) {
     ui.label("egui and eframe supports having multiple native windows like this, which egui calls 'viewports'.");
 
     ui.label(format!(
         "This viewport has id: {:?}, child of viewport {:?}",
-        ctx.viewport_id(),
-        ctx.parent_viewport_id()
+        ui.viewport_id(),
+        ui.parent_viewport_id()
     ));
 
     ui.label("Here you can see all the open viewports:");
diff --git a/crates/egui_demo_lib/src/demo/font_book.rs b/crates/egui_demo_lib/src/demo/font_book.rs
index 39acf844a..5144cd693 100644
--- a/crates/egui_demo_lib/src/demo/font_book.rs
+++ b/crates/egui_demo_lib/src/demo/font_book.rs
@@ -28,11 +28,14 @@ impl crate::Demo for FontBook {
         "🔤 Font Book"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
-        egui::Window::new(self.name()).open(open).show(ctx, |ui| {
-            use crate::View as _;
-            self.ui(ui);
-        });
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
+        egui::Window::new(self.name())
+            .open(open)
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
+                use crate::View as _;
+                self.ui(ui);
+            });
     }
 }
 
@@ -102,7 +105,7 @@ impl crate::View for FontBook {
                         };
 
                         if ui.add(button).on_hover_ui(tooltip_ui).clicked() {
-                            ui.ctx().copy_text(chr.to_string());
+                            ui.copy_text(chr.to_string());
                         }
                     }
                 }
diff --git a/crates/egui_demo_lib/src/demo/frame_demo.rs b/crates/egui_demo_lib/src/demo/frame_demo.rs
index 8c4fc984f..a8536c206 100644
--- a/crates/egui_demo_lib/src/demo/frame_demo.rs
+++ b/crates/egui_demo_lib/src/demo/frame_demo.rs
@@ -28,11 +28,12 @@ impl crate::Demo for FrameDemo {
         "▣ Frame"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(false)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/highlighting.rs b/crates/egui_demo_lib/src/demo/highlighting.rs
index 287111d2f..a4b5ba606 100644
--- a/crates/egui_demo_lib/src/demo/highlighting.rs
+++ b/crates/egui_demo_lib/src/demo/highlighting.rs
@@ -8,11 +8,12 @@ impl crate::Demo for Highlighting {
         "✨ Highlighting"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .default_width(320.0)
             .open(open)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/interactive_container.rs b/crates/egui_demo_lib/src/demo/interactive_container.rs
index 5faeb8458..e7315fd04 100644
--- a/crates/egui_demo_lib/src/demo/interactive_container.rs
+++ b/crates/egui_demo_lib/src/demo/interactive_container.rs
@@ -13,12 +13,13 @@ impl crate::Demo for InteractiveContainerDemo {
         "\u{20E3} Interactive Container"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(false)
             .default_width(250.0)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/misc_demo_window.rs b/crates/egui_demo_lib/src/demo/misc_demo_window.rs
index b502fa767..8ccc44d36 100644
--- a/crates/egui_demo_lib/src/demo/misc_demo_window.rs
+++ b/crates/egui_demo_lib/src/demo/misc_demo_window.rs
@@ -1,8 +1,10 @@
+use std::sync::Arc;
+
 use super::{Demo, View};
 
 use egui::{
-    Align, Align2, Checkbox, CollapsingHeader, Color32, ComboBox, Context, FontId, Resize,
-    RichText, Sense, Slider, Stroke, TextFormat, TextStyle, Ui, Vec2, Window, vec2,
+    Align, Align2, Checkbox, CollapsingHeader, Color32, ComboBox, FontId, Resize, RichText, Sense,
+    Slider, Stroke, TextFormat, TextStyle, Ui, Vec2, Window, vec2,
 };
 
 /// Showcase some ui code
@@ -47,12 +49,13 @@ impl Demo for MiscDemoWindow {
         "✨ Misc Demos"
     }
 
-    fn show(&mut self, ctx: &Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         Window::new(self.name())
             .open(open)
             .vscroll(true)
             .hscroll(true)
-            .show(ctx, |ui| self.ui(ui));
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
@@ -518,7 +521,7 @@ fn ui_stack_demo(ui: &mut Ui) {
                         with various information.\n\nThis is how the stack looks like here:",
         );
     });
-    let stack = ui.stack().clone();
+    let stack = Arc::clone(ui.stack());
     egui::Frame::new()
         .inner_margin(ui.spacing().menu_margin)
         .stroke(ui.visuals().widgets.noninteractive.bg_stroke)
@@ -541,12 +544,12 @@ fn ui_stack_demo(ui: &mut Ui) {
                                 let response = ui.label(format!("{:?}", node.id));
 
                                 if response.hovered() {
-                                    ui.ctx().debug_painter().debug_rect(
+                                    ui.debug_painter().debug_rect(
                                         node.max_rect,
                                         Color32::GREEN,
                                         "max_rect",
                                     );
-                                    ui.ctx().debug_painter().circle_filled(
+                                    ui.debug_painter().circle_filled(
                                         node.min_rect.min,
                                         2.0,
                                         Color32::RED,
diff --git a/crates/egui_demo_lib/src/demo/mod.rs b/crates/egui_demo_lib/src/demo/mod.rs
index 553221a1f..6d1906166 100644
--- a/crates/egui_demo_lib/src/demo/mod.rs
+++ b/crates/egui_demo_lib/src/demo/mod.rs
@@ -61,5 +61,5 @@ pub trait Demo {
     fn name(&self) -> &'static str;
 
     /// Show windows, etc
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool);
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool);
 }
diff --git a/crates/egui_demo_lib/src/demo/modals.rs b/crates/egui_demo_lib/src/demo/modals.rs
index a916c8bdf..ad249f594 100644
--- a/crates/egui_demo_lib/src/demo/modals.rs
+++ b/crates/egui_demo_lib/src/demo/modals.rs
@@ -1,4 +1,4 @@
-use egui::{ComboBox, Context, Id, Modal, ProgressBar, Ui, Widget as _, Window};
+use egui::{ComboBox, Id, Modal, ProgressBar, Ui, Widget as _, Window};
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[cfg_attr(feature = "serde", serde(default))]
@@ -32,13 +32,14 @@ impl crate::Demo for Modals {
         "🗖 Modals"
     }
 
-    fn show(&mut self, ctx: &Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         use crate::View as _;
         Window::new(self.name())
             .open(open)
             .vscroll(false)
             .resizable(false)
-            .show(ctx, |ui| self.ui(ui));
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
@@ -149,7 +150,7 @@ impl crate::View for Modals {
                     *user_modal_open = false;
                 } else {
                     *save_progress = Some(progress + 0.003);
-                    ui.ctx().request_repaint();
+                    ui.request_repaint();
                 }
             });
         }
@@ -176,9 +177,9 @@ mod tests {
             ..Modals::default()
         };
 
-        let mut harness = Harness::new_state(
-            |ctx, modals| {
-                modals.show(ctx, &mut true);
+        let mut harness = Harness::new_ui_state(
+            |ui, modals| {
+                modals.show(ui, &mut true);
             },
             initial_state,
         );
@@ -204,9 +205,9 @@ mod tests {
             ..Modals::default()
         };
 
-        let mut harness = Harness::new_state(
-            |ctx, modals| {
-                modals.show(ctx, &mut true);
+        let mut harness = Harness::new_ui_state(
+            |ui, modals| {
+                modals.show(ui, &mut true);
             },
             initial_state,
         );
@@ -228,9 +229,9 @@ mod tests {
             ..Modals::default()
         };
 
-        let mut harness = Harness::new_state(
-            |ctx, modals| {
-                modals.show(ctx, &mut true);
+        let mut harness = Harness::new_ui_state(
+            |ui, modals| {
+                modals.show(ui, &mut true);
             },
             initial_state,
         );
@@ -258,9 +259,9 @@ mod tests {
             ..Modals::default()
         };
 
-        let mut harness = Harness::new_state(
-            |ctx, modals| {
-                modals.show(ctx, &mut true);
+        let mut harness = Harness::new_ui_state(
+            |ui, modals| {
+                modals.show(ui, &mut true);
             },
             initial_state,
         );
diff --git a/crates/egui_demo_lib/src/demo/multi_touch.rs b/crates/egui_demo_lib/src/demo/multi_touch.rs
index d83e548bd..4af2c1bf0 100644
--- a/crates/egui_demo_lib/src/demo/multi_touch.rs
+++ b/crates/egui_demo_lib/src/demo/multi_touch.rs
@@ -27,12 +27,13 @@ impl crate::Demo for MultiTouch {
         "👌 Multi Touch"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .default_size(vec2(544.0, 512.0))
             .resizable(true)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
@@ -141,7 +142,7 @@ impl MultiTouch {
 
         let delay = 0.5;
         if time_since_last_touch < delay {
-            ui.ctx().request_repaint();
+            ui.request_repaint();
         } else {
             // seconds after which half the amount of zoom/rotation will be reverted:
             let half_life =
@@ -157,7 +158,7 @@ impl MultiTouch {
                 self.zoom = 1. + ((self.zoom - 1.) * half_life_factor);
                 self.rotation *= half_life_factor;
                 self.translation *= half_life_factor;
-                ui.ctx().request_repaint();
+                ui.request_repaint();
             }
         }
     }
diff --git a/crates/egui_demo_lib/src/demo/paint_bezier.rs b/crates/egui_demo_lib/src/demo/paint_bezier.rs
index 57def359f..22ed86dea 100644
--- a/crates/egui_demo_lib/src/demo/paint_bezier.rs
+++ b/crates/egui_demo_lib/src/demo/paint_bezier.rs
@@ -1,6 +1,6 @@
 use egui::{
-    Color32, Context, Frame, Grid, Pos2, Rect, Sense, Shape, Stroke, StrokeKind, Ui, Vec2,
-    Widget as _, Window, emath,
+    Color32, Frame, Grid, Pos2, Rect, Sense, Shape, Stroke, StrokeKind, Ui, Vec2, Widget as _,
+    Window, emath,
     epaint::{self, CubicBezierShape, PathShape, QuadraticBezierShape},
     pos2,
 };
@@ -73,8 +73,7 @@ impl PaintBezier {
         ui.collapsing("Global tessellation options", |ui| {
             let mut tessellation_options = ui.ctx().tessellation_options(|to| *to);
             tessellation_options.ui(ui);
-            ui.ctx()
-                .tessellation_options_mut(|to| *to = tessellation_options);
+            ui.tessellation_options_mut(|to| *to = tessellation_options);
         });
 
         ui.radio_value(&mut self.degree, 3, "Quadratic Bézier");
@@ -166,14 +165,15 @@ impl crate::Demo for PaintBezier {
         "） Bézier Curve"
     }
 
-    fn show(&mut self, ctx: &Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         use crate::View as _;
         Window::new(self.name())
             .open(open)
             .vscroll(false)
             .resizable(false)
             .default_size([300.0, 350.0])
-            .show(ctx, |ui| self.ui(ui));
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
diff --git a/crates/egui_demo_lib/src/demo/painting.rs b/crates/egui_demo_lib/src/demo/painting.rs
index 5a4942f68..0915febd3 100644
--- a/crates/egui_demo_lib/src/demo/painting.rs
+++ b/crates/egui_demo_lib/src/demo/painting.rs
@@ -1,4 +1,4 @@
-use egui::{Color32, Context, Frame, Pos2, Rect, Sense, Stroke, Ui, Window, emath, vec2};
+use egui::{Color32, Frame, Pos2, Rect, Sense, Stroke, Ui, Window, emath, vec2};
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[cfg_attr(feature = "serde", serde(default))]
@@ -77,13 +77,14 @@ impl crate::Demo for Painting {
         "🖊 Painting"
     }
 
-    fn show(&mut self, ctx: &Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         use crate::View as _;
         Window::new(self.name())
             .open(open)
             .default_size(vec2(512.0, 512.0))
             .vscroll(false)
-            .show(ctx, |ui| self.ui(ui));
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
diff --git a/crates/egui_demo_lib/src/demo/panels.rs b/crates/egui_demo_lib/src/demo/panels.rs
index 55771c1a1..165838694 100644
--- a/crates/egui_demo_lib/src/demo/panels.rs
+++ b/crates/egui_demo_lib/src/demo/panels.rs
@@ -7,14 +7,15 @@ impl crate::Demo for Panels {
         "🗖 Panels"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         use crate::View as _;
-        let window = egui::Window::new("Panels")
+        egui::Window::new("Panels")
             .default_width(600.0)
             .default_height(400.0)
             .vscroll(false)
-            .open(open);
-        window.show(ctx, |ui| self.ui(ui));
+            .open(open)
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
@@ -72,6 +73,7 @@ impl crate::View for Panels {
                 });
             });
 
+        // TODO(emilk): This extra panel is superfluous - just use what's left of `ui` instead
         egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.vertical_centered(|ui| {
                 ui.heading("Central Panel");
diff --git a/crates/egui_demo_lib/src/demo/popups.rs b/crates/egui_demo_lib/src/demo/popups.rs
index cb14f0cc7..144826e0a 100644
--- a/crates/egui_demo_lib/src/demo/popups.rs
+++ b/crates/egui_demo_lib/src/demo/popups.rs
@@ -128,13 +128,14 @@ impl crate::Demo for PopupsDemo {
         "\u{2755} Popups"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(false)
             .default_width(250.0)
             .constrain(false)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/scene.rs b/crates/egui_demo_lib/src/demo/scene.rs
index ba0dc5974..a9791eeb9 100644
--- a/crates/egui_demo_lib/src/demo/scene.rs
+++ b/crates/egui_demo_lib/src/demo/scene.rs
@@ -22,14 +22,15 @@ impl crate::Demo for SceneDemo {
         "🔍 Scene"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         use crate::View as _;
-        let window = egui::Window::new("Scene")
+        egui::Window::new("Scene")
             .default_width(300.0)
             .default_height(300.0)
             .scroll(false)
-            .open(open);
-        window.show(ctx, |ui| self.ui(ui));
+            .open(open)
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
diff --git a/crates/egui_demo_lib/src/demo/screenshot.rs b/crates/egui_demo_lib/src/demo/screenshot.rs
index 64370ec07..59aab3a39 100644
--- a/crates/egui_demo_lib/src/demo/screenshot.rs
+++ b/crates/egui_demo_lib/src/demo/screenshot.rs
@@ -13,12 +13,13 @@ impl crate::Demo for Screenshot {
         "📷 Screenshot"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(false)
             .default_width(250.0)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
@@ -43,17 +44,16 @@ impl crate::View for Screenshot {
             let capture = ui.button("📷 Take Screenshot").clicked();
             ui.checkbox(&mut self.continuous, "Capture continuously");
             if capture || self.continuous {
-                ui.ctx()
-                    .send_viewport_cmd(ViewportCommand::Screenshot(UserData::default()));
+                ui.send_viewport_cmd(ViewportCommand::Screenshot(UserData::default()));
             }
         });
 
-        let image = ui.ctx().input(|i| {
+        let image = ui.input(|i| {
             i.events
                 .iter()
                 .filter_map(|e| {
                     if let egui::Event::Screenshot { image, .. } = e {
-                        Some(image.clone())
+                        Some(Arc::clone(image))
                     } else {
                         None
                     }
@@ -63,7 +63,7 @@ impl crate::View for Screenshot {
 
         if let Some(image) = image {
             self.image = Some((
-                image.clone(),
+                Arc::clone(&image),
                 ui.ctx()
                     .load_texture("screenshot_demo", image, Default::default()),
             ));
diff --git a/crates/egui_demo_lib/src/demo/scrolling.rs b/crates/egui_demo_lib/src/demo/scrolling.rs
index 8c1250a9c..cee525aaa 100644
--- a/crates/egui_demo_lib/src/demo/scrolling.rs
+++ b/crates/egui_demo_lib/src/demo/scrolling.rs
@@ -30,13 +30,14 @@ impl crate::Demo for Scrolling {
         "↕ Scrolling"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(true)
             .hscroll(false)
             .vscroll(false)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
@@ -114,7 +115,7 @@ impl ScrollAppearance {
             visibility,
         } = self;
 
-        let mut scroll = ui.ctx().style().spacing.scroll;
+        let mut scroll = ui.global_style().spacing.scroll;
 
         scroll.ui(ui);
 
@@ -388,6 +389,6 @@ impl crate::View for ScrollStickTo {
         );
 
         self.n_items += 1;
-        ui.ctx().request_repaint();
+        ui.request_repaint();
     }
 }
diff --git a/crates/egui_demo_lib/src/demo/sliders.rs b/crates/egui_demo_lib/src/demo/sliders.rs
index 6b512e1ea..7dab0f26c 100644
--- a/crates/egui_demo_lib/src/demo/sliders.rs
+++ b/crates/egui_demo_lib/src/demo/sliders.rs
@@ -43,11 +43,12 @@ impl crate::Demo for Sliders {
         "⬌ Sliders"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(false)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/strip_demo.rs b/crates/egui_demo_lib/src/demo/strip_demo.rs
index c9231f1bc..94df7bb57 100644
--- a/crates/egui_demo_lib/src/demo/strip_demo.rs
+++ b/crates/egui_demo_lib/src/demo/strip_demo.rs
@@ -11,12 +11,13 @@ impl crate::Demo for StripDemo {
         "▣ Strip"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(true)
             .default_width(400.0)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/table_demo.rs b/crates/egui_demo_lib/src/demo/table_demo.rs
index a347df502..27a2c3672 100644
--- a/crates/egui_demo_lib/src/demo/table_demo.rs
+++ b/crates/egui_demo_lib/src/demo/table_demo.rs
@@ -47,11 +47,12 @@ impl crate::Demo for TableDemo {
         "☰ Table"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .default_width(400.0)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/tests/clipboard_test.rs b/crates/egui_demo_lib/src/demo/tests/clipboard_test.rs
index fb4cf0906..2d4630112 100644
--- a/crates/egui_demo_lib/src/demo/tests/clipboard_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/clipboard_test.rs
@@ -15,11 +15,14 @@ impl crate::Demo for ClipboardTest {
         "Clipboard Test"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
-        egui::Window::new(self.name()).open(open).show(ctx, |ui| {
-            use crate::View as _;
-            self.ui(ui);
-        });
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
+        egui::Window::new(self.name())
+            .open(open)
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
+                use crate::View as _;
+                self.ui(ui);
+            });
     }
 }
 
@@ -32,7 +35,7 @@ impl crate::View for ClipboardTest {
             .horizontal(|ui| {
                 let text_edit_response = ui.text_edit_singleline(&mut self.text);
                 if ui.button("📋").clicked() {
-                    ui.ctx().copy_text(self.text.clone());
+                    ui.copy_text(self.text.clone());
                 }
                 text_edit_response
             })
@@ -48,7 +51,7 @@ impl crate::View for ClipboardTest {
                 ] {
                     if ui.button(name).clicked() {
                         // Next frame we should get a copy/cut/paste-event…
-                        ui.ctx().send_viewport_cmd(cmd);
+                        ui.send_viewport_cmd(cmd);
 
                         // …that should en up here:
                         text_edit_response.request_focus();
@@ -69,7 +72,7 @@ impl crate::View for ClipboardTest {
                 ui.ctx().try_load_image(&uri, Default::default())
                 && ui.button("📋").clicked()
             {
-                ui.ctx().copy_image((*image).clone());
+                ui.copy_image((*image).clone());
             }
         });
 
diff --git a/crates/egui_demo_lib/src/demo/tests/cursor_test.rs b/crates/egui_demo_lib/src/demo/tests/cursor_test.rs
index 78214d5eb..5a6703627 100644
--- a/crates/egui_demo_lib/src/demo/tests/cursor_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/cursor_test.rs
@@ -6,11 +6,14 @@ impl crate::Demo for CursorTest {
         "Cursor Test"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
-        egui::Window::new(self.name()).open(open).show(ctx, |ui| {
-            use crate::View as _;
-            self.ui(ui);
-        });
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
+        egui::Window::new(self.name())
+            .open(open)
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
+                use crate::View as _;
+                self.ui(ui);
+            });
     }
 }
 
diff --git a/crates/egui_demo_lib/src/demo/tests/grid_test.rs b/crates/egui_demo_lib/src/demo/tests/grid_test.rs
index 0b7bfa485..1806eb431 100644
--- a/crates/egui_demo_lib/src/demo/tests/grid_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/grid_test.rs
@@ -24,11 +24,14 @@ impl crate::Demo for GridTest {
         "Grid Test"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
-        egui::Window::new(self.name()).open(open).show(ctx, |ui| {
-            use crate::View as _;
-            self.ui(ui);
-        });
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
+        egui::Window::new(self.name())
+            .open(open)
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
+                use crate::View as _;
+                self.ui(ui);
+            });
     }
 }
 
diff --git a/crates/egui_demo_lib/src/demo/tests/id_test.rs b/crates/egui_demo_lib/src/demo/tests/id_test.rs
index 6fd0e067a..6c6895b75 100644
--- a/crates/egui_demo_lib/src/demo/tests/id_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/id_test.rs
@@ -6,18 +6,21 @@ impl crate::Demo for IdTest {
         "ID Test"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
-        egui::Window::new(self.name()).open(open).show(ctx, |ui| {
-            use crate::View as _;
-            self.ui(ui);
-        });
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
+        egui::Window::new(self.name())
+            .open(open)
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
+                use crate::View as _;
+                self.ui(ui);
+            });
     }
 }
 
 impl crate::View for IdTest {
     fn ui(&mut self, ui: &mut egui::Ui) {
         // Make sure the warnings are on (by default they are only on in debug builds).
-        ui.ctx().options_mut(|opt| opt.warn_on_id_clash = true);
+        ui.options_mut(|opt| opt.warn_on_id_clash = true);
 
         ui.heading("Name collision example");
 
diff --git a/crates/egui_demo_lib/src/demo/tests/input_event_history.rs b/crates/egui_demo_lib/src/demo/tests/input_event_history.rs
index 25a242089..5c1a6059f 100644
--- a/crates/egui_demo_lib/src/demo/tests/input_event_history.rs
+++ b/crates/egui_demo_lib/src/demo/tests/input_event_history.rs
@@ -70,13 +70,14 @@ impl crate::Demo for InputEventHistory {
         "Input Event History"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .default_width(800.0)
             .open(open)
             .resizable(true)
             .scroll(false)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/tests/input_test.rs b/crates/egui_demo_lib/src/demo/tests/input_test.rs
index 896716686..e237b3e4b 100644
--- a/crates/egui_demo_lib/src/demo/tests/input_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/input_test.rs
@@ -59,13 +59,14 @@ impl crate::Demo for InputTest {
         "Input Test"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .default_width(800.0)
             .open(open)
             .resizable(true)
             .scroll(false)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/tests/layout_test.rs b/crates/egui_demo_lib/src/demo/tests/layout_test.rs
index f63eff0a9..73c9efc2f 100644
--- a/crates/egui_demo_lib/src/demo/tests/layout_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/layout_test.rs
@@ -78,11 +78,12 @@ impl crate::Demo for LayoutTest {
         "Layout Test"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(false)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/tests/manual_layout_test.rs b/crates/egui_demo_lib/src/demo/tests/manual_layout_test.rs
index 5d3da2262..2ab788767 100644
--- a/crates/egui_demo_lib/src/demo/tests/manual_layout_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/manual_layout_test.rs
@@ -29,11 +29,12 @@ impl crate::Demo for ManualLayoutTest {
         "Manual Layout Test"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .resizable(false)
             .open(open)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
diff --git a/crates/egui_demo_lib/src/demo/tests/svg_test.rs b/crates/egui_demo_lib/src/demo/tests/svg_test.rs
index 930d1b5f6..cd73f9150 100644
--- a/crates/egui_demo_lib/src/demo/tests/svg_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/svg_test.rs
@@ -15,11 +15,14 @@ impl crate::Demo for SvgTest {
         "SVG Test"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
-        egui::Window::new(self.name()).open(open).show(ctx, |ui| {
-            use crate::View as _;
-            self.ui(ui);
-        });
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
+        egui::Window::new(self.name())
+            .open(open)
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
+                use crate::View as _;
+                self.ui(ui);
+            });
     }
 }
 
diff --git a/crates/egui_demo_lib/src/demo/tests/tessellation_test.rs b/crates/egui_demo_lib/src/demo/tests/tessellation_test.rs
index cb08cf24e..3bb814889 100644
--- a/crates/egui_demo_lib/src/demo/tests/tessellation_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/tessellation_test.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
 use egui::{
     Color32, Pos2, Rect, Sense, StrokeKind, Vec2,
     emath::{GuiRounding as _, TSTransform},
@@ -122,11 +124,12 @@ impl crate::Demo for TessellationTest {
         "Tessellation Test"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .resizable(false)
             .open(open)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
@@ -229,8 +232,8 @@ impl crate::View for TessellationTest {
                     TSTransform::from_translation(canvas.center().to_vec2())
                         * TSTransform::from_scaling(magnification_pixel_size),
                 );
-                let mesh = std::sync::Arc::new(mesh);
-                painter.add(epaint::Shape::mesh(mesh.clone()));
+                let mesh = Arc::new(mesh);
+                painter.add(epaint::Shape::mesh(Arc::clone(&mesh)));
 
                 if self.paint_edges {
                     let stroke = epaint::Stroke::new(0.5, Color32::MAGENTA);
@@ -357,11 +360,13 @@ fn rect_shape_ui(ui: &mut egui::Ui, shape: &mut RectShape) {
 #[cfg(test)]
 mod tests {
     use crate::View as _;
+    use egui_kittest::SnapshotResults;
 
     use super::*;
 
     #[test]
     fn snapshot_tessellation_test() {
+        let mut results = SnapshotResults::new();
         for (name, shape) in TessellationTest::interesting_shapes() {
             let mut test = TessellationTest {
                 shape,
@@ -375,6 +380,7 @@ mod tests {
             harness.run();
 
             harness.snapshot(format!("tessellation_test/{name}"));
+            results.extend_harness(&mut harness);
         }
     }
 }
diff --git a/crates/egui_demo_lib/src/demo/tests/window_resize_test.rs b/crates/egui_demo_lib/src/demo/tests/window_resize_test.rs
index 39a189a39..c44221efc 100644
--- a/crates/egui_demo_lib/src/demo/tests/window_resize_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/window_resize_test.rs
@@ -15,13 +15,14 @@ impl crate::Demo for WindowResizeTest {
         "Window Resize Test"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         use egui::{Resize, ScrollArea, TextEdit, Window};
 
         Window::new("↔ auto-sized")
             .open(open)
             .auto_sized()
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 ui.label("This window will auto-size based on its contents.");
                 ui.heading("Resize this area:");
                 Resize::default().show(ui, |ui| {
@@ -35,7 +36,8 @@ impl crate::Demo for WindowResizeTest {
             .vscroll(true)
             .resizable(true)
             .default_height(300.0)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 ui.label(
                     "This window is resizable and has a scroll area. You can shrink it to any size.",
                 );
@@ -48,7 +50,8 @@ impl crate::Demo for WindowResizeTest {
             .vscroll(false)
             .resizable(true)
             .default_height(300.0)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 ui.label("This window is resizable but has no built-in scroll area.");
                 ui.label("However, we have a sub-region with a scroll bar:");
                 ui.separator();
@@ -64,7 +67,8 @@ impl crate::Demo for WindowResizeTest {
             .open(open)
             .vscroll(false)
             .resizable(true)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 ui.label("This window is resizable but has no scroll area. This means it can only be resized to a size where all the contents is visible.");
                 ui.label("egui will not clip the contents of a window, nor add whitespace to it.");
                 ui.separator();
@@ -76,7 +80,8 @@ impl crate::Demo for WindowResizeTest {
             .vscroll(false)
             .resizable(true)
             .default_height(300.0)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 ui.label("Shows how you can fill an area with a widget.");
                 ui.add_sized(ui.available_size(), TextEdit::multiline(&mut self.text));
             });
@@ -86,7 +91,8 @@ impl crate::Demo for WindowResizeTest {
             .vscroll(false)
             .resizable(true)
             .default_size([250.0, 150.0])
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 ui.label("This window has empty space that fills up the available space, preventing auto-shrink.");
                 ui.vertical_centered(|ui| {
                     ui.add(crate::egui_github_link_file!());
diff --git a/crates/egui_demo_lib/src/demo/text_edit.rs b/crates/egui_demo_lib/src/demo/text_edit.rs
index 345c88efe..4ac981807 100644
--- a/crates/egui_demo_lib/src/demo/text_edit.rs
+++ b/crates/egui_demo_lib/src/demo/text_edit.rs
@@ -19,11 +19,12 @@ impl crate::Demo for TextEditDemo {
         "🖹 TextEdit"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(false)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
@@ -92,7 +93,7 @@ impl crate::View for TextEditDemo {
                         .cursor
                         .set_char_range(Some(egui::text::CCursorRange::one(ccursor)));
                     state.store(ui.ctx(), text_edit_id);
-                    ui.ctx().memory_mut(|mem| mem.request_focus(text_edit_id)); // give focus back to the [`TextEdit`].
+                    ui.memory_mut(|mem| mem.request_focus(text_edit_id)); // give focus back to the [`TextEdit`].
                 }
             }
 
@@ -104,7 +105,7 @@ impl crate::View for TextEditDemo {
                         .cursor
                         .set_char_range(Some(egui::text::CCursorRange::one(ccursor)));
                     state.store(ui.ctx(), text_edit_id);
-                    ui.ctx().memory_mut(|mem| mem.request_focus(text_edit_id)); // give focus back to the [`TextEdit`].
+                    ui.memory_mut(|mem| mem.request_focus(text_edit_id)); // give focus back to the [`TextEdit`].
                 }
             }
         });
@@ -120,9 +121,9 @@ mod tests {
     #[test]
     pub fn should_type() {
         let text = "Hello, world!".to_owned();
-        let mut harness = Harness::new_state(
-            move |ctx, text| {
-                CentralPanel::default().show(ctx, |ui| {
+        let mut harness = Harness::new_ui_state(
+            move |ui, text| {
+                CentralPanel::default().show_inside(ui, |ui| {
                     ui.text_edit_singleline(text);
                 });
             },
diff --git a/crates/egui_demo_lib/src/demo/text_layout.rs b/crates/egui_demo_lib/src/demo/text_layout.rs
index 8f100b55d..ef84fb326 100644
--- a/crates/egui_demo_lib/src/demo/text_layout.rs
+++ b/crates/egui_demo_lib/src/demo/text_layout.rs
@@ -28,11 +28,12 @@ impl crate::Demo for TextLayoutDemo {
         "🖹 Text Layout"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(true)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
@@ -52,7 +53,7 @@ impl crate::View for TextLayoutDemo {
 
         use egui::text::LayoutJob;
 
-        let pixels_per_point = ui.ctx().pixels_per_point();
+        let pixels_per_point = ui.pixels_per_point();
         let points_per_pixel = 1.0 / pixels_per_point;
 
         ui.vertical_centered(|ui| {
diff --git a/crates/egui_demo_lib/src/demo/tooltips.rs b/crates/egui_demo_lib/src/demo/tooltips.rs
index cc474bd4d..d158c4f95 100644
--- a/crates/egui_demo_lib/src/demo/tooltips.rs
+++ b/crates/egui_demo_lib/src/demo/tooltips.rs
@@ -15,15 +15,16 @@ impl crate::Demo for Tooltips {
         "🗖 Tooltips"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         use crate::View as _;
-        let window = egui::Window::new("Tooltips")
+        egui::Window::new("Tooltips")
             .constrain(false) // So we can test how tooltips behave close to the screen edge
             .resizable(true)
             .default_size([450.0, 300.0])
             .scroll(false)
-            .open(open);
-        window.show(ctx, |ui| self.ui(ui));
+            .open(open)
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| self.ui(ui));
     }
 }
 
diff --git a/crates/egui_demo_lib/src/demo/undo_redo.rs b/crates/egui_demo_lib/src/demo/undo_redo.rs
index 5e6aff2ca..48e9fc040 100644
--- a/crates/egui_demo_lib/src/demo/undo_redo.rs
+++ b/crates/egui_demo_lib/src/demo/undo_redo.rs
@@ -31,11 +31,12 @@ impl crate::Demo for UndoRedoDemo {
         "⟲ Undo Redo"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable(false)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
@@ -69,6 +70,6 @@ impl crate::View for UndoRedoDemo {
         });
 
         self.undoer
-            .feed_state(ui.ctx().input(|input| input.time), &self.state);
+            .feed_state(ui.input(|input| input.time), &self.state);
     }
 }
diff --git a/crates/egui_demo_lib/src/demo/widget_gallery.rs b/crates/egui_demo_lib/src/demo/widget_gallery.rs
index 214646d49..fe783af1c 100644
--- a/crates/egui_demo_lib/src/demo/widget_gallery.rs
+++ b/crates/egui_demo_lib/src/demo/widget_gallery.rs
@@ -48,7 +48,7 @@ impl Default for WidgetGallery {
 }
 
 impl WidgetGallery {
-    #[allow(unused_mut, clippy::allow_attributes)] // if not chrono
+    #[allow(clippy::allow_attributes, unused_mut)] // if not chrono
     #[inline]
     pub fn with_date_button(mut self, _with_date_button: bool) -> Self {
         #[cfg(feature = "chrono")]
@@ -64,12 +64,13 @@ impl crate::Demo for WidgetGallery {
         "🗄 Widget Gallery"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         egui::Window::new(self.name())
             .open(open)
             .resizable([true, false]) // resizable so we can shrink if the text edit grows
             .default_width(280.0)
-            .show(ctx, |ui| {
+            .constrain_to(ui.available_rect_before_wrap())
+            .show(ui, |ui| {
                 use crate::View as _;
                 self.ui(ui);
             });
@@ -310,7 +311,7 @@ mod tests {
     use super::*;
     use crate::View as _;
     use egui::Vec2;
-    use egui_kittest::Harness;
+    use egui_kittest::{Harness, SnapshotResults};
 
     #[test]
     pub fn should_match_screenshot() {
@@ -320,6 +321,8 @@ mod tests {
             ..Default::default()
         };
 
+        let mut results = SnapshotResults::new();
+
         for pixels_per_point in [1, 2] {
             for theme in [egui::Theme::Light, egui::Theme::Dark] {
                 let mut harness = Harness::builder()
@@ -339,6 +342,7 @@ mod tests {
                 };
                 let image_name = format!("widget_gallery_{theme_name}_x{pixels_per_point}");
                 harness.snapshot(&image_name);
+                results.extend_harness(&mut harness);
             }
         }
     }
diff --git a/crates/egui_demo_lib/src/demo/window_options.rs b/crates/egui_demo_lib/src/demo/window_options.rs
index 67ec22463..a04351714 100644
--- a/crates/egui_demo_lib/src/demo/window_options.rs
+++ b/crates/egui_demo_lib/src/demo/window_options.rs
@@ -40,7 +40,7 @@ impl crate::Demo for WindowOptions {
         "🗖 Window Options"
     }
 
-    fn show(&mut self, ctx: &egui::Context, open: &mut bool) {
+    fn show(&mut self, ui: &mut egui::Ui, open: &mut bool) {
         let Self {
             title,
             title_bar,
@@ -55,9 +55,9 @@ impl crate::Demo for WindowOptions {
             anchor_offset,
         } = self.clone();
 
-        let enabled = ctx.input(|i| i.time) - disabled_time > 2.0;
+        let enabled = ui.input(|i| i.time) - disabled_time > 2.0;
         if !enabled {
-            ctx.request_repaint();
+            ui.request_repaint();
         }
 
         use crate::View as _;
@@ -68,6 +68,7 @@ impl crate::Demo for WindowOptions {
             .collapsible(collapsible)
             .title_bar(title_bar)
             .scroll(scroll2)
+            .constrain_to(ui.available_rect_before_wrap())
             .enabled(enabled);
         if closable {
             window = window.open(open);
@@ -75,7 +76,7 @@ impl crate::Demo for WindowOptions {
         if anchored {
             window = window.anchor(anchor, anchor_offset);
         }
-        window.show(ctx, |ui| self.ui(ui));
+        window.show(ui, |ui| self.ui(ui));
     }
 }
 
diff --git a/crates/egui_demo_lib/src/easy_mark/easy_mark_editor.rs b/crates/egui_demo_lib/src/easy_mark/easy_mark_editor.rs
index 28e12630e..2969c6d3d 100644
--- a/crates/egui_demo_lib/src/easy_mark/easy_mark_editor.rs
+++ b/crates/egui_demo_lib/src/easy_mark/easy_mark_editor.rs
@@ -32,15 +32,15 @@ impl Default for EasyMarkEditor {
 }
 
 impl EasyMarkEditor {
-    pub fn panels(&mut self, ctx: &egui::Context) {
-        egui::Panel::bottom("easy_mark_bottom").show(ctx, |ui| {
+    pub fn panels(&mut self, ui: &mut egui::Ui) {
+        egui::Panel::bottom("easy_mark_bottom").show_inside(ui, |ui| {
             let layout = egui::Layout::top_down(egui::Align::Center).with_main_justify(true);
             ui.allocate_ui_with_layout(ui.available_size(), layout, |ui| {
                 ui.add(crate::egui_github_link_file!())
             })
         });
 
-        egui::CentralPanel::default().show(ctx, |ui| {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             self.ui(ui);
         });
     }
diff --git a/crates/egui_demo_lib/src/lib.rs b/crates/egui_demo_lib/src/lib.rs
index 76be28859..3d715f3c0 100644
--- a/crates/egui_demo_lib/src/lib.rs
+++ b/crates/egui_demo_lib/src/lib.rs
@@ -8,8 +8,7 @@
 #![cfg_attr(feature = "document-features", doc = document_features::document_features!())]
 //!
 
-#![allow(clippy::float_cmp)]
-#![allow(clippy::manual_range_contains)]
+#![expect(clippy::unwrap_used)] // TODO(emilk): avoid unwraps
 
 mod demo;
 pub mod easy_mark;
@@ -73,8 +72,8 @@ fn test_egui_e2e() {
 
     const NUM_FRAMES: usize = 5;
     for _ in 0..NUM_FRAMES {
-        let full_output = ctx.run(raw_input.clone(), |ctx| {
-            demo_windows.ui(ctx);
+        let full_output = ctx.run_ui(raw_input.clone(), |ui| {
+            demo_windows.ui(ui);
         });
         let clipped_primitives = ctx.tessellate(full_output.shapes, full_output.pixels_per_point);
         assert!(!clipped_primitives.is_empty());
@@ -92,8 +91,8 @@ fn test_egui_zero_window_size() {
 
     const NUM_FRAMES: usize = 5;
     for _ in 0..NUM_FRAMES {
-        let full_output = ctx.run(raw_input.clone(), |ctx| {
-            demo_windows.ui(ctx);
+        let full_output = ctx.run_ui(raw_input.clone(), |ui| {
+            demo_windows.ui(ui);
         });
         let clipped_primitives = ctx.tessellate(full_output.shapes, full_output.pixels_per_point);
         assert!(
diff --git a/crates/egui_demo_lib/src/rendering_test.rs b/crates/egui_demo_lib/src/rendering_test.rs
index e6f8b2c2d..c69a6669f 100644
--- a/crates/egui_demo_lib/src/rendering_test.rs
+++ b/crates/egui_demo_lib/src/rendering_test.rs
@@ -461,7 +461,7 @@ fn pixel_test_strokes(ui: &mut Ui) {
         egui::Color32::BLACK
     };
 
-    let pixels_per_point = ui.ctx().pixels_per_point();
+    let pixels_per_point = ui.pixels_per_point();
 
     for thickness_pixels in 1..=3 {
         let thickness_pixels = thickness_pixels as f32;
@@ -506,7 +506,7 @@ fn pixel_test_squares(ui: &mut Ui) {
         egui::Color32::BLACK
     };
 
-    let pixels_per_point = ui.ctx().pixels_per_point();
+    let pixels_per_point = ui.pixels_per_point();
 
     let num_squares = (pixels_per_point * 10.0).round().max(10.0) as u32;
     let size_pixels = vec2(
@@ -532,7 +532,7 @@ fn pixel_test_squares(ui: &mut Ui) {
 }
 
 fn pixel_test_lines(ui: &mut Ui) {
-    let pixels_per_point = ui.ctx().pixels_per_point();
+    let pixels_per_point = ui.pixels_per_point();
     let n = (96.0 * pixels_per_point) as usize;
 
     ui.label("The lines should be exactly one physical pixel wide, one physical pixel apart.");
diff --git a/crates/egui_demo_lib/tests/image_blending.rs b/crates/egui_demo_lib/tests/image_blending.rs
index c8e5775a8..5cf129efc 100644
--- a/crates/egui_demo_lib/tests/image_blending.rs
+++ b/crates/egui_demo_lib/tests/image_blending.rs
@@ -3,6 +3,7 @@ use egui_kittest::Harness;
 
 #[test]
 fn test_image_blending() {
+    let mut results = egui_kittest::SnapshotResults::new();
     for pixels_per_point in [1.0, 2.0] {
         let mut harness = Harness::builder()
             .with_pixels_per_point(pixels_per_point)
@@ -21,5 +22,6 @@ fn test_image_blending() {
         harness.run();
         harness.fit_contents();
         harness.snapshot(format!("image_blending/image_x{pixels_per_point}"));
+        results.extend_harness(&mut harness);
     }
 }
diff --git a/crates/egui_demo_lib/tests/misc.rs b/crates/egui_demo_lib/tests/misc.rs
index af8858bca..8abc69d19 100644
--- a/crates/egui_demo_lib/tests/misc.rs
+++ b/crates/egui_demo_lib/tests/misc.rs
@@ -3,6 +3,7 @@ use egui_kittest::{Harness, kittest::Queryable as _};
 
 #[test]
 fn test_kerning() {
+    let mut results = egui_kittest::SnapshotResults::new();
     for pixels_per_point in [1.0, 2.0] {
         for theme in [egui::Theme::Dark, egui::Theme::Light] {
             let mut harness = Harness::builder()
@@ -24,12 +25,14 @@ fn test_kerning() {
                     egui::Theme::Light => "light",
                 }
             ));
+            results.extend_harness(&mut harness);
         }
     }
 }
 
 #[test]
 fn test_italics() {
+    let mut results = egui_kittest::SnapshotResults::new();
     for pixels_per_point in [1.0, 2.0_f32.sqrt(), 2.0] {
         for theme in [egui::Theme::Dark, egui::Theme::Light] {
             let mut harness = Harness::builder()
@@ -49,6 +52,7 @@ fn test_italics() {
                     egui::Theme::Light => "light",
                 }
             ));
+            results.extend_harness(&mut harness);
         }
     }
 }
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Bézier Curve.png b/crates/egui_demo_lib/tests/snapshots/demos/Bézier Curve.png
index fcab88179..71bed3294 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Bézier Curve.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Bézier Curve.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:30929184fab7e7d5975243d86bcab79cd9f7a0c5d57dd9ae827464ff6570be7b
-size 31795
+oid sha256:bff16d453b960bb9abcdd9f72dab73f8f25da6339a0e1c310ed352f57080db93
+size 32426
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Clipboard Test.png b/crates/egui_demo_lib/tests/snapshots/demos/Clipboard Test.png
index 373adc234..be63a88ea 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Clipboard Test.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Clipboard Test.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb944eca56724f6a2106ea8db2043dc94c0ea40bdd4cdeb0e520790f97cc9598
-size 27049
+oid sha256:52d2233594c4bad348f5479dcfad9576ee5fd7d49faedb6f5ba74b374cdaf3ad
+size 26977
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Code Editor.png b/crates/egui_demo_lib/tests/snapshots/demos/Code Editor.png
index a62936ff2..91200ed0f 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Code Editor.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Code Editor.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e4a6476a2bb8980a9207868b77a253c65c0ba8433f843bb17e622856695b720
-size 27686
+oid sha256:47f6cd15b88df83a9b2d8538e424041e661712f2e85312166a581f69f1254643
+size 26839
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Code Example.png b/crates/egui_demo_lib/tests/snapshots/demos/Code Example.png
index 22341d7b3..5d4cc4d49 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Code Example.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Code Example.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5c1951b99908326b3f05ebb72aa4d02d0f297bdd925f38ded09041fae45400c1
-size 85217
+oid sha256:9302478abb0b86fae1af3af45d91f032272a56a2098405525d08aba4f9534644
+size 76103
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Cursor Test.png b/crates/egui_demo_lib/tests/snapshots/demos/Cursor Test.png
index 9afd1794a..dda0e964c 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Cursor Test.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Cursor Test.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4c303fa620a2c7bc491a0ac1f9afdf9601b352e0e5163526c5f8732edf6bd6b3
-size 63404
+oid sha256:6927950ccbc5c81d6fbfe0a90ddd79a4306518caced14bb60debd30c7e41d326
+size 62604
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Dancing Strings.png b/crates/egui_demo_lib/tests/snapshots/demos/Dancing Strings.png
index 05a412548..f0b9c3892 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Dancing Strings.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Dancing Strings.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0df751bac5947c9bf6f82d075cf5670a562742b80d6c512bcd642da5ed449d26
-size 25975
+oid sha256:366d18457aabf1ebdd42fdbce8819cc67a4f59db85c452623b02ee1d0e8fc50a
+size 27817
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Drag and Drop.png b/crates/egui_demo_lib/tests/snapshots/demos/Drag and Drop.png
index 9b1b65636..049d585ec 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Drag and Drop.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Drag and Drop.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e26e87f2909414b614278a1cf0b485cda425aceb5419906426615dccdcbef2b
-size 20877
+oid sha256:d194db1705b36c1ee6189878a323a591555493c9319b7c2ddfc0cb0541055aca
+size 20948
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Extra Viewport.png b/crates/egui_demo_lib/tests/snapshots/demos/Extra Viewport.png
index 69d55cd27..1440d2be2 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Extra Viewport.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Extra Viewport.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20e3050bd41c7b9d225feb71f3bea3fdd1b8f749f77c4d140b5e560f53eb32b7
-size 10731
+oid sha256:62af1b6d248b731b0930c51e481118ae01a5d8c08f27697ff121a47fefea83bf
+size 10795
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Font Book.png b/crates/egui_demo_lib/tests/snapshots/demos/Font Book.png
index 2a12a3152..281154b2d 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Font Book.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Font Book.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1227636b03a7d35db3482b19f6059ec7aaf03ca795edadd5338056be6f6a8f7f
-size 126724
+oid sha256:3c5e803659e936268b476690427ef6a6802f477e078dc956a9d1c857b48da868
+size 114409
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Frame.png b/crates/egui_demo_lib/tests/snapshots/demos/Frame.png
index 0385ab120..6efc3f4a9 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Frame.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Frame.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c01e96bf0aab24dbcfc05f2a6dcb0ffcddff69ec2474797de4fbce0a0670a8cd
-size 24964
+oid sha256:f5e67baf0696792e50f7ab3121874d055ddee2de0514712aacbf8e135ec4743d
+size 25425
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Grid Test.png b/crates/egui_demo_lib/tests/snapshots/demos/Grid Test.png
index e14a4ecb5..c6f5ae26c 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Grid Test.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Grid Test.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec357eafd145194f99c36a53a149a8b331fd691c5088df43ee96282b84bc81a4
-size 99439
+oid sha256:55c5fb90736a31fbccd72be5994fc8c62b4b9da9842ad1e6bb795a1e1461a6f8
+size 98780
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Highlighting.png b/crates/egui_demo_lib/tests/snapshots/demos/Highlighting.png
index 99cfc8f5d..a61363b99 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Highlighting.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Highlighting.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5c95085e3c78b3fa1cc39ebd032834bd5ab5a80c3a2cad482d8a5bcbad004b9
-size 18064
+oid sha256:a4080ee1a16eea16c8f4246fe3e760ade7d0289b30d88068d1e49ffb88d88dca
+size 18280
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/ID Test.png b/crates/egui_demo_lib/tests/snapshots/demos/ID Test.png
index f2d914cc2..c750513c0 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/ID Test.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/ID Test.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28a69a52c07344576f2b5335497151e4e923b838dfaec9791402949ffb099c12
-size 116116
+oid sha256:600d9e0fc193396f36b599e4bfad2547128160d2e56dc2a989cb5f978d5115ae
+size 113797
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Input Event History.png b/crates/egui_demo_lib/tests/snapshots/demos/Input Event History.png
index c100d9209..46a949571 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Input Event History.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Input Event History.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1378d865af3df02e12a0c4bc087620a4e9ef0029221db3180cdd2fd34f69d7f
-size 24832
+oid sha256:72d49d9a35e16e7413158ba14ce9cab762925f5f5e52fbbe16292de499a177f1
+size 25791
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Input Test.png b/crates/egui_demo_lib/tests/snapshots/demos/Input Test.png
index dd2d414a4..8c3634222 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Input Test.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Input Test.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb3f7b5f790830b46d1410c2bbb5e19c6beb403f8fe979eb8d250fba4f89be3e
-size 51670
+oid sha256:bb7e3887cf12bd00ea09b297ac361562a961f64c15b28360bc87f72f270a4065
+size 51649
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Interactive Container.png b/crates/egui_demo_lib/tests/snapshots/demos/Interactive Container.png
index 1ef6bf0db..b57b98a53 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Interactive Container.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Interactive Container.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70b00222e6c63f97bfd8c7a179c15cfaba93f8f2566702d4b03997f4714fe6cb
-size 22609
+oid sha256:3ae5e843cc9d847b0f3c4092f55b914699adb506cb807b0a97bfc4ec7d94537b
+size 22613
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Layout Test.png b/crates/egui_demo_lib/tests/snapshots/demos/Layout Test.png
index ed84d7428..6a2c9cf63 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Layout Test.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Layout Test.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ad26106a86a6236f0db1c51bed754b370530813e9bb6e36c1be2948820fbef25
-size 47827
+oid sha256:b0d38cb1eebf3ce7d661d094175b425db2b9eccc5e439b14256c5d801d4454d4
+size 47285
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Manual Layout Test.png b/crates/egui_demo_lib/tests/snapshots/demos/Manual Layout Test.png
index 9f42483fe..e6fd0795d 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Manual Layout Test.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Manual Layout Test.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afa66ba8daca5c00f9c49b1d9173ad8f5e826247d3a9369d7e7c360cbdfcb72e
-size 22928
+oid sha256:00e4c7659cd50044d473dd2c138392f78ac7eba27f2b52bae61246f5dc5b2782
+size 23156
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Misc Demos.png b/crates/egui_demo_lib/tests/snapshots/demos/Misc Demos.png
index 919bdc66d..a12313e97 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Misc Demos.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Misc Demos.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:170cee9d72a4ab59aa2faf1b77aff4a9eee64f3380aa3f1b256340d88b1dabc2
-size 66525
+oid sha256:604f716e687fc26abba92769fe2dae75d850b18598d2e8a9524451ab0f760251
+size 65403
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Modals.png b/crates/egui_demo_lib/tests/snapshots/demos/Modals.png
index 47718fdd1..dcf935287 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Modals.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Modals.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90ab689d8a5034f5cab2ae2b44a8054d6dd815b3d295bee040c5bfcdf4564dee
-size 33063
+oid sha256:34de6fd788288174e8e6f1fa48cd49dbc7b14fcf649fe302aed49c8c50178aa8
+size 33469
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Multi Touch.png b/crates/egui_demo_lib/tests/snapshots/demos/Multi Touch.png
index daa9da35a..4e2c0a458 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Multi Touch.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Multi Touch.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf7f0a76424a959ede7afbb0eaf777638038cc6fe208ef710d9d82638d68b4d0
-size 37848
+oid sha256:115398e2b4b459afc2f1c49c4e60ef3f63e562650f05581372002c93030da632
+size 38374
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Painting.png b/crates/egui_demo_lib/tests/snapshots/demos/Painting.png
index e53f4f7af..bbfeed26f 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Painting.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Painting.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d2370972781f15a1d602deca28bca38f1c077152801870edf2112650b8b1349
-size 17708
+oid sha256:96760220222bdde8dd1b3d28f089af2892403b78df8d34d3d94dc1a604387083
+size 18241
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Panels.png b/crates/egui_demo_lib/tests/snapshots/demos/Panels.png
index ca9bacfca..992fb471e 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Panels.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Panels.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7a7d0e2618b852b5966073438c95cb62901d5410c1473639920b0b0bf2ec59b
-size 256913
+oid sha256:627114dcbda4f3d2255d34926ed0b77c679d248ed1d822d723479b1e6652c67a
+size 249258
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Popups.png b/crates/egui_demo_lib/tests/snapshots/demos/Popups.png
index d00256a7e..32beeba37 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Popups.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Popups.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f8b937a8a63de6fedcd0f9748b1d04cd863331a297bec78906885a0107def32a
-size 61242
+oid sha256:48d138634343edb251435bf6f9075502b913e806e8b280f3e6012977c13af16f
+size 56753
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/SVG Test.png b/crates/egui_demo_lib/tests/snapshots/demos/SVG Test.png
index f96fce916..8aa13dbfa 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/SVG Test.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/SVG Test.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a11b0aeb8b8a7ff3acd54b99869af03cd04cc2edf13afc713ce924c52d39262d
-size 24826
+oid sha256:888ed4281c2c779b08bc1719302b9923f542026811cff8ae91e44ea1faa25783
+size 25804
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Scene.png b/crates/egui_demo_lib/tests/snapshots/demos/Scene.png
index 2344a3868..8dae8e626 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Scene.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Scene.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2855bd95ab33b5232edada1f65684bbba2748025b6b64eb9ac68a5f2d10ad4bd
-size 34491
+oid sha256:23efb79ca13367f4d8886142d015815c5bdf99c0ed243ece294a7cfd365fd166
+size 33503
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Screenshot.png b/crates/egui_demo_lib/tests/snapshots/demos/Screenshot.png
index 7e49a8613..dc7dda582 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Screenshot.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Screenshot.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be599ae66323140bba4a7d63546acbf84340b57e2d82d4736bf3fe590040319d
-size 23623
+oid sha256:5d85faf6e7fa26741eb720e74695f3c207ea15097b118c3cafe5d52d5d85ea20
+size 23666
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Scrolling.png b/crates/egui_demo_lib/tests/snapshots/demos/Scrolling.png
index 6de002ee4..b9f2816a2 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Scrolling.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Scrolling.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:01c3cb5e8972e0cab5325328f93af8f51b35a0d61016e74969eab0f7ddea1e02
-size 176973
+oid sha256:875eb687f3a1eed52a6617e532edc5332b0a16296e2b6addac66d5bea0448b14
+size 172605
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Sliders.png b/crates/egui_demo_lib/tests/snapshots/demos/Sliders.png
index 417b183b5..3513155f0 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Sliders.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Sliders.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2f6cedc262259d52c1fbf4283d99b4b62ec732e8688b1e2799a2581425e0564
-size 120342
+oid sha256:fd3573be9ba5818b4edc371095f5c23b084e6c7eaae4f2fd3a6d2de051878c9d
+size 118567
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Strip.png b/crates/egui_demo_lib/tests/snapshots/demos/Strip.png
index be51e5062..c28cac211 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Strip.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Strip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:142f65cee971f82a4917734c4f49ae233aa9a873028dca8c807d2825672bf2b2
-size 26657
+oid sha256:9d8d87e4cb944def0dc28e3515243a8c1b07b9b0f88e802924d4381c1cda74db
+size 26763
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Table.png b/crates/egui_demo_lib/tests/snapshots/demos/Table.png
index 188c548d8..c0470071c 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Table.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Table.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:72f4c6fe4f5ec243506152027e1150f3069caf98511ceef92b8fea4f6a1563d5
-size 77614
+oid sha256:ed1be0294fb65b11c54c6dc9e4cecb383ace16dad748e3c42f2ed65b2fb05ea8
+size 75509
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Tessellation Test.png b/crates/egui_demo_lib/tests/snapshots/demos/Tessellation Test.png
index cd8524cef..99ab541d4 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Tessellation Test.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Tessellation Test.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cc24f146adf0282cfb51723b56c76eceb92f2988fc67bbeefd16b93950505922
-size 70110
+oid sha256:7336c53885add09360df098b6b131323e8ad3ef0ec2b85bf022e78bc4269276a
+size 70255
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Text Layout.png b/crates/egui_demo_lib/tests/snapshots/demos/Text Layout.png
index 28c9f57ac..c86b223dd 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Text Layout.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Text Layout.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77aeaa1dcd391a571cb38732686e0b85b2d727975c02507a114d4e932f2c351b
-size 65562
+oid sha256:411dd61eb182a70d46c7fc1fa0f9a4b8aeae88d08b11d5af948c5acccfa9d133
+size 60950
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/TextEdit.png b/crates/egui_demo_lib/tests/snapshots/demos/TextEdit.png
index 3ee3adf6e..c63f844ec 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/TextEdit.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/TextEdit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f964939ed1b3904706592915ca4fbbb951855ac88b466c51b835cd1c7467fb0
-size 21501
+oid sha256:78111e33d44a09beb9c1233dd2d5ef10103213a1c1c7df8b5e258d9684f1d93a
+size 21810
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Tooltips.png b/crates/egui_demo_lib/tests/snapshots/demos/Tooltips.png
index 265dfdc1e..23adea69c 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Tooltips.png
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Tooltips.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:415b1ce17dd6df7ca7a86fed92750c2ef811ff64720a447ae3ca6be10090666e
-size 64624
+oid sha256:89986132c5d2a3ccccf0a16cb2b0be07b7c5512838cc10ec9067022e7a238515
+size 63918
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Undo Redo.png b/crates/egui_demo_lib/tests/snapshots/demos/Undo Redo.png
index fb2bd06aa..91aeb6b91 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Undo Redo.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Undo Redo.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0eaf717bf0083737c4186ac39e7baf98f42fffb36b49434a6658eff1430a0ac6
-size 13187
+oid sha256:e9498a706de403ee7db3603ecc896688e584fede367ed6087cdf10b798a3ab2d
+size 13698
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Window Options.png b/crates/egui_demo_lib/tests/snapshots/demos/Window Options.png
index e782c983a..c768c6507 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Window Options.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Window Options.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:611a2d6c793a85eebe807b2ddd4446cc0bc21e4284343dd756e64f0232fb6815
-size 35991
+oid sha256:42385da2eb74d54ba086aed973ade15f2a8d2be0c9281c05e6fb88846137bf81
+size 35870
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Window Resize Test.png b/crates/egui_demo_lib/tests/snapshots/demos/Window Resize Test.png
index 7a042bdba..e8b44a484 100644
--- a/crates/egui_demo_lib/tests/snapshots/demos/Window Resize Test.png	
+++ b/crates/egui_demo_lib/tests/snapshots/demos/Window Resize Test.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b85a2af24c3361a0008fd0996e8d7244dc3e289646ec7233e8bad39a586c871c
-size 44512
+oid sha256:9f1b6fa0c48479606539f2d98befe1c9ee881846c0b55d7a53313962d556380d
+size 484629
diff --git a/crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x1.png b/crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x1.png
index 3d6c3f55c..aeaa46a34 100644
--- a/crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x1.png
+++ b/crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:67b709c116f56fba7e4e9f182018e84f46f6c6dd33a51f9d0524125dc2056b8c
-size 12950
+oid sha256:89074b8dab103a419bc3dac743da4d8c47f435fa55b98d8aab71f6c9fb4d39de
+size 12370
diff --git a/crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x2.png b/crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x2.png
index e28eaeda9..1359fd607 100644
--- a/crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x2.png
+++ b/crates/egui_demo_lib/tests/snapshots/image_kerning/image_dark_x2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b0a70c0d66306edbbc6f77d03ea624aa68b846656811d4cc7d76d28572d177b
-size 30723
+oid sha256:968c478d986fc71d8655492b19e833ca07bc0ab85899dc04022bc7cf1dcf782f
+size 29319
diff --git a/crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x1.png b/crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x1.png
index 391257018..da72002a0 100644
--- a/crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x1.png
+++ b/crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:137ba69ac73a5e9aacc6bf3bbd589e8640b41c50ccfb49edcda4e2d6efed6c09
-size 13384
+oid sha256:7bd7b54ff60859e4d4793000bef3adbec4c071063bec6bfdbde62516c4fc3478
+size 12959
diff --git a/crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x2.png b/crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x2.png
index f5e700ee3..80e561325 100644
--- a/crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x2.png
+++ b/crates/egui_demo_lib/tests/snapshots/image_kerning/image_light_x2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f798c666ad21d3f9bb57826e30f2f6ef044543bc05af8c185e0e63c8297e824
-size 33181
+oid sha256:61e59f8360c567e20bf03b401362de7bb0f87716f13e817cc8da3df742ab68bf
+size 31869
diff --git a/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x1.00.png b/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x1.00.png
index 0d70d6973..5018d53c8 100644
--- a/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x1.00.png
+++ b/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x1.00.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:44fc7d745b478fe937fa7c131871a00b26712a0317aaa027a088782533be6136
-size 7125
+oid sha256:7389e319d9153af313cc113d97b57d462da00feb0d5f99da211552af3ac7e18a
+size 6704
diff --git a/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x1.41.png b/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x1.41.png
index 505c764d5..3a1b72bb3 100644
--- a/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x1.41.png
+++ b/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x1.41.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abfa00ef9385d380bbd188d6254f92d6839a94f368100e75a2780337438f969f
-size 11068
+oid sha256:d4480dd34ed36c6bdbc2084843dd136448b3934c22b3df3e40314ba6324b5b39
+size 10306
diff --git a/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x2.00.png b/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x2.00.png
index 7c040d71a..0f18eb109 100644
--- a/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x2.00.png
+++ b/crates/egui_demo_lib/tests/snapshots/italics/image_dark_x2.00.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e5c9015e2005429ba83a407ed1f7d4dfbf30624f666152e82079c6ed3b3cda5
-size 17238
+oid sha256:624bfa884431c35cc5d852b96653f13da17e60f8545471f9fb1c3bb85b40ffc8
+size 16555
diff --git a/crates/egui_demo_lib/tests/snapshots/italics/image_light_x1.00.png b/crates/egui_demo_lib/tests/snapshots/italics/image_light_x1.00.png
index b2291e9f1..6ebc6addc 100644
--- a/crates/egui_demo_lib/tests/snapshots/italics/image_light_x1.00.png
+++ b/crates/egui_demo_lib/tests/snapshots/italics/image_light_x1.00.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3319a8bca1213fc3a2dd91ead155be1e25045bc614701250bc961848cfc42176
-size 7327
+oid sha256:bf665389ef43524e097a7ae4eec0aa01bb788bdbb306144f20f9133f74a64b2c
+size 6941
diff --git a/crates/egui_demo_lib/tests/snapshots/italics/image_light_x1.41.png b/crates/egui_demo_lib/tests/snapshots/italics/image_light_x1.41.png
index 995789de1..54fdc064b 100644
--- a/crates/egui_demo_lib/tests/snapshots/italics/image_light_x1.41.png
+++ b/crates/egui_demo_lib/tests/snapshots/italics/image_light_x1.41.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5172aa12f07b4abf4bb217b8952b4cf5cf61b688455751964a1b54433d8c05b1
-size 11709
+oid sha256:a2480d0f49a929993de70612572b321457b2507c149a25112064cfc27840e6ee
+size 11005
diff --git a/crates/egui_demo_lib/tests/snapshots/italics/image_light_x2.00.png b/crates/egui_demo_lib/tests/snapshots/italics/image_light_x2.00.png
index 8c5e7ab03..138fd8c83 100644
--- a/crates/egui_demo_lib/tests/snapshots/italics/image_light_x2.00.png
+++ b/crates/egui_demo_lib/tests/snapshots/italics/image_light_x2.00.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e3eedd952d4416af73179451c0c90bcb76635c9c3c94d37f42bdd228ddbdd03
-size 18802
+oid sha256:1e0013b499934f47370a3a20b3d3a19f8a8c6db360752a35a3fb1d676d122263
+size 18068
diff --git a/crates/egui_demo_lib/tests/snapshots/modals_1.png b/crates/egui_demo_lib/tests/snapshots/modals_1.png
index a184b67dc..6690a129e 100644
--- a/crates/egui_demo_lib/tests/snapshots/modals_1.png
+++ b/crates/egui_demo_lib/tests/snapshots/modals_1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60a44771c6bc9236593717236f9eca40bcb4723bac7567493cab4326f003eba3
-size 48693
+oid sha256:b53b03212953e12915a0e41bff5f0cdea90f8f866220a01142edaeb915735a34
+size 47077
diff --git a/crates/egui_demo_lib/tests/snapshots/modals_2.png b/crates/egui_demo_lib/tests/snapshots/modals_2.png
index 0aa16858a..f8eb85d39 100644
--- a/crates/egui_demo_lib/tests/snapshots/modals_2.png
+++ b/crates/egui_demo_lib/tests/snapshots/modals_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e7bc441559ff2d8723cf344113ce5ff8158e41179e4c93abcacbe7b1b13b3723
-size 48998
+oid sha256:22e5d61a141b5a8663feb8a47371f9259d2a77fdacb1245bce411ffc85ce2cae
+size 47716
diff --git a/crates/egui_demo_lib/tests/snapshots/modals_3.png b/crates/egui_demo_lib/tests/snapshots/modals_3.png
index eaae2a758..c12f0b9df 100644
--- a/crates/egui_demo_lib/tests/snapshots/modals_3.png
+++ b/crates/egui_demo_lib/tests/snapshots/modals_3.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e092be54efaeb700a63d9b679894647159f39a0d3062692ac7056e98242cbee
-size 45364
+oid sha256:120558ab0c267650744bd078aeace8d4122b3569c5998602f969766131d15c44
+size 43894
diff --git a/crates/egui_demo_lib/tests/snapshots/modals_backdrop_should_prevent_focusing_lower_area.png b/crates/egui_demo_lib/tests/snapshots/modals_backdrop_should_prevent_focusing_lower_area.png
index 8b54bf99f..ef4c45ff1 100644
--- a/crates/egui_demo_lib/tests/snapshots/modals_backdrop_should_prevent_focusing_lower_area.png
+++ b/crates/egui_demo_lib/tests/snapshots/modals_backdrop_should_prevent_focusing_lower_area.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88930779ac199e42fcc9ee25f29bd120478c129807713218370b617905340087
-size 45366
+oid sha256:af92548b6c8569081a91cb772b73988d9cb342498ddf9c0c86b6963cef8eda9e
+size 43985
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 640d84c2b..b5367f0ed 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:f9980486c36a0242f3b043a172c411d4fc9573543d3cd7c1c43bf020c18868a9
-size 619816
+oid sha256:db510af76578693c85ce78ca91224758a56f7bbf33db3221c9a4edca08b06600
+size 590547
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 df05ada25..7158a3545 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:040e2e486ae4773a084da99513a53c620e8e2bba215183ec26c6e489381d6254
-size 823086
+oid sha256:cae2b789e8afff23b7545d42a530e6c972d28736bad2bdacbc69f0e7065f85cc
+size 740660
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 c6aa2914f..8b9cb281f 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:439a5f942a5f05b9c09685ef90be94c150a21a68d1d235af22372b9b6a7b7389
-size 1035734
+oid sha256:09d9f567ec371d60881b525ddb462d9135552db97af5921a6eb02aba40e40616
+size 971544
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 1344edcfb..9f5a69154 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:9b7d7e290b97a8042af3af3cd9ceb274950cf607dd7e9cd6c71d5a113d3b57a5
-size 1206155
+oid sha256:3c383dd89fda6094704027074a72085591339a276d60502626d78e8e527b2e10
+size 1076719
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 9804e2942..74760261a 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:fedd5546e36a89121c0bb0a780b0bbe081611c2c04013064872801181503fb83
-size 1231599
+oid sha256:0b4559541cf3259496c760a26f8d83e82179cb7e4576333682c5af49ee4a35a7
+size 1125331
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 04d4bb4ea..a85909178 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:69a7040336fc92c6d7b158283aabbc5817980c2fa84a1120b788516cf437b985
-size 1461979
+oid sha256:67c8412a1e8fdbfd88f8573797fbf6fbd89c6ce783a074a8e90f7d8d9e67dd57
+size 1366351
diff --git a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Additive rectangle.png b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Additive rectangle.png
index 50e84c900..0eb5ebd6a 100644
--- a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Additive rectangle.png	
+++ b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Additive rectangle.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1a32d361afa20fc8c20122a89b01fe14b45849da42663991e589579f70fb8577
-size 46790
+oid sha256:a2b7b54a1af0f5cd31bd64f0506e3035dd423314ce3389e61730fa160434fbf3
+size 45074
diff --git a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Blurred stroke.png b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Blurred stroke.png
index ca5a23f97..bd9942eb7 100644
--- a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Blurred stroke.png	
+++ b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Blurred stroke.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c8d55205cf4225123da33895ed45eb186e5e57184ef5928400a4bae3ab6092be
-size 88548
+oid sha256:7b66a0be67ff2d684a54c2321123521b3ad06dfe5ebffd50e89260d77efcfcc4
+size 86833
diff --git a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Blurred.png b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Blurred.png
index 41f9ef2f5..64ddf5c49 100644
--- a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Blurred.png
+++ b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Blurred.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:77ab9e2e18c788f8cdbec171269afe4d0a90c52abeda7063cae3766dcaa5e93b
-size 120612
+oid sha256:19320291c99a23429b114a59de4636689e281e1e68766abe2aa1e56562128e50
+size 118919
diff --git a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Minimal rounding.png b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Minimal rounding.png
index 85d844c79..105bbf285 100644
--- a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Minimal rounding.png	
+++ b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Minimal rounding.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36622a2f934503a7b60ded2f44b002e37eedde22d548dcf5a209f54c19548665
-size 53064
+oid sha256:5edf089c00715f1456fe7838e85aadcfc42b6216a3fd95b48d9c21fc8d700cba
+size 51371
diff --git a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Normal.png b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Normal.png
index 6e6d9f0f2..035eb931d 100644
--- a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Normal.png
+++ b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Normal.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4adeb7a77a0d0fe85097fcd190a99b49858dce11bde601d30335afcb6cc3d5f6
-size 56276
+oid sha256:6cd1a10639dcb323bdc3b2c43e0c35665184fc809731ced90088ee9edb9de845
+size 54577
diff --git a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thick stroke, minimal rounding.png b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thick stroke, minimal rounding.png
index eefbac2bb..26014a12c 100644
--- a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thick stroke, minimal rounding.png	
+++ b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thick stroke, minimal rounding.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f45249f7cc90433a64856905c727571c4ef20468e2c7d3ac2029e18a0477932d
-size 56743
+oid sha256:87e34024f701dc93f4026213ac7eb468a2cd6d3393eb0dbec382bf58007f8e61
+size 55042
diff --git a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thin filled.png b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thin filled.png
index 08178eaa8..dcbbba2b6 100644
--- a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thin filled.png	
+++ b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thin filled.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d437f68c521f3e627a1b50d46605e8b0b343c5fc3716d9669e8c4436c8992b6f
-size 37602
+oid sha256:d7940ff56796efb27bec66b632ff33aa2ad390c4962a711bf520aee341f035a4
+size 35968
diff --git a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thin stroked.png b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thin stroked.png
index 13f057df9..0a3d062af 100644
--- a/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thin stroked.png	
+++ b/crates/egui_demo_lib/tests/snapshots/tessellation_test/Thin stroked.png	
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:08ba98437403a08cca825ed8e288c9f088a46d9a1081f0b0a4ed7fbb9b49bb85
-size 37640
+oid sha256:b7bbd16c8aad444f0d11aacf87cf2292d494cc80a1ca46e7e8db86ca3041d35a
+size 35931
diff --git a/crates/egui_demo_lib/tests/snapshots/text_selection.png b/crates/egui_demo_lib/tests/snapshots/text_selection.png
index 78ebc0dbf..63a4423a3 100644
--- a/crates/egui_demo_lib/tests/snapshots/text_selection.png
+++ b/crates/egui_demo_lib/tests/snapshots/text_selection.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14f253fedc94985ff1431f1016d901d747e1f9948531cc6350f6615649f29056
-size 4862
+oid sha256:0475c5ac04ab8f79b79d43cfdb985f05b61dbe90e81f898a6dc216c308a28841
+size 4707
diff --git a/crates/egui_demo_lib/tests/snapshots/widget_gallery_dark_x1.png b/crates/egui_demo_lib/tests/snapshots/widget_gallery_dark_x1.png
index ab2db5eb5..112605454 100644
--- a/crates/egui_demo_lib/tests/snapshots/widget_gallery_dark_x1.png
+++ b/crates/egui_demo_lib/tests/snapshots/widget_gallery_dark_x1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e1ed0e40d08b2b9ea978a07a4b7bf282c9e2cba8c52896f12210f396241e1b78
-size 66859
+oid sha256:bbdc4199dee2ae853b8a240cd84528482dc6762233bd0d1249f2daa296b49487
+size 64172
diff --git a/crates/egui_demo_lib/tests/snapshots/widget_gallery_dark_x2.png b/crates/egui_demo_lib/tests/snapshots/widget_gallery_dark_x2.png
index e84863bf4..1b5b60c8a 100644
--- a/crates/egui_demo_lib/tests/snapshots/widget_gallery_dark_x2.png
+++ b/crates/egui_demo_lib/tests/snapshots/widget_gallery_dark_x2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28f9862dd6f16b99523f5880bf90346fd9455d0d44e7bdd530d523e0b2ef2d2c
-size 158892
+oid sha256:f6d38b6b47839d0e4eae530d203c83971fba8a41c9caa3d5b5d89ee7ed582613
+size 150090
diff --git a/crates/egui_demo_lib/tests/snapshots/widget_gallery_light_x1.png b/crates/egui_demo_lib/tests/snapshots/widget_gallery_light_x1.png
index 87eb5ce70..5a2b44feb 100644
--- a/crates/egui_demo_lib/tests/snapshots/widget_gallery_light_x1.png
+++ b/crates/egui_demo_lib/tests/snapshots/widget_gallery_light_x1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:98c40c99a237f8388d82259fba4388d7b1759fe7b4bf657d326532934135c934
-size 61119
+oid sha256:c0635f1564d6c9707efa68003fb8c9b6eb00408aa8f24c972e33c6c79fed5bdf
+size 59354
diff --git a/crates/egui_demo_lib/tests/snapshots/widget_gallery_light_x2.png b/crates/egui_demo_lib/tests/snapshots/widget_gallery_light_x2.png
index c2c4705e1..81c7452e6 100644
--- a/crates/egui_demo_lib/tests/snapshots/widget_gallery_light_x2.png
+++ b/crates/egui_demo_lib/tests/snapshots/widget_gallery_light_x2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:90d36311ce5b1dcf81cab22113620a3362f255059d1f52c6794c8249f960549e
-size 152215
+oid sha256:4288ee4a0d2229d59c31538179cdda50035a3849f69b400127e1618efe30cdc1
+size 145224
diff --git a/crates/egui_extras/CHANGELOG.md b/crates/egui_extras/CHANGELOG.md
index 9dbeb5879..15eaf8704 100644
--- a/crates/egui_extras/CHANGELOG.md
+++ b/crates/egui_extras/CHANGELOG.md
@@ -5,6 +5,10 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.33.3 - 2025-12-11
+* Bump `ehttp` to 0.6.0 [#7757](https://github.com/emilk/egui/pull/7757) by [@jprochazk](https://github.com/jprochazk)
+
+
 ## 0.33.2 - 2025-11-13
 Nothing new
 
diff --git a/crates/egui_extras/src/datepicker/button.rs b/crates/egui_extras/src/datepicker/button.rs
index a6e278286..98aceefe2 100644
--- a/crates/egui_extras/src/datepicker/button.rs
+++ b/crates/egui_extras/src/datepicker/button.rs
@@ -194,7 +194,7 @@ impl Widget for DatePickerButton<'_> {
 
             // We don't want to close our popup if any other popup is open, since other popups would
             // most likely be the combo boxes in the date picker.
-            let any_popup_open = ui.ctx().is_popup_open();
+            let any_popup_open = ui.any_popup_open();
             if !button_response.clicked()
                 && !any_popup_open
                 && (ui.input(|i| i.key_pressed(Key::Escape)) || area_response.clicked_elsewhere())
diff --git a/crates/egui_extras/src/datepicker/mod.rs b/crates/egui_extras/src/datepicker/mod.rs
index e7ba47e74..7a114b357 100644
--- a/crates/egui_extras/src/datepicker/mod.rs
+++ b/crates/egui_extras/src/datepicker/mod.rs
@@ -1,3 +1,5 @@
+#![expect(clippy::unwrap_used)] // TODO(emilk): avoid unwraps
+
 mod button;
 mod popup;
 
diff --git a/crates/egui_extras/src/lib.rs b/crates/egui_extras/src/lib.rs
index 16354c440..19e0c95a8 100644
--- a/crates/egui_extras/src/lib.rs
+++ b/crates/egui_extras/src/lib.rs
@@ -6,8 +6,7 @@
 #![cfg_attr(feature = "document-features", doc = document_features::document_features!())]
 //!
 
-#![allow(clippy::float_cmp)]
-#![allow(clippy::manual_range_contains)]
+#![expect(clippy::manual_range_contains)]
 
 #[cfg(feature = "chrono")]
 mod datepicker;
diff --git a/crates/egui_extras/src/loaders/file_loader.rs b/crates/egui_extras/src/loaders/file_loader.rs
index 13fd7ca69..3377476dd 100644
--- a/crates/egui_extras/src/loaders/file_loader.rs
+++ b/crates/egui_extras/src/loaders/file_loader.rs
@@ -75,7 +75,7 @@ impl BytesLoader for FileLoader {
                 .name(format!("egui_extras::FileLoader::load({uri:?})"))
                 .spawn({
                     let ctx = ctx.clone();
-                    let cache = self.cache.clone();
+                    let cache = Arc::clone(&self.cache);
                     let uri = uri.to_owned();
                     move || {
                         let result = match std::fs::read(&path) {
diff --git a/crates/egui_extras/src/loaders/gif_loader.rs b/crates/egui_extras/src/loaders/gif_loader.rs
index 9f0786cfb..ebaf9a6b3 100644
--- a/crates/egui_extras/src/loaders/gif_loader.rs
+++ b/crates/egui_extras/src/loaders/gif_loader.rs
@@ -53,7 +53,7 @@ impl AnimatedImage {
 
     /// Gets image at index
     pub fn get_image(&self, index: usize) -> Arc<ColorImage> {
-        self.frames[index % self.frames.len()].clone()
+        Arc::clone(&self.frames[index % self.frames.len()])
     }
 }
 type Entry = Result<Arc<AnimatedImage>, String>;
diff --git a/crates/egui_extras/src/loaders/http_loader.rs b/crates/egui_extras/src/loaders/http_loader.rs
index d1cc68df9..14baee65e 100644
--- a/crates/egui_extras/src/loaders/http_loader.rs
+++ b/crates/egui_extras/src/loaders/http_loader.rs
@@ -84,7 +84,7 @@ impl BytesLoader for EhttpLoader {
 
             ehttp::fetch(ehttp::Request::get(uri.clone()), {
                 let ctx = ctx.clone();
-                let cache = self.cache.clone();
+                let cache = Arc::clone(&self.cache);
                 move |response| {
                     let result = match response {
                         Ok(response) => File::from_response(&uri, response),
diff --git a/crates/egui_extras/src/loaders/image_loader.rs b/crates/egui_extras/src/loaders/image_loader.rs
index 6d735f688..969ed5538 100644
--- a/crates/egui_extras/src/loaders/image_loader.rs
+++ b/crates/egui_extras/src/loaders/image_loader.rs
@@ -50,8 +50,11 @@ fn is_supported_mime(mime: &str) -> bool {
         }
     }
 
+    // Some servers may return a media type with an optional parameter, e.g. "image/jpeg; charset=utf-8".
+    let (mime_type, _) = mime.split_once(';').unwrap_or((mime, ""));
+
     // Uses only the enabled image crate features
-    ImageFormat::from_mime_type(mime).is_some_and(|format| format.reading_enabled())
+    ImageFormat::from_mime_type(mime_type).is_some_and(|format| format.reading_enabled())
 }
 
 impl ImageLoader for ImageCrateLoader {
@@ -91,7 +94,7 @@ impl ImageLoader for ImageCrateLoader {
                 .name(format!("egui_extras::ImageLoader::load({uri:?})"))
                 .spawn({
                     let ctx = ctx.clone();
-                    let cache = cache.clone();
+                    let cache = Arc::clone(cache);
 
                     let uri = uri.clone();
                     let bytes = bytes.clone();
diff --git a/crates/egui_extras/src/loaders/svg_loader.rs b/crates/egui_extras/src/loaders/svg_loader.rs
index 4b778ff9e..a9c0aa2b0 100644
--- a/crates/egui_extras/src/loaders/svg_loader.rs
+++ b/crates/egui_extras/src/loaders/svg_loader.rs
@@ -36,7 +36,7 @@ fn is_supported(uri: &str) -> bool {
 impl Default for SvgLoader {
     fn default() -> Self {
         // opt is mutated when `svg_text` feature flag is enabled
-        #[allow(unused_mut, clippy::allow_attributes)]
+        #[allow(clippy::allow_attributes, unused_mut)]
         let mut options = resvg::usvg::Options::default();
 
         #[cfg(feature = "svg_text")]
diff --git a/crates/egui_extras/src/loaders/webp_loader.rs b/crates/egui_extras/src/loaders/webp_loader.rs
index f0dc32ae4..23d778358 100644
--- a/crates/egui_extras/src/loaders/webp_loader.rs
+++ b/crates/egui_extras/src/loaders/webp_loader.rs
@@ -75,7 +75,7 @@ impl WebP {
 
     fn get_image(&self, frame_index: usize) -> Arc<ColorImage> {
         match self {
-            Self::Static(image) => image.clone(),
+            Self::Static(image) => Arc::clone(image),
             Self::Animated(animation) => animation.get_image_by_index(frame_index),
         }
     }
@@ -108,7 +108,7 @@ impl AnimatedImage {
     }
 
     pub fn get_image_by_index(&self, index: usize) -> Arc<ColorImage> {
-        self.frames[index % self.frames.len()].clone()
+        Arc::clone(&self.frames[index % self.frames.len()])
     }
 }
 
diff --git a/crates/egui_extras/src/syntax_highlighting.rs b/crates/egui_extras/src/syntax_highlighting.rs
index 2a5fd39fc..0b9a791ea 100644
--- a/crates/egui_extras/src/syntax_highlighting.rs
+++ b/crates/egui_extras/src/syntax_highlighting.rs
@@ -3,8 +3,6 @@
 //! Turn on the `syntect` feature for great syntax highlighting of any language.
 //! Otherwise, a very simple fallback will be used, that works okish for C, C++, Rust, and Python.
 
-#![allow(clippy::mem_forget)] // False positive from enum_map macro
-
 use egui::TextStyle;
 use egui::text::LayoutJob;
 
@@ -66,7 +64,7 @@ fn highlight_inner(
     settings: Option<HighlightSettings<'_>>,
 ) -> LayoutJob {
     // We take in both context and style so that in situations where ui is not available such as when
-    // performing it at a separate thread (ctx, ctx.style()) can be used and when ui is available
+    // performing it at a separate thread (ctx, ctx.global_style()) can be used and when ui is available
     // (ui.ctx(), ui.style()) can be used
 
     #[expect(non_local_definitions)]
@@ -272,7 +270,7 @@ impl CodeTheme {
     ///
     /// There is one dark and one light theme stored at any one time.
     pub fn from_memory(ctx: &egui::Context, style: &egui::Style) -> Self {
-        #![allow(clippy::needless_return)]
+        #![expect(clippy::needless_return)]
 
         let (id, default) = if style.visuals.dark_mode {
             (egui::Id::new("dark"), Self::dark as fn(f32) -> Self)
@@ -301,7 +299,7 @@ impl CodeTheme {
     ///
     /// There is one dark and one light theme stored at any one time.
     pub fn store_in_memory(self, ctx: &egui::Context) {
-        let id = if ctx.style().visuals.dark_mode {
+        let id = if ctx.global_style().visuals.dark_mode {
             egui::Id::new("dark")
         } else {
             egui::Id::new("light")
@@ -361,6 +359,7 @@ impl CodeTheme {
     // function, but at the cost of more code duplication.
     #[expect(clippy::needless_pass_by_value)]
     fn dark_with_font_id(font_id: egui::FontId) -> Self {
+        #![expect(clippy::mem_forget)]
         use egui::{Color32, TextFormat};
         Self {
             dark_mode: true,
@@ -378,6 +377,7 @@ impl CodeTheme {
     // The syntect version takes it by value
     #[expect(clippy::needless_pass_by_value)]
     fn light_with_font_id(font_id: egui::FontId) -> Self {
+        #![expect(clippy::mem_forget)]
         use egui::{Color32, TextFormat};
         Self {
             dark_mode: false,
diff --git a/crates/egui_extras/src/table.rs b/crates/egui_extras/src/table.rs
index a984226ae..78c6e7435 100644
--- a/crates/egui_extras/src/table.rs
+++ b/crates/egui_extras/src/table.rs
@@ -479,7 +479,7 @@ impl<'a> TableBuilder<'a> {
             }
         }
 
-        let striped = striped.unwrap_or(ui.visuals().striped);
+        let striped = striped.unwrap_or_else(|| ui.visuals().striped);
 
         let state_id = ui.id().with(id_salt);
 
@@ -548,7 +548,7 @@ impl<'a> TableBuilder<'a> {
             sense,
         } = self;
 
-        let striped = striped.unwrap_or(ui.visuals().striped);
+        let striped = striped.unwrap_or_else(|| ui.visuals().striped);
 
         let state_id = ui.id().with(id_salt);
 
@@ -656,7 +656,7 @@ impl TableState {
     }
 
     fn store(self, ui: &egui::Ui, state_id: egui::Id) {
-        #![allow(clippy::needless_return)]
+        #![expect(clippy::needless_return)]
         #[cfg(feature = "serde")]
         {
             return ui.data_mut(|d| d.insert_persisted(state_id, self));
@@ -892,7 +892,7 @@ impl Table<'_> {
                 let resize_hover = resize_response.hovered() && !dragging_something_else;
 
                 if resize_hover || resize_response.dragged() {
-                    ui.ctx().set_cursor_icon(egui::CursorIcon::ResizeColumn);
+                    ui.set_cursor_icon(egui::CursorIcon::ResizeColumn);
                 }
 
                 let stroke = if resize_response.dragged() {
@@ -1325,7 +1325,7 @@ impl TableRow<'_, '_> {
         *self.response = Some(
             self.response
                 .as_ref()
-                .map_or(response.clone(), |r| r.union(response.clone())),
+                .map_or_else(|| response.clone(), |r| r.union(response.clone())),
         );
 
         (used_rect, response)
diff --git a/crates/egui_glow/CHANGELOG.md b/crates/egui_glow/CHANGELOG.md
index 4dd90a359..2fccf1166 100644
--- a/crates/egui_glow/CHANGELOG.md
+++ b/crates/egui_glow/CHANGELOG.md
@@ -6,6 +6,10 @@ Changes since the last release can be found at <https://github.com/emilk/egui/co
 
 
 
+## 0.33.3 - 2025-12-11
+Nothing new
+
+
 ## 0.33.2 - 2025-11-13
 Nothing new
 
diff --git a/crates/egui_glow/examples/pure_glow.rs b/crates/egui_glow/examples/pure_glow.rs
index 3671c8d79..9746c4a1a 100644
--- a/crates/egui_glow/examples/pure_glow.rs
+++ b/crates/egui_glow/examples/pure_glow.rs
@@ -1,9 +1,9 @@
 //! Example how to use pure `egui_glow`.
 
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
-#![allow(clippy::undocumented_unsafe_blocks)]
-#![allow(unsafe_code)]
+#![expect(rustdoc::missing_crate_level_docs, clippy::unwrap_used)] // it's an example
+#![expect(clippy::undocumented_unsafe_blocks)]
+#![expect(unsafe_code)]
 
 use std::num::NonZeroU32;
 use std::sync::Arc;
@@ -190,7 +190,7 @@ impl winit::application::ApplicationHandler<UserEvent> for GlowApp {
         let gl = std::sync::Arc::new(gl);
         gl_window.window().set_visible(true);
 
-        let egui_glow = egui_glow::EguiGlow::new(event_loop, gl.clone(), None, None, true);
+        let egui_glow = egui_glow::EguiGlow::new(event_loop, Arc::clone(&gl), None, None, true);
 
         let event_loop_proxy = egui::mutex::Mutex::new(self.proxy.clone());
         egui_glow
@@ -215,10 +215,11 @@ impl winit::application::ApplicationHandler<UserEvent> for GlowApp {
         let mut redraw = || {
             let mut quit = false;
 
-            self.egui_glow.as_mut().unwrap().run(
-                self.gl_window.as_mut().unwrap().window(),
-                |egui_ctx| {
-                    egui::Panel::left("my_side_panel").show(egui_ctx, |ui| {
+            self.egui_glow
+                .as_mut()
+                .unwrap()
+                .run(self.gl_window.as_mut().unwrap().window(), |ui| {
+                    egui::Panel::left("my_side_panel").show_inside(ui, |ui| {
                         ui.heading("Hello World!");
                         if ui.button("Quit").clicked() {
                             quit = true;
@@ -226,8 +227,7 @@ impl winit::application::ApplicationHandler<UserEvent> for GlowApp {
 
                         ui.color_edit_button_rgb(self.clear_color.as_mut().try_into().unwrap());
                     });
-                },
-            );
+                });
 
             if quit {
                 event_loop.exit();
diff --git a/crates/egui_glow/src/lib.rs b/crates/egui_glow/src/lib.rs
index 0b815417f..b0ee4c2a2 100644
--- a/crates/egui_glow/src/lib.rs
+++ b/crates/egui_glow/src/lib.rs
@@ -8,9 +8,7 @@
 #![cfg_attr(feature = "document-features", doc = document_features::document_features!())]
 //!
 
-#![allow(clippy::float_cmp)]
-#![allow(clippy::manual_range_contains)]
-#![allow(clippy::undocumented_unsafe_blocks)]
+#![expect(clippy::undocumented_unsafe_blocks)]
 
 pub mod painter;
 pub use glow;
diff --git a/crates/egui_glow/src/misc_util.rs b/crates/egui_glow/src/misc_util.rs
index c0c440d78..4b154cea7 100644
--- a/crates/egui_glow/src/misc_util.rs
+++ b/crates/egui_glow/src/misc_util.rs
@@ -1,4 +1,4 @@
-#![allow(unsafe_code)]
+#![expect(unsafe_code)]
 
 use glow::HasContext as _;
 
diff --git a/crates/egui_glow/src/painter.rs b/crates/egui_glow/src/painter.rs
index 5071f1a0c..97588ede8 100644
--- a/crates/egui_glow/src/painter.rs
+++ b/crates/egui_glow/src/painter.rs
@@ -1,5 +1,5 @@
-#![allow(clippy::collapsible_else_if)]
-#![allow(unsafe_code)]
+#![expect(clippy::unwrap_used)]
+#![expect(unsafe_code)]
 
 use std::{collections::HashMap, sync::Arc};
 
diff --git a/crates/egui_glow/src/shader_version.rs b/crates/egui_glow/src/shader_version.rs
index 3b2ec5347..7d0caf7fa 100644
--- a/crates/egui_glow/src/shader_version.rs
+++ b/crates/egui_glow/src/shader_version.rs
@@ -1,5 +1,6 @@
-#![allow(unsafe_code)]
-#![allow(clippy::undocumented_unsafe_blocks)]
+#![expect(clippy::undocumented_unsafe_blocks)]
+#![expect(clippy::unwrap_used)] // TODO(emilk): avoid unwraps
+#![expect(unsafe_code)]
 
 use std::convert::TryInto as _;
 
diff --git a/crates/egui_glow/src/vao.rs b/crates/egui_glow/src/vao.rs
index 736daf2f7..bb9529322 100644
--- a/crates/egui_glow/src/vao.rs
+++ b/crates/egui_glow/src/vao.rs
@@ -1,4 +1,5 @@
-#![allow(unsafe_code)]
+#![expect(unsafe_code)]
+#![expect(clippy::unwrap_used)]
 
 use glow::HasContext as _;
 
diff --git a/crates/egui_glow/src/winit.rs b/crates/egui_glow/src/winit.rs
index 49f43cb11..6ed67ae8e 100644
--- a/crates/egui_glow/src/winit.rs
+++ b/crates/egui_glow/src/winit.rs
@@ -28,6 +28,7 @@ impl EguiGlow {
         native_pixels_per_point: Option<f32>,
         dithering: bool,
     ) -> Self {
+        #[expect(clippy::unwrap_used)] // TODO(emilk): return error instead of unwrap
         let painter = crate::Painter::new(gl, "", shader_version, dithering)
             .map_err(|err| {
                 log::error!("error occurred in initializing painter:\n{err}");
@@ -65,7 +66,7 @@ impl EguiGlow {
     }
 
     /// Call [`Self::paint`] later to paint.
-    pub fn run(&mut self, window: &winit::window::Window, run_ui: impl FnMut(&egui::Context)) {
+    pub fn run(&mut self, window: &winit::window::Window, run_ui: impl FnMut(&mut egui::Ui)) {
         let raw_input = self.egui_winit.take_egui_input(window);
 
         let egui::FullOutput {
@@ -74,7 +75,7 @@ impl EguiGlow {
             shapes,
             pixels_per_point,
             viewport_output,
-        } = self.egui_ctx.run(raw_input, run_ui);
+        } = self.egui_ctx.run_ui(raw_input, run_ui);
 
         if viewport_output.len() > 1 {
             log::warn!("Multiple viewports not yet supported by EguiGlow");
diff --git a/crates/egui_kittest/CHANGELOG.md b/crates/egui_kittest/CHANGELOG.md
index 09fe5c4f1..f2470787e 100644
--- a/crates/egui_kittest/CHANGELOG.md
+++ b/crates/egui_kittest/CHANGELOG.md
@@ -6,6 +6,11 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.33.3 - 2025-12-11
+* Enforce consistent snapshot updates [#7744](https://github.com/emilk/egui/pull/7744) by [@lucasmerlin](https://github.com/lucasmerlin)
+* `kittest`: add drag-and-drop helpers [#7690](https://github.com/emilk/egui/pull/7690) by [@emilk](https://github.com/emilk)
+
+
 ## 0.33.2 - 2025-11-13
 Nothing new
 
diff --git a/crates/egui_kittest/Cargo.toml b/crates/egui_kittest/Cargo.toml
index 1de8ce7ac..33c895617 100644
--- a/crates/egui_kittest/Cargo.toml
+++ b/crates/egui_kittest/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "egui_kittest"
 version.workspace = true
-authors = ["Lucas Meurer <lucasmeurer96@gmail.com>", "Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
+authors = ["Lucas Meurer <hi@lucasmerlin.me>", "Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Testing library for egui based on kittest and AccessKit"
 edition.workspace = true
 rust-version.workspace = true
@@ -34,9 +34,11 @@ x11 = ["eframe?/x11"]
 
 
 [dependencies]
-kittest.workspace = true
 egui.workspace = true
 eframe = { workspace = true, optional = true }
+kittest.workspace = true
+serde.workspace = true
+toml.workspace = true
 
 # wgpu dependencies
 egui-wgpu = { workspace = true, optional = true }
diff --git a/crates/egui_kittest/README.md b/crates/egui_kittest/README.md
index b774572f6..638c61522 100644
--- a/crates/egui_kittest/README.md
+++ b/crates/egui_kittest/README.md
@@ -12,30 +12,55 @@ Ui testing library for egui, based on [kittest](https://github.com/rerun-io/kitt
 use egui::accesskit::Toggled;
 use egui_kittest::{Harness, kittest::{Queryable, NodeT}};
 
-fn main() {
-    let mut checked = false;
-    let app = |ui: &mut egui::Ui| {
-        ui.checkbox(&mut checked, "Check me!");
-    };
+let mut checked = false;
+let app = |ui: &mut egui::Ui| {
+    ui.checkbox(&mut checked, "Check me!");
+};
 
-    let mut harness = Harness::new_ui(app);
+let mut harness = Harness::new_ui(app);
 
-    let checkbox = harness.get_by_label("Check me!");
-    assert_eq!(checkbox.accesskit_node().toggled(), Some(Toggled::False));
-    checkbox.click();
+let checkbox = harness.get_by_label("Check me!");
+assert_eq!(checkbox.accesskit_node().toggled(), Some(Toggled::False));
+checkbox.click();
 
-    harness.run();
+harness.run();
 
-    let checkbox = harness.get_by_label("Check me!");
-    assert_eq!(checkbox.accesskit_node().toggled(), Some(Toggled::True));
+let checkbox = harness.get_by_label("Check me!");
+assert_eq!(checkbox.accesskit_node().toggled(), Some(Toggled::True));
 
-    // Shrink the window size to the smallest size possible
-    harness.fit_contents();
+// Shrink the window size to the smallest size possible
+harness.fit_contents();
 
-    // You can even render the ui and do image snapshot tests
-    #[cfg(all(feature = "wgpu", feature = "snapshot"))]
-    harness.snapshot("readme_example");
-}
+// You can even render the ui and do image snapshot tests
+#[cfg(all(feature = "wgpu", feature = "snapshot"))]
+harness.snapshot("readme_example");
+```
+
+## Configuration
+
+You can configure test settings via a `kittest.toml` file in your workspace root.
+All possible settings and their defaults:
+```toml
+# path to the snapshot directory
+output_path = "tests/snapshots"
+
+# default threshold for image comparison tests
+threshold = 0.6
+
+# default failed_pixel_count_threshold
+failed_pixel_count_threshold = 0
+
+[windows]
+threshold = 0.6
+failed_pixel_count_threshold = 0
+
+[macos]
+threshold = 0.6
+failed_pixel_count_threshold = 0
+
+[linux]
+threshold = 0.6
+failed_pixel_count_threshold = 0
 ```
 
 ## Snapshot testing
diff --git a/crates/egui_kittest/src/app_kind.rs b/crates/egui_kittest/src/app_kind.rs
index 56b942323..90cb5bd43 100644
--- a/crates/egui_kittest/src/app_kind.rs
+++ b/crates/egui_kittest/src/app_kind.rs
@@ -24,58 +24,61 @@ pub(crate) enum AppKind<'a, State> {
 impl<State> AppKind<'_, State> {
     pub fn run(
         &mut self,
-        ctx: &egui::Context,
+        ui: &mut egui::Ui,
         state: &mut State,
         sizing_pass: bool,
     ) -> Option<egui::Response> {
         match self {
             AppKind::Context(f) => {
                 debug_assert!(!sizing_pass, "Context closures cannot do a sizing pass");
-                f(ctx);
+                f(ui);
                 None
             }
             AppKind::ContextState(f) => {
                 debug_assert!(!sizing_pass, "Context closures cannot do a sizing pass");
-                f(ctx, state);
+                f(ui, state);
                 None
             }
             #[cfg(feature = "eframe")]
             AppKind::Eframe((get_app, frame)) => {
                 let app = get_app(state);
-                app.update(ctx, frame);
+
+                app.logic(ui, frame);
+
+                #[expect(deprecated)]
+                app.update(ui, frame);
+
+                app.ui(ui, frame);
+
                 None
             }
-            kind_ui => Some(kind_ui.run_ui(ctx, state, sizing_pass)),
+            kind_ui => Some(kind_ui.run_ui(ui, state, sizing_pass)),
         }
     }
 
     fn run_ui(
         &mut self,
-        ctx: &egui::Context,
+        ui: &mut egui::Ui,
         state: &mut State,
         sizing_pass: bool,
     ) -> egui::Response {
-        egui::CentralPanel::default()
-            .frame(Frame::NONE)
-            .show(ctx, |ui| {
-                let mut builder = egui::UiBuilder::new();
-                if sizing_pass {
-                    builder.sizing_pass = true;
-                }
-                ui.scope_builder(builder, |ui| {
-                    Frame::central_panel(ui.style())
-                        .outer_margin(8.0)
-                        .inner_margin(0.0)
-                        .show(ui, |ui| match self {
-                            AppKind::Ui(f) => f(ui),
-                            AppKind::UiState(f) => f(ui, state),
-                            _ => unreachable!(
-                                "run_ui should only be called with AppKind::Ui or AppKind UiState"
-                            ),
-                        });
-                })
-                .response
-            })
-            .inner
+        let mut builder = egui::UiBuilder::new();
+        if sizing_pass {
+            builder.sizing_pass = true;
+        }
+        ui.scope_builder(builder, |ui| {
+            Frame::central_panel(ui.style())
+                // Only set outer margin, so we show no frame for tests with only free-floating windows/popups:
+                .outer_margin(8.0)
+                .inner_margin(0.0)
+                .show(ui, |ui| match self {
+                    AppKind::Ui(f) => f(ui),
+                    AppKind::UiState(f) => f(ui, state),
+                    _ => unreachable!(
+                        "run_ui should only be called with AppKind::Ui or AppKind UiState"
+                    ),
+                });
+        })
+        .response
     }
 }
diff --git a/crates/egui_kittest/src/builder.rs b/crates/egui_kittest/src/builder.rs
index 09b91d26d..b33e37e39 100644
--- a/crates/egui_kittest/src/builder.rs
+++ b/crates/egui_kittest/src/builder.rs
@@ -166,6 +166,8 @@ impl<State> HarnessBuilder<State> {
     ///
     /// assert_eq!(*harness.state(), true);
     /// ```
+    #[track_caller]
+    #[deprecated = "use `build_ui_state` instead"]
     pub fn build_state<'a>(
         self,
         app: impl FnMut(&egui::Context, &mut State) + 'a,
@@ -195,6 +197,7 @@ impl<State> HarnessBuilder<State> {
     ///
     /// assert_eq!(*harness.state(), true);
     /// ```
+    #[track_caller]
     pub fn build_ui_state<'a>(
         self,
         app: impl FnMut(&mut egui::Ui, &mut State) + 'a,
@@ -206,6 +209,7 @@ impl<State> HarnessBuilder<State> {
     /// Create a new [Harness] from the given eframe creation closure.
     /// The app can be accessed via the [`Harness::state`] / [`Harness::state_mut`] methods.
     #[cfg(feature = "eframe")]
+    #[track_caller]
     pub fn build_eframe<'a>(
         self,
         build: impl FnOnce(&mut eframe::CreationContext<'a>) -> State,
@@ -247,6 +251,8 @@ impl HarnessBuilder {
     ///     });
     /// ```
     #[must_use]
+    #[track_caller]
+    #[deprecated = "use `build_ui` instead"]
     pub fn build<'a>(self, app: impl FnMut(&egui::Context) + 'a) -> Harness<'a> {
         Harness::from_builder(self, AppKind::Context(Box::new(app)), (), None)
     }
@@ -267,6 +273,7 @@ impl HarnessBuilder {
     ///     });
     /// ```
     #[must_use]
+    #[track_caller]
     pub fn build_ui<'a>(self, app: impl FnMut(&mut egui::Ui) + 'a) -> Harness<'a> {
         Harness::from_builder(self, AppKind::Ui(Box::new(app)), (), None)
     }
diff --git a/crates/egui_kittest/src/config.rs b/crates/egui_kittest/src/config.rs
new file mode 100644
index 000000000..a1859f232
--- /dev/null
+++ b/crates/egui_kittest/src/config.rs
@@ -0,0 +1,156 @@
+#![cfg(feature = "snapshot")]
+
+use std::io;
+use std::path::PathBuf;
+
+/// Configuration for `egui_kittest`.
+///
+/// It's loaded once (per process) by searching for a `kittest.toml` file in the project root
+/// (the directory containing `Cargo.lock`).
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct Config {
+    /// The output path for image snapshots.
+    ///
+    /// Default is "tests/snapshots" (relative to the working directory / crate root).
+    output_path: PathBuf,
+
+    /// The per-pixel threshold.
+    ///
+    /// Default is 0.6.
+    threshold: f32,
+
+    /// The number of pixels that can differ before the test is considered failed.
+    ///
+    /// Default is 0.
+    failed_pixel_count_threshold: usize,
+
+    windows: OsConfig,
+    mac: OsConfig,
+    linux: OsConfig,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            output_path: PathBuf::from("tests/snapshots"),
+            threshold: 0.6,
+            failed_pixel_count_threshold: 0,
+            windows: Default::default(),
+            mac: Default::default(),
+            linux: Default::default(),
+        }
+    }
+}
+#[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)]
+#[serde(default, deny_unknown_fields)]
+pub struct OsConfig {
+    /// Override the per-pixel threshold for this OS.
+    threshold: Option<f32>,
+
+    /// Override the failed pixel count threshold for this OS.
+    failed_pixel_count_threshold: Option<usize>,
+}
+
+fn find_kittest_toml() -> io::Result<std::path::PathBuf> {
+    let mut current_dir = std::env::current_dir()?;
+
+    loop {
+        let current_kittest = current_dir.join("kittest.toml");
+        // Check if Cargo.toml exists in this directory
+        if current_kittest.exists() {
+            return Ok(current_kittest);
+        }
+
+        // Move up one directory
+        if !current_dir.pop() {
+            return Err(io::Error::new(
+                io::ErrorKind::NotFound,
+                "kittest.toml not found",
+            ));
+        }
+    }
+}
+
+fn load_config() -> Config {
+    if let Ok(config_path) = find_kittest_toml() {
+        match std::fs::read_to_string(&config_path) {
+            Ok(config_str) => match toml::from_str(&config_str) {
+                Ok(config) => config,
+                Err(e) => panic!("Failed to parse {}: {e}", &config_path.display()),
+            },
+            Err(err) => {
+                panic!("Failed to read {}: {}", config_path.display(), err);
+            }
+        }
+    } else {
+        Config::default()
+    }
+}
+
+/// Get the global configuration.
+///
+/// See [`Config::global`] for details.
+pub fn config() -> &'static Config {
+    Config::global()
+}
+
+impl Config {
+    /// Get or load the global configuration.
+    ///
+    /// This is either
+    ///  - Based on a `kittest.toml`, found by searching from the current working directory
+    ///    (for tests that is the crate root) upwards.
+    ///  - The default [Config], if no `kittest.toml` is found.
+    pub fn global() -> &'static Self {
+        static INSTANCE: std::sync::LazyLock<Config> = std::sync::LazyLock::new(load_config);
+        &INSTANCE
+    }
+
+    /// The output path for image snapshots.
+    ///
+    /// Default is "tests/snapshots".
+    pub fn output_path(&self) -> PathBuf {
+        self.output_path.clone()
+    }
+}
+
+#[cfg(feature = "snapshot")]
+impl Config {
+    pub fn os_threshold(&self) -> crate::OsThreshold<f32> {
+        let fallback = self.threshold;
+        crate::OsThreshold {
+            windows: self.windows.threshold.unwrap_or(fallback),
+            macos: self.mac.threshold.unwrap_or(fallback),
+            linux: self.linux.threshold.unwrap_or(fallback),
+            fallback,
+        }
+    }
+
+    pub fn os_failed_pixel_count_threshold(&self) -> crate::OsThreshold<usize> {
+        let fallback = self.failed_pixel_count_threshold;
+        crate::OsThreshold {
+            windows: self
+                .windows
+                .failed_pixel_count_threshold
+                .unwrap_or(fallback),
+            macos: self.mac.failed_pixel_count_threshold.unwrap_or(fallback),
+            linux: self.linux.failed_pixel_count_threshold.unwrap_or(fallback),
+            fallback,
+        }
+    }
+
+    /// The threshold.
+    ///
+    /// Default is 1.0.
+    pub fn threshold(&self) -> f32 {
+        self.os_threshold().threshold()
+    }
+
+    /// The number of pixels that can differ before the test is considered failed.
+    ///
+    /// Default is 0.
+    pub fn failed_pixel_count_threshold(&self) -> usize {
+        self.os_failed_pixel_count_threshold().threshold()
+    }
+}
diff --git a/crates/egui_kittest/src/lib.rs b/crates/egui_kittest/src/lib.rs
index fc8b8efbc..b9f7dc7c2 100644
--- a/crates/egui_kittest/src/lib.rs
+++ b/crates/egui_kittest/src/lib.rs
@@ -1,7 +1,8 @@
-#![doc = include_str!("../README.md")]
+#![cfg_attr(doc, doc = include_str!("../README.md"))]
 //!
 //! ## Feature flags
 #![cfg_attr(feature = "document-features", doc = document_features::document_features!())]
+#![expect(clippy::unwrap_used)] // TODO(emilk): avoid unwraps
 
 mod builder;
 #[cfg(feature = "snapshot")]
@@ -11,6 +12,7 @@ mod snapshot;
 pub use crate::snapshot::*;
 
 mod app_kind;
+mod config;
 mod node;
 mod renderer;
 #[cfg(feature = "wgpu")]
@@ -83,6 +85,8 @@ pub struct Harness<'a, State = ()> {
 
     #[cfg(feature = "snapshot")]
     default_snapshot_options: SnapshotOptions,
+    #[cfg(feature = "snapshot")]
+    snapshot_results: SnapshotResults,
 }
 
 impl<State> Debug for Harness<'_, State> {
@@ -92,6 +96,7 @@ impl<State> Debug for Harness<'_, State> {
 }
 
 impl<'a, State> Harness<'a, State> {
+    #[track_caller]
     pub(crate) fn from_builder(
         builder: HarnessBuilder<State>,
         mut app: AppKind<'a, State>,
@@ -133,8 +138,8 @@ impl<'a, State> Harness<'a, State> {
 
         // We need to run egui for a single frame so that the AccessKit state can be initialized
         // and users can immediately start querying for widgets.
-        let mut output = ctx.run(input.clone(), |ctx| {
-            response = app.run(ctx, &mut state, false);
+        let mut output = ctx.run_ui(input.clone(), |ui| {
+            response = app.run(ui, &mut state, false);
         });
 
         renderer.handle_delta(&output.textures_delta);
@@ -161,6 +166,9 @@ impl<'a, State> Harness<'a, State> {
 
             #[cfg(feature = "snapshot")]
             default_snapshot_options,
+
+            #[cfg(feature = "snapshot")]
+            snapshot_results: SnapshotResults::default(),
         };
         // Run the harness until it is stable, ensuring that all Areas are shown and animations are done
         harness.run_ok();
@@ -196,7 +204,10 @@ impl<'a, State> Harness<'a, State> {
     ///
     /// assert_eq!(*harness.state(), true);
     /// ```
+    #[track_caller]
+    #[deprecated = "use `new_ui_state` instead"]
     pub fn new_state(app: impl FnMut(&egui::Context, &mut State) + 'a, state: State) -> Self {
+        #[expect(deprecated)]
         Self::builder().build_state(app, state)
     }
 
@@ -221,12 +232,14 @@ impl<'a, State> Harness<'a, State> {
     ///
     /// assert_eq!(*harness.state(), true);
     /// ```
+    #[track_caller]
     pub fn new_ui_state(app: impl FnMut(&mut egui::Ui, &mut State) + 'a, state: State) -> Self {
         Self::builder().build_ui_state(app, state)
     }
 
     /// Create a new [Harness] from the given eframe creation closure.
     #[cfg(feature = "eframe")]
+    #[track_caller]
     pub fn new_eframe(builder: impl FnOnce(&mut eframe::CreationContext<'a>) -> State) -> Self
     where
         State: eframe::App,
@@ -277,8 +290,8 @@ impl<'a, State> Harness<'a, State> {
     fn _step(&mut self, sizing_pass: bool) {
         self.input.predicted_dt = self.step_dt;
 
-        let mut output = self.ctx.run(self.input.take(), |ctx| {
-            self.response = self.app.run(ctx, &mut self.state, sizing_pass);
+        let mut output = self.ctx.run_ui(self.input.take(), |ui| {
+            self.response = self.app.run(ui, &mut self.state, sizing_pass);
         });
         self.kittest.update(
             output
@@ -724,7 +737,10 @@ impl<'a> Harness<'a> {
     ///     });
     /// });
     /// ```
+    #[track_caller]
+    #[deprecated = "use `new_ui` instead"]
     pub fn new(app: impl FnMut(&egui::Context) + 'a) -> Self {
+        #[expect(deprecated)]
         Self::builder().build(app)
     }
 
@@ -744,6 +760,7 @@ impl<'a> Harness<'a> {
     ///     ui.label("Hello, world!");
     /// });
     /// ```
+    #[track_caller]
     pub fn new_ui(app: impl FnMut(&mut egui::Ui) + 'a) -> Self {
         Self::builder().build_ui(app)
     }
diff --git a/crates/egui_kittest/src/snapshot.rs b/crates/egui_kittest/src/snapshot.rs
index f6511c451..4d139fcbb 100644
--- a/crates/egui_kittest/src/snapshot.rs
+++ b/crates/egui_kittest/src/snapshot.rs
@@ -1,28 +1,35 @@
-use crate::Harness;
-use image::ImageError;
 use std::fmt::Display;
 use std::io::ErrorKind;
 use std::path::PathBuf;
 
+use image::ImageError;
+
+use crate::{Harness, config::config};
+
 pub type SnapshotResult = Result<(), SnapshotError>;
 
 #[non_exhaustive]
 #[derive(Clone, Debug)]
 pub struct SnapshotOptions {
     /// The threshold for the image comparison.
-    /// The default is `0.6` (which is enough for most egui tests to pass across different
-    /// wgpu backends).
+    ///
+    /// Can be configured via kittest.toml. The fallback is `0.6` (which is enough for most egui
+    /// tests to pass across different wgpu backends).
     pub threshold: f32,
 
     /// The number of pixels that can differ before the snapshot is considered a failure.
+    ///
     /// Preferably, you should use `threshold` to control the sensitivity of the image comparison.
     /// As a last resort, you can use this to allow a certain number of pixels to differ.
-    /// If `None`, the default is `0` (meaning no pixels can differ).
-    /// If `Some`, the value can be set per OS
+    /// Can be configured via kittest.toml. The fallback is `0` (meaning no pixels can differ).
     pub failed_pixel_count_threshold: usize,
 
     /// The path where the snapshots will be saved.
-    /// The default is `tests/snapshots`.
+    ///
+    /// This is relative to the current working directory (usually the crate root when
+    /// running tests).
+    ///
+    /// Can be configured via kittest.toml. The fallback is `tests/snapshots`.
     pub output_path: PathBuf,
 }
 
@@ -30,7 +37,9 @@ pub struct SnapshotOptions {
 ///
 /// This is useful if you want to set different thresholds for different operating systems.
 ///
-/// The default values are 0 / 0.0
+/// [`OsThreshold::default`] gets the default from the config file (`kittest.toml`).
+/// For `usize`, it's the `failed_pixel_count_threshold` value.
+/// For `f32`, it's the `threshold` value.
 ///
 /// Example usage:
 /// ```no_run
@@ -53,12 +62,36 @@ pub struct OsThreshold<T> {
     pub fallback: T,
 }
 
+impl Default for OsThreshold<usize> {
+    /// Returns the default `failed_pixel_count_threshold` as configured in `kittest.toml`
+    ///
+    /// The fallback is `0`.
+    fn default() -> Self {
+        config().os_failed_pixel_count_threshold()
+    }
+}
+
+impl Default for OsThreshold<f32> {
+    /// Returns the default `threshold` as configured in `kittest.toml`
+    ///
+    /// The fallback is `0.6`.
+    fn default() -> Self {
+        config().os_threshold()
+    }
+}
+
 impl From<usize> for OsThreshold<usize> {
     fn from(value: usize) -> Self {
         Self::new(value)
     }
 }
 
+impl From<f32> for OsThreshold<f32> {
+    fn from(value: f32) -> Self {
+        Self::new(value)
+    }
+}
+
 impl<T> OsThreshold<T>
 where
     T: Copy,
@@ -123,9 +156,9 @@ impl From<OsThreshold<Self>> for f32 {
 impl Default for SnapshotOptions {
     fn default() -> Self {
         Self {
-            threshold: 0.6,
-            output_path: PathBuf::from("tests/snapshots"),
-            failed_pixel_count_threshold: 0, // Default is 0, meaning no pixels can differ
+            threshold: config().threshold(),
+            output_path: config().output_path(),
+            failed_pixel_count_threshold: config().failed_pixel_count_threshold(),
         }
     }
 }
@@ -231,7 +264,8 @@ impl Display for SnapshotError {
                 diff,
                 diff_path,
             } => {
-                let diff_path = std::path::absolute(diff_path).unwrap_or(diff_path.clone());
+                let diff_path =
+                    std::path::absolute(diff_path).unwrap_or_else(|_| diff_path.clone());
                 write!(
                     f,
                     "'{name}' Image did not match snapshot. Diff: {diff}, {}. {HOW_TO_UPDATE_SCREENSHOTS}",
@@ -239,7 +273,7 @@ impl Display for SnapshotError {
                 )
             }
             Self::OpenSnapshot { path, err } => {
-                let path = std::path::absolute(path).unwrap_or(path.clone());
+                let path = std::path::absolute(path).unwrap_or_else(|_| path.clone());
                 match err {
                     ImageError::IoError(io) => match io.kind() {
                         ErrorKind::NotFound => {
@@ -277,7 +311,7 @@ impl Display for SnapshotError {
                 )
             }
             Self::WriteSnapshot { path, err } => {
-                let path = std::path::absolute(path).unwrap_or(path.clone());
+                let path = std::path::absolute(path).unwrap_or_else(|_| path.clone());
                 write!(f, "Error writing snapshot: {err}\nAt: {}", path.display())
             }
             Self::RenderError { err } => {
@@ -630,16 +664,16 @@ impl<State> Harness<'_, State> {
     /// If the new image didn't match the snapshot, a diff image will be saved under `{output_path}/{name}.diff.png`.
     ///
     /// # Panics
-    /// Panics if the image does not match the snapshot, if there was an error reading or writing the
+    /// The result is added to the [`Harness`]'s internal [`SnapshotResults`].
+    ///
+    /// The harness will panic when dropped if there were any snapshot errors.
+    ///
+    /// Errors happen if the image does not match the snapshot, if there was an error reading or writing the
     /// snapshot, if the rendering fails or if no default renderer is available.
     #[track_caller]
     pub fn snapshot_options(&mut self, name: impl Into<String>, options: &SnapshotOptions) {
-        match self.try_snapshot_options(name, options) {
-            Ok(_) => {}
-            Err(err) => {
-                panic!("{err}");
-            }
-        }
+        let result = self.try_snapshot_options(name, options);
+        self.snapshot_results.add(result);
     }
 
     /// Render an image using the setup [`crate::TestRenderer`] and compare it to the snapshot.
@@ -655,12 +689,8 @@ impl<State> Harness<'_, State> {
     /// snapshot, if the rendering fails or if no default renderer is available.
     #[track_caller]
     pub fn snapshot(&mut self, name: impl Into<String>) {
-        match self.try_snapshot(name) {
-            Ok(_) => {}
-            Err(err) => {
-                panic!("{err}");
-            }
-        }
+        let result = self.try_snapshot(name);
+        self.snapshot_results.add(result);
     }
 
     /// Render a snapshot, save it to a temp file and open it in the default image viewer.
@@ -706,6 +736,12 @@ impl<State> Harness<'_, State> {
             }
         }
     }
+
+    /// This removes the snapshot results from the harness. Useful if you e.g. want to merge it
+    /// with the results from another harness (using [`SnapshotResults::add`]).
+    pub fn take_snapshot_results(&mut self) -> SnapshotResults {
+        std::mem::take(&mut self.snapshot_results)
+    }
 }
 
 /// Utility to collect snapshot errors and display them at the end of the test.
@@ -732,9 +768,22 @@ impl<State> Harness<'_, State> {
 /// Panics if there are any errors when dropped (this way it is impossible to forget to call `unwrap`).
 /// If you don't want to panic, you can use [`SnapshotResults::into_result`] or [`SnapshotResults::into_inner`].
 /// If you want to panic early, you can use [`SnapshotResults::unwrap`].
-#[derive(Debug, Default)]
+#[derive(Debug)]
 pub struct SnapshotResults {
     errors: Vec<SnapshotError>,
+    handled: bool,
+    location: std::panic::Location<'static>,
+}
+
+impl Default for SnapshotResults {
+    #[track_caller]
+    fn default() -> Self {
+        Self {
+            errors: Vec::new(),
+            handled: true, // If no snapshots were added, we should consider this handled.
+            location: *std::panic::Location::caller(),
+        }
+    }
 }
 
 impl Display for SnapshotResults {
@@ -752,17 +801,30 @@ impl Display for SnapshotResults {
 }
 
 impl SnapshotResults {
+    #[track_caller]
     pub fn new() -> Self {
         Default::default()
     }
 
     /// Check if the result is an error and add it to the list of errors.
     pub fn add(&mut self, result: SnapshotResult) {
+        self.handled = false;
         if let Err(err) = result {
             self.errors.push(err);
         }
     }
 
+    /// Add all errors from another `SnapshotResults`.
+    pub fn extend(&mut self, other: Self) {
+        self.handled = false;
+        self.errors.extend(other.into_inner());
+    }
+
+    /// Add all errors from a [`Harness`].
+    pub fn extend_harness<T>(&mut self, harness: &mut Harness<'_, T>) {
+        self.extend(harness.take_snapshot_results());
+    }
+
     /// Check if there are any errors.
     pub fn has_errors(&self) -> bool {
         !self.errors.is_empty()
@@ -774,13 +836,14 @@ impl SnapshotResults {
         if self.has_errors() { Err(self) } else { Ok(()) }
     }
 
+    /// Consume this and return the list of errors.
     pub fn into_inner(mut self) -> Vec<SnapshotError> {
+        self.handled = true;
         std::mem::take(&mut self.errors)
     }
 
     /// Panics if there are any errors, displaying each.
     #[expect(clippy::unused_self)]
-    #[track_caller]
     pub fn unwrap(self) {
         // Panic is handled in drop
     }
@@ -793,7 +856,6 @@ impl From<SnapshotResults> for Vec<SnapshotError> {
 }
 
 impl Drop for SnapshotResults {
-    #[track_caller]
     fn drop(&mut self) {
         // Don't panic if we are already panicking (the test probably failed for another reason)
         if std::thread::panicking() {
@@ -803,5 +865,32 @@ impl Drop for SnapshotResults {
         if self.has_errors() {
             panic!("{}", self);
         }
+
+        thread_local! {
+            static UNHANDLED_SNAPSHOT_RESULTS_COUNTER: std::cell::RefCell<usize> = const { std::cell::RefCell::new(0) };
+        }
+
+        if !self.handled {
+            let count = UNHANDLED_SNAPSHOT_RESULTS_COUNTER.with(|counter| {
+                let mut count = counter.borrow_mut();
+                *count += 1;
+                *count
+            });
+
+            #[expect(clippy::manual_assert)]
+            if count >= 2 {
+                panic!(
+                    r#"
+Multiple SnapshotResults were dropped without being handled.
+
+In order to allow consistent snapshot updates, all snapshot results within a test should be merged in a single SnapshotResults instance.
+Usually this is handled internally in a harness. If you have multiple harnesses, you can merge the results using `Harness::take_snapshot_results` and `SnapshotResults::extend`.
+
+The SnapshotResult was constructed at {}
+                    "#,
+                    self.location
+                );
+            }
+        }
     }
 }
diff --git a/crates/egui_kittest/src/wgpu.rs b/crates/egui_kittest/src/wgpu.rs
index ae773095d..3f97e0036 100644
--- a/crates/egui_kittest/src/wgpu.rs
+++ b/crates/egui_kittest/src/wgpu.rs
@@ -51,7 +51,7 @@ pub fn default_wgpu_setup() -> egui_wgpu::WgpuSetup {
         adapters
             .first()
             .map(|a| (*a).clone())
-            .ok_or("No adapter found".to_owned())
+            .ok_or_else(|| "No adapter found".to_owned())
     }));
 
     egui_wgpu::WgpuSetup::CreateNew(setup)
diff --git a/crates/egui_kittest/tests/accesskit.rs b/crates/egui_kittest/tests/accesskit.rs
index 08a96bd7a..2b14d0fa1 100644
--- a/crates/egui_kittest/tests/accesskit.rs
+++ b/crates/egui_kittest/tests/accesskit.rs
@@ -1,7 +1,7 @@
 //! Tests the accesskit accessibility output of egui.
 
 use egui::{
-    CentralPanel, Context, RawInput, Window,
+    CentralPanel, Context, RawInput, Ui, Window,
     accesskit::{NodeId, Role, TreeUpdate},
 };
 
@@ -12,14 +12,14 @@ use egui::{
 /// are put there because of the widgets rendered.
 #[test]
 fn empty_ui_should_return_tree_with_only_root_window() {
-    let output = accesskit_output_single_egui_frame(|ctx| {
-        CentralPanel::default().show(ctx, |_| {});
+    let output = accesskit_output_single_egui_frame(|_ui| {
+        // Nothing here beyond the default empty UI
     });
 
     assert_eq!(
         output.nodes.len(),
-        4,
-        "Expected the root node and two Uis and a Frame for the panel"
+        2,
+        "Expected the root node and the top level Ui; found: {output:#?}",
     );
 
     assert_eq!(
@@ -28,8 +28,8 @@ fn empty_ui_should_return_tree_with_only_root_window() {
             .iter()
             .filter(|(_, n)| n.role() == Role::GenericContainer)
             .count(),
-        3,
-        "Expected two Uis and one Frame as GenericContainer nodes.",
+        1,
+        "Expected a single Ui as a GenericContainer node.",
     );
 
     let (id, root) = &output.nodes[0];
@@ -42,8 +42,8 @@ fn empty_ui_should_return_tree_with_only_root_window() {
 fn button_node() {
     let button_text = "This is a test button!";
 
-    let output = accesskit_output_single_egui_frame(|ctx| {
-        CentralPanel::default().show(ctx, |ui| ui.button(button_text));
+    let output = accesskit_output_single_egui_frame(|ui| {
+        CentralPanel::default().show_inside(ui, |ui| ui.button(button_text));
     });
 
     let (_, button) = output
@@ -60,8 +60,8 @@ fn button_node() {
 fn disabled_button_node() {
     let button_text = "This is a test button!";
 
-    let output = accesskit_output_single_egui_frame(|ctx| {
-        CentralPanel::default().show(ctx, |ui| {
+    let output = accesskit_output_single_egui_frame(|ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             ui.add_enabled(false, egui::Button::new(button_text))
         });
     });
@@ -81,8 +81,8 @@ fn toggle_button_node() {
     let button_text = "A toggle button";
 
     let mut selected = false;
-    let output = accesskit_output_single_egui_frame(|ctx| {
-        CentralPanel::default().show(ctx, |ui| ui.toggle_value(&mut selected, button_text));
+    let output = accesskit_output_single_egui_frame(|ui| {
+        CentralPanel::default().show_inside(ui, |ui| ui.toggle_value(&mut selected, button_text));
     });
 
     let (_, toggle) = output
@@ -97,8 +97,8 @@ fn toggle_button_node() {
 
 #[test]
 fn multiple_disabled_widgets() {
-    let output = accesskit_output_single_egui_frame(|ctx| {
-        CentralPanel::default().show(ctx, |ui| {
+    let output = accesskit_output_single_egui_frame(|ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             ui.add_enabled_ui(false, |ui| {
                 let _ = ui.button("Button 1");
                 let _ = ui.button("Button 2");
@@ -120,12 +120,12 @@ fn multiple_disabled_widgets() {
 
 #[test]
 fn window_children() {
-    let output = accesskit_output_single_egui_frame(|ctx| {
+    let output = accesskit_output_single_egui_frame(|ui| {
         let mut open = true;
         Window::new("test window")
             .open(&mut open)
             .resizable(false)
-            .show(ctx, |ui| {
+            .show(ui.ctx(), |ui| {
                 let _ = ui.button("A button");
             });
     });
@@ -138,13 +138,13 @@ fn window_children() {
     assert_button_exists(&output, "Hide", window_id);
 }
 
-fn accesskit_output_single_egui_frame(run_ui: impl FnMut(&Context)) -> TreeUpdate {
+fn accesskit_output_single_egui_frame(run_ui: impl FnMut(&mut Ui)) -> TreeUpdate {
     let ctx = Context::default();
     // Disable animations, so we do not need to wait for animations to end to see the result.
-    ctx.style_mut(|style| style.animation_time = 0.0);
+    ctx.global_style_mut(|style| style.animation_time = 0.0);
     ctx.enable_accesskit();
 
-    let output = ctx.run(RawInput::default(), run_ui);
+    let output = ctx.run_ui(RawInput::default(), run_ui);
 
     output
         .platform_output
diff --git a/crates/egui_kittest/tests/regression_tests.rs b/crates/egui_kittest/tests/regression_tests.rs
index 9b1a9a096..4289fe3a9 100644
--- a/crates/egui_kittest/tests/regression_tests.rs
+++ b/crates/egui_kittest/tests/regression_tests.rs
@@ -194,7 +194,7 @@ pub fn menus_should_close_even_if_submenu_disappears() {
     const OTHER_BUTTON: &str = "Other button";
     const MENU_BUTTON: &str = "Menu";
     const SUB_MENU_BUTTON: &str = "Always here";
-    const TOGGLABLE_SUB_MENU_BUTTON: &str = "Maybe here";
+    const TOGGLEABLE_SUB_MENU_BUTTON: &str = "Maybe here";
     const INSIDE_SUB_MENU_BUTTON: &str = "Inside submenu";
 
     for frame_delay in (0..3).rev() {
@@ -206,7 +206,7 @@ pub fn menus_should_close_even_if_submenu_disappears() {
                 Popup::menu(&response).show(|ui| {
                     let _ = ui.button(SUB_MENU_BUTTON);
                     if *state {
-                        ui.menu_button(TOGGLABLE_SUB_MENU_BUTTON, |ui| {
+                        ui.menu_button(TOGGLEABLE_SUB_MENU_BUTTON, |ui| {
                             let _ = ui.button(INSIDE_SUB_MENU_BUTTON);
                         });
                     }
@@ -221,7 +221,7 @@ pub fn menus_should_close_even_if_submenu_disappears() {
 
         // Open the sub menu
         harness
-            .get_by_label_contains(TOGGLABLE_SUB_MENU_BUTTON)
+            .get_by_label_contains(TOGGLEABLE_SUB_MENU_BUTTON)
             .hover();
         harness.run();
 
diff --git a/crates/egui_kittest/tests/snapshots/combobox_closed.png b/crates/egui_kittest/tests/snapshots/combobox_closed.png
index bb574d356..708985b14 100644
--- a/crates/egui_kittest/tests/snapshots/combobox_closed.png
+++ b/crates/egui_kittest/tests/snapshots/combobox_closed.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f297609dd69fd479377eaea7cd304b717e0523a650dbf76e19c6d1f1c5af1343
-size 4518
+oid sha256:3ca39801faddae7191ed054029263e8eca488d16e1fcbb40fed482d39fc89e8e
+size 4520
diff --git a/crates/egui_kittest/tests/snapshots/combobox_opened.png b/crates/egui_kittest/tests/snapshots/combobox_opened.png
index e45a4aed3..53a9c8ed1 100644
--- a/crates/egui_kittest/tests/snapshots/combobox_opened.png
+++ b/crates/egui_kittest/tests/snapshots/combobox_opened.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:42911cbb500fa49170aac0da8e4167641c5d7c9724a6accd4d400258fc74e2d7
-size 8061
+oid sha256:bafe5d7129cd2137b8f7bc9662b894d959b7042c436443f835ecd421a0d9c33f
+size 8019
diff --git a/crates/egui_kittest/tests/snapshots/image_snapshots.png b/crates/egui_kittest/tests/snapshots/image_snapshots.png
index 5036d662c..75e18ba5f 100644
--- a/crates/egui_kittest/tests/snapshots/image_snapshots.png
+++ b/crates/egui_kittest/tests/snapshots/image_snapshots.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:de4a197f82befde31b6966f902567c35cef96c7d541fd65b4207c693ab12bace
-size 2036
+oid sha256:cd2ff48cae729b3f957b1630bef23e94fb2176982c06ec3f123c1a0892fc536d
+size 1959
diff --git a/crates/egui_kittest/tests/snapshots/menu/closed_hovered.png b/crates/egui_kittest/tests/snapshots/menu/closed_hovered.png
index c30b3fdd1..d9d542908 100644
--- a/crates/egui_kittest/tests/snapshots/menu/closed_hovered.png
+++ b/crates/egui_kittest/tests/snapshots/menu/closed_hovered.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:94ba2e648c981bf4afbd9b9d01eef0708f7067be6e4cefbdfacc13aa219c6289
-size 11253
+oid sha256:5b6447dd4bd6489b9b909b8240abe54db16331beaa2fb4656f01f79a08fb25f9
+size 11112
diff --git a/crates/egui_kittest/tests/snapshots/menu/opened.png b/crates/egui_kittest/tests/snapshots/menu/opened.png
index 7a2750454..7f9b23b37 100644
--- a/crates/egui_kittest/tests/snapshots/menu/opened.png
+++ b/crates/egui_kittest/tests/snapshots/menu/opened.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:436999f511dce318f29172f0b7e2007e1f0fedae58f5e0e85e19f1d8e0bee361
-size 22273
+oid sha256:4baf110e63fb104f30e9ae06e3601cfb48d7b69aec31636ca470c9ba9f6d44a9
+size 21659
diff --git a/crates/egui_kittest/tests/snapshots/menu/submenu.png b/crates/egui_kittest/tests/snapshots/menu/submenu.png
index 25453c8d9..7c1823938 100644
--- a/crates/egui_kittest/tests/snapshots/menu/submenu.png
+++ b/crates/egui_kittest/tests/snapshots/menu/submenu.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28435faf5c8c6d880cd50d52050c9f4cd6b992d0c621f01ca28fb5502eed16a1
-size 29863
+oid sha256:93d2f336e216f371e7239b08113e659bad6c30eb299a2d8ea9537ae1c63533f0
+size 28503
diff --git a/crates/egui_kittest/tests/snapshots/menu/subsubmenu.png b/crates/egui_kittest/tests/snapshots/menu/subsubmenu.png
index c22c2b9b6..7e8f3f8e7 100644
--- a/crates/egui_kittest/tests/snapshots/menu/subsubmenu.png
+++ b/crates/egui_kittest/tests/snapshots/menu/subsubmenu.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9a364b4b8c4ad3e78a80b0c6825d9de28c0e0d2e18dcfcd0ff18652ca86c859
-size 34750
+oid sha256:6bf27cde6a87112a1ae832a65c80a9e34243b6ee368314379f5bf018edf439e5
+size 33239
diff --git a/crates/egui_kittest/tests/snapshots/override_text_color_interactive.png b/crates/egui_kittest/tests/snapshots/override_text_color_interactive.png
index 6e92f9f03..fb8887d13 100644
--- a/crates/egui_kittest/tests/snapshots/override_text_color_interactive.png
+++ b/crates/egui_kittest/tests/snapshots/override_text_color_interactive.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2fa5cb5b96232d729f89be8cc92263715fe7197e72343b71e57e53a359afe181
-size 19881
+oid sha256:e8038005841dbf272375388b224dcc9fc1177b5c113d3e6f6dbc2265c88c7e60
+size 19704
diff --git a/crates/egui_kittest/tests/snapshots/readme_example.png b/crates/egui_kittest/tests/snapshots/readme_example.png
index f58e6faec..cb99dfc84 100644
--- a/crates/egui_kittest/tests/snapshots/readme_example.png
+++ b/crates/egui_kittest/tests/snapshots/readme_example.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:87c76a9d07174e4e24ad3d08585c1df7bf3628bdc8f183d11beb6f9e14c4b2ec
-size 2325
+oid sha256:e86ed66f3ac3a81998eefbed8cb231edc6522174050676b45e9248f9e7f18533
+size 2227
diff --git a/crates/egui_kittest/tests/snapshots/should_wait_for_images.png b/crates/egui_kittest/tests/snapshots/should_wait_for_images.png
index 7e33877fc..9709e159e 100644
--- a/crates/egui_kittest/tests/snapshots/should_wait_for_images.png
+++ b/crates/egui_kittest/tests/snapshots/should_wait_for_images.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f038c7fdf31f35107ec6e29edc0895049160ccbe98d1577c16ae082605b58d52
-size 2207
+oid sha256:ad75a0e568e04c20d0e3b823c7e4906c39dcd0a69a086d8e30714a9e4530d031
+size 2128
diff --git a/crates/egui_kittest/tests/snapshots/test_masking.png b/crates/egui_kittest/tests/snapshots/test_masking.png
index a5fb50908..a397ceda6 100644
--- a/crates/egui_kittest/tests/snapshots/test_masking.png
+++ b/crates/egui_kittest/tests/snapshots/test_masking.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d94d4c3300d406fd1d93ddd90a9a46f99eac81a98a84f4d97a20fe4ef492e5d
-size 5674
+oid sha256:4216258893fae554f0ab8b3a76ef0905cacb62c70af47fa811ff6f3d99f9f3ab
+size 5619
diff --git a/crates/egui_kittest/tests/snapshots/test_scroll_initial.png b/crates/egui_kittest/tests/snapshots/test_scroll_initial.png
index 586dc00b7..e61dc99a0 100644
--- a/crates/egui_kittest/tests/snapshots/test_scroll_initial.png
+++ b/crates/egui_kittest/tests/snapshots/test_scroll_initial.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:460cb2e9c91d139334c797829fd82fa77d593e9e58531e57a6b649c7e8fad228
-size 7405
+oid sha256:eb8737af84c3d3b0c054b7e2a8bcb04685243d84cb13b72a1372dc40dbfd14fb
+size 7267
diff --git a/crates/egui_kittest/tests/snapshots/test_scroll_scrolled.png b/crates/egui_kittest/tests/snapshots/test_scroll_scrolled.png
index 64feb6323..0cc3d6d15 100644
--- a/crates/egui_kittest/tests/snapshots/test_scroll_scrolled.png
+++ b/crates/egui_kittest/tests/snapshots/test_scroll_scrolled.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:996985b155bd579cc4769d8cde5aa7e87c20ed909176da6b52dddeeb78a1cfba
-size 8290
+oid sha256:f1651bb1b9bbaa3c65ecd07c39c57527f4beb4c607581a5b2596a49dcf4c5db3
+size 7996
diff --git a/crates/egui_kittest/tests/snapshots/test_shrink.png b/crates/egui_kittest/tests/snapshots/test_shrink.png
index c25ae0367..40f2e284d 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:025942c144891b8862bf931385824e0484e60f4e7766f5d4401511c72ff20756
-size 2975
+oid sha256:21a92c29e27ef0fdec273ea2d94a2b3e74cdf380ec77f4783daeb008bd51db6d
+size 2767
diff --git a/crates/egui_kittest/tests/snapshots/test_tooltip_hidden.png b/crates/egui_kittest/tests/snapshots/test_tooltip_hidden.png
index c25ae0367..40f2e284d 100644
--- a/crates/egui_kittest/tests/snapshots/test_tooltip_hidden.png
+++ b/crates/egui_kittest/tests/snapshots/test_tooltip_hidden.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:025942c144891b8862bf931385824e0484e60f4e7766f5d4401511c72ff20756
-size 2975
+oid sha256:21a92c29e27ef0fdec273ea2d94a2b3e74cdf380ec77f4783daeb008bd51db6d
+size 2767
diff --git a/crates/egui_kittest/tests/snapshots/test_tooltip_shown.png b/crates/egui_kittest/tests/snapshots/test_tooltip_shown.png
index 4d00c924a..86cc5a717 100644
--- a/crates/egui_kittest/tests/snapshots/test_tooltip_shown.png
+++ b/crates/egui_kittest/tests/snapshots/test_tooltip_shown.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e269ede9c0784d00c153d51a13566d9c8f0d61ce11565997691fa63be06ec889
-size 5075
+oid sha256:f9ca5f8081d677b8bff47813c4eb94319ca03855e780aed834ecc2f3d905a22c
+size 4852
diff --git a/crates/emath/CHANGELOG.md b/crates/emath/CHANGELOG.md
index 334af345f..f559265c4 100644
--- a/crates/emath/CHANGELOG.md
+++ b/crates/emath/CHANGELOG.md
@@ -6,6 +6,10 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.33.3 - 2025-12-11
+Nothing new
+
+
 ## 0.33.2 - 2025-11-13
 * Fix edge cases in "smart aiming" in sliders [#7680](https://github.com/emilk/egui/pull/7680) by [@emilk](https://github.com/emilk)
 
diff --git a/crates/emath/src/lib.rs b/crates/emath/src/lib.rs
index 476b36d07..92e34620a 100644
--- a/crates/emath/src/lib.rs
+++ b/crates/emath/src/lib.rs
@@ -19,7 +19,7 @@
 #![cfg_attr(feature = "document-features", doc = document_features::document_features!())]
 //!
 
-#![allow(clippy::float_cmp)]
+#![expect(clippy::float_cmp)]
 
 use std::ops::{Add, Div, Mul, RangeInclusive, Sub};
 
@@ -233,7 +233,9 @@ pub fn format_with_decimals_in_range(value: f64, decimal_range: RangeInclusive<u
         for decimals in min_decimals..max_decimals {
             let text = format!("{value:.decimals$}");
             let epsilon = 16.0 * f32::EPSILON; // margin large enough to handle most peoples round-tripping needs
-            if almost_equal(text.parse::<f32>().unwrap(), value as f32, epsilon) {
+            if let Ok(parsed_value) = text.parse::<f32>()
+                && almost_equal(parsed_value, value as f32, epsilon)
+            {
                 // Enough precision to show the value accurately - good!
                 return text;
             }
diff --git a/crates/emath/src/numeric.rs b/crates/emath/src/numeric.rs
index 1fbddbc66..b4b6174e2 100644
--- a/crates/emath/src/numeric.rs
+++ b/crates/emath/src/numeric.rs
@@ -23,7 +23,7 @@ macro_rules! impl_numeric_float {
 
             #[inline(always)]
             fn to_f64(self) -> f64 {
-                #[allow(trivial_numeric_casts, clippy::allow_attributes)]
+                #[allow(clippy::allow_attributes, trivial_numeric_casts)]
                 {
                     self as f64
                 }
@@ -31,7 +31,7 @@ macro_rules! impl_numeric_float {
 
             #[inline(always)]
             fn from_f64(num: f64) -> Self {
-                #[allow(trivial_numeric_casts, clippy::allow_attributes)]
+                #[allow(clippy::allow_attributes, trivial_numeric_casts)]
                 {
                     num as Self
                 }
diff --git a/crates/epaint/CHANGELOG.md b/crates/epaint/CHANGELOG.md
index b23c454b4..dd6b4e2a5 100644
--- a/crates/epaint/CHANGELOG.md
+++ b/crates/epaint/CHANGELOG.md
@@ -5,6 +5,10 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.33.3 - 2025-12-11
+Nothing new
+
+
 ## 0.33.2 - 2025-11-13
 Nothing new
 
diff --git a/crates/epaint/Cargo.toml b/crates/epaint/Cargo.toml
index 3ac99a97f..77facdb3f 100644
--- a/crates/epaint/Cargo.toml
+++ b/crates/epaint/Cargo.toml
@@ -61,12 +61,14 @@ _override_unity = []
 emath.workspace = true
 ecolor.workspace = true
 
-ab_glyph.workspace = true
 ahash.workspace = true
 log.workspace = true
 nohash-hasher.workspace = true
 parking_lot.workspace = true # Using parking_lot over std::sync::Mutex gives 50% speedups in some real-world scenarios.
-profiling = { workspace = true }
+profiling.workspace = true
+self_cell.workspace = true
+skrifa.workspace = true
+vello_cpu.workspace = true
 
 #! ### Optional dependencies
 bytemuck = { workspace = true, optional = true, features = ["derive"] }
diff --git a/crates/epaint/benches/benchmark.rs b/crates/epaint/benches/benchmark.rs
index 7b97b20a2..8fbfc65ea 100644
--- a/crates/epaint/benches/benchmark.rs
+++ b/crates/epaint/benches/benchmark.rs
@@ -1,8 +1,8 @@
 use criterion::{Criterion, criterion_group, criterion_main};
 
 use epaint::{
-    AlphaFromCoverage, ClippedShape, Color32, Mesh, PathStroke, Pos2, Rect, Shape, Stroke,
-    TessellationOptions, Tessellator, TextureAtlas, Vec2, pos2, tessellator::Path,
+    ClippedShape, Color32, Mesh, PathStroke, Pos2, Rect, Shape, Stroke, TessellationOptions,
+    Tessellator, TextureAtlas, Vec2, pos2, tessellator::Path,
 };
 
 use std::hint::black_box;
@@ -68,7 +68,7 @@ fn tessellate_circles(c: &mut Criterion) {
         let pixels_per_point = 2.0;
         let options = TessellationOptions::default();
 
-        let atlas = TextureAtlas::new([4096, 256], AlphaFromCoverage::default());
+        let atlas = TextureAtlas::new([4096, 256], Default::default());
         let font_tex_size = atlas.size();
         let prepared_discs = atlas.prepared_discs();
 
diff --git a/crates/epaint/src/lib.rs b/crates/epaint/src/lib.rs
index 1bf0285bd..0042e0964 100644
--- a/crates/epaint/src/lib.rs
+++ b/crates/epaint/src/lib.rs
@@ -20,8 +20,8 @@
 #![cfg_attr(feature = "document-features", doc = document_features::document_features!())]
 //!
 
-#![allow(clippy::float_cmp)]
-#![allow(clippy::manual_range_contains)]
+#![expect(clippy::float_cmp)]
+#![expect(clippy::manual_range_contains)]
 
 mod brush;
 pub mod color;
@@ -62,7 +62,7 @@ pub use self::{
     stats::PaintStats,
     stroke::{PathStroke, Stroke, StrokeKind},
     tessellator::{TessellationOptions, Tessellator},
-    text::{FontFamily, FontId, Fonts, FontsView, Galley},
+    text::{FontFamily, FontId, Fonts, FontsView, Galley, TextOptions},
     texture_atlas::TextureAtlas,
     texture_handle::TextureHandle,
     textures::TextureManager,
diff --git a/crates/epaint/src/margin.rs b/crates/epaint/src/margin.rs
index e6f6d2287..0e2063efe 100644
--- a/crates/epaint/src/margin.rs
+++ b/crates/epaint/src/margin.rs
@@ -186,7 +186,7 @@ impl std::ops::Div<f32> for Margin {
 
     #[inline]
     fn div(self, v: f32) -> Self {
-        #![allow(clippy::suspicious_arithmetic_impl)]
+        #![expect(clippy::suspicious_arithmetic_impl)]
         self * v.recip()
     }
 }
diff --git a/crates/epaint/src/mesh.rs b/crates/epaint/src/mesh.rs
index 8a0a39495..5343fdace 100644
--- a/crates/epaint/src/mesh.rs
+++ b/crates/epaint/src/mesh.rs
@@ -189,7 +189,7 @@ impl Mesh {
     /// Rectangle with a texture and color.
     #[inline(always)]
     pub fn add_rect_with_uv(&mut self, rect: Rect, uv: Rect, color: Color32) {
-        #![allow(clippy::identity_op)]
+        #![expect(clippy::identity_op)]
         let idx = self.vertices.len() as u32;
         self.indices
             .extend_from_slice(&[idx + 0, idx + 1, idx + 2, idx + 2, idx + 1, idx + 3]);
@@ -281,7 +281,12 @@ impl Mesh {
             let mesh = Mesh16 {
                 indices: self.indices[span_start..index_cursor]
                     .iter()
-                    .map(|vi| u16::try_from(vi - min_vindex).unwrap())
+                    .map(|vi| {
+                        #[expect(clippy::unwrap_used)]
+                        {
+                            u16::try_from(vi - min_vindex).unwrap()
+                        }
+                    })
                     .collect(),
                 vertices: self.vertices[(min_vindex as usize)..=(max_vindex as usize)].to_vec(),
                 texture_id: self.texture_id,
diff --git a/crates/epaint/src/mutex.rs b/crates/epaint/src/mutex.rs
index 2f264f58c..272046823 100644
--- a/crates/epaint/src/mutex.rs
+++ b/crates/epaint/src/mutex.rs
@@ -125,7 +125,7 @@ where
 
 #[cfg(test)]
 mod tests {
-    #![allow(clippy::disallowed_methods)] // Ok for tests
+    #![expect(clippy::disallowed_methods)] // Ok for tests
 
     use crate::mutex::Mutex;
     use std::time::Duration;
@@ -158,7 +158,7 @@ mod tests {
 #[cfg(not(target_arch = "wasm32"))]
 #[cfg(test)]
 mod tests_rwlock {
-    #![allow(clippy::disallowed_methods)] // Ok for tests
+    #![expect(clippy::disallowed_methods)] // Ok for tests
 
     use crate::mutex::RwLock;
     use std::time::Duration;
diff --git a/crates/epaint/src/shape_transform.rs b/crates/epaint/src/shape_transform.rs
index 4b68d5964..8fce01f64 100644
--- a/crates/epaint/src/shape_transform.rs
+++ b/crates/epaint/src/shape_transform.rs
@@ -10,7 +10,7 @@ pub fn adjust_colors(
     shape: &mut Shape,
     adjust_color: impl Fn(&mut Color32) + Send + Sync + Copy + 'static,
 ) {
-    #![allow(clippy::match_same_arms)]
+    #![expect(clippy::match_same_arms)]
     match shape {
         Shape::Noop => {}
 
@@ -123,7 +123,7 @@ fn adjust_color_mode(
     match color_mode {
         color::ColorMode::Solid(color) => adjust_color(color),
         color::ColorMode::UV(callback) => {
-            let callback = callback.clone();
+            let callback = Arc::clone(callback);
             *color_mode = color::ColorMode::UV(Arc::new(Box::new(move |rect, pos| {
                 let mut color = callback(rect, pos);
                 adjust_color(&mut color);
diff --git a/crates/epaint/src/shapes/bezier_shape.rs b/crates/epaint/src/shapes/bezier_shape.rs
index 20f7a4e18..b20c56691 100644
--- a/crates/epaint/src/shapes/bezier_shape.rs
+++ b/crates/epaint/src/shapes/bezier_shape.rs
@@ -1,5 +1,4 @@
-#![allow(clippy::many_single_char_names)]
-#![allow(clippy::wrong_self_convention)] // False positives
+#![expect(clippy::many_single_char_names)]
 
 use std::ops::Range;
 
@@ -298,7 +297,8 @@ impl CubicBezierShape {
     /// the number of points is determined by the tolerance.
     /// the points may not be evenly distributed in the range [0.0,1.0] (t value)
     pub fn flatten(&self, tolerance: Option<f32>) -> Vec<Pos2> {
-        let tolerance = tolerance.unwrap_or((self.points[0].x - self.points[3].x).abs() * 0.001);
+        let tolerance =
+            tolerance.unwrap_or_else(|| (self.points[0].x - self.points[3].x).abs() * 0.001);
         let mut result = vec![self.points[0]];
         self.for_each_flattened_with_t(tolerance, &mut |p, _t| {
             result.push(p);
@@ -313,7 +313,8 @@ impl CubicBezierShape {
     /// The result will be a vec of vec of Pos2. it will store two closed aren in different vec.
     /// The epsilon is used to compare a float value.
     pub fn flatten_closed(&self, tolerance: Option<f32>, epsilon: Option<f32>) -> Vec<Vec<Pos2>> {
-        let tolerance = tolerance.unwrap_or((self.points[0].x - self.points[3].x).abs() * 0.001);
+        let tolerance =
+            tolerance.unwrap_or_else(|| (self.points[0].x - self.points[3].x).abs() * 0.001);
         let epsilon = epsilon.unwrap_or(1.0e-5);
         let mut result = Vec::new();
         let mut first_half = Vec::new();
@@ -519,7 +520,8 @@ impl QuadraticBezierShape {
     /// the number of points is determined by the tolerance.
     /// the points may not be evenly distributed in the range [0.0,1.0] (t value)
     pub fn flatten(&self, tolerance: Option<f32>) -> Vec<Pos2> {
-        let tolerance = tolerance.unwrap_or((self.points[0].x - self.points[2].x).abs() * 0.001);
+        let tolerance =
+            tolerance.unwrap_or_else(|| (self.points[0].x - self.points[2].x).abs() * 0.001);
         let mut result = vec![self.points[0]];
         self.for_each_flattened_with_t(tolerance, &mut |p, _t| {
             result.push(p);
diff --git a/crates/epaint/src/shapes/text_shape.rs b/crates/epaint/src/shapes/text_shape.rs
index 92a0a0514..3e177db07 100644
--- a/crates/epaint/src/shapes/text_shape.rs
+++ b/crates/epaint/src/shapes/text_shape.rs
@@ -185,11 +185,7 @@ mod tests {
 
     #[test]
     fn text_bounding_box_under_rotation() {
-        let mut fonts = Fonts::new(
-            1024,
-            AlphaFromCoverage::default(),
-            FontDefinitions::default(),
-        );
+        let mut fonts = Fonts::new(TextOptions::default(), FontDefinitions::default());
         let font = FontId::monospace(12.0);
 
         let mut t = crate::Shape::text(
diff --git a/crates/epaint/src/stroke.rs b/crates/epaint/src/stroke.rs
index 473376f40..4adb1f309 100644
--- a/crates/epaint/src/stroke.rs
+++ b/crates/epaint/src/stroke.rs
@@ -1,5 +1,3 @@
-#![allow(clippy::derived_hash_with_manual_eq)] // We need to impl Hash for f32, but we don't implement Eq, which is fine
-
 use std::{fmt::Debug, sync::Arc};
 
 use emath::GuiRounding as _;
diff --git a/crates/epaint/src/tessellator.rs b/crates/epaint/src/tessellator.rs
index 0c4da74d1..9529765ac 100644
--- a/crates/epaint/src/tessellator.rs
+++ b/crates/epaint/src/tessellator.rs
@@ -3,7 +3,7 @@
 //! This module converts lines, circles, text and more represented by [`Shape`]
 //! into textured triangles represented by [`Mesh`].
 
-#![allow(clippy::identity_op)]
+#![expect(clippy::identity_op)]
 
 use emath::{GuiRounding as _, NumExt as _, Pos2, Rect, Rot2, Vec2, pos2, remap, vec2};
 
@@ -1403,6 +1403,7 @@ impl Tessellator {
             });
         }
 
+        #[expect(clippy::unwrap_used)] // it's never empty
         let out = out_primitives.last_mut().unwrap();
 
         if let Primitive::Mesh(out_mesh) = &mut out.primitive {
@@ -2206,7 +2207,7 @@ impl Tessellator {
     ///
     /// ## Returns
     /// A list of clip rectangles with matching [`Mesh`].
-    #[allow(unused_mut, clippy::allow_attributes)]
+    #[allow(clippy::allow_attributes, unused_mut)]
     pub fn tessellate_shapes(&mut self, mut shapes: Vec<ClippedShape>) -> Vec<ClippedPrimitive> {
         profiling::function_scope!();
 
diff --git a/crates/epaint/src/text/font.rs b/crates/epaint/src/text/font.rs
index 4584c3457..80fb1245b 100644
--- a/crates/epaint/src/text/font.rs
+++ b/crates/epaint/src/text/font.rs
@@ -1,13 +1,19 @@
-use std::collections::BTreeMap;
+#![expect(clippy::mem_forget)]
 
-use ab_glyph::{Font as _, OutlinedGlyph, PxScale};
 use emath::{GuiRounding as _, OrderedFloat, Vec2, vec2};
+use self_cell::self_cell;
+use skrifa::{
+    MetadataProvider as _,
+    raw::{TableProvider as _, tables::kern::SubtableKind},
+};
+use std::collections::BTreeMap;
+use vello_cpu::{color, kurbo};
 
 use crate::{
-    TextureAtlas,
+    TextOptions, TextureAtlas,
     text::{
         FontTweak,
-        fonts::{CachedFamily, FontFaceKey},
+        fonts::{Blob, CachedFamily, FontFaceKey},
     },
 };
 
@@ -43,9 +49,9 @@ pub struct GlyphInfo {
     /// Doesn't need to be unique.
     ///
     /// Is `None` for a special "invisible" glyph.
-    pub(crate) id: Option<ab_glyph::GlyphId>,
+    pub(crate) id: Option<skrifa::GlyphId>,
 
-    /// In [`ab_glyph`]s "unscaled" coordinate system.
+    /// In [`skrifa`]s "unscaled" coordinate system.
     pub advance_width_unscaled: OrderedFloat<f32>,
 }
 
@@ -123,8 +129,8 @@ pub struct GlyphAllocation {
     /// Used for pair-kerning.
     ///
     /// Doesn't need to be unique.
-    /// Use `ab_glyph::GlyphId(0)` if you just want to have an id, and don't care.
-    pub(crate) id: ab_glyph::GlyphId,
+    /// Use [`skrifa::GlyphId::NOTDEF`] if you just want to have an id, and don't care.
+    pub(crate) id: skrifa::GlyphId,
 
     /// Unit: screen pixels.
     pub advance_width_px: f32,
@@ -139,7 +145,7 @@ struct GlyphCacheKey(u64);
 impl nohash_hasher::IsEnabled for GlyphCacheKey {}
 
 impl GlyphCacheKey {
-    fn new(glyph_id: ab_glyph::GlyphId, metrics: &ScaledMetrics, bin: SubpixelBin) -> Self {
+    fn new(glyph_id: skrifa::GlyphId, metrics: &ScaledMetrics, bin: SubpixelBin) -> Self {
         let ScaledMetrics {
             pixels_per_point,
             px_scale_factor,
@@ -164,41 +170,282 @@ impl GlyphCacheKey {
 
 // ----------------------------------------------------------------------------
 
+struct DependentFontData<'a> {
+    skrifa: skrifa::FontRef<'a>,
+    charmap: skrifa::charmap::Charmap<'a>,
+    outline_glyphs: skrifa::outline::OutlineGlyphCollection<'a>,
+    metrics: skrifa::metrics::Metrics,
+    glyph_metrics: skrifa::metrics::GlyphMetrics<'a>,
+    hinting_instance: Option<skrifa::outline::HintingInstance>,
+}
+
+self_cell! {
+    struct FontCell {
+        owner: Blob,
+
+        #[covariant]
+        dependent: DependentFontData,
+    }
+}
+
+impl FontCell {
+    fn px_scale_factor(&self, scale: f32) -> f32 {
+        let units_per_em = self.borrow_dependent().metrics.units_per_em as f32;
+        scale / units_per_em
+    }
+
+    fn allocate_glyph_uncached(
+        &mut self,
+        atlas: &mut TextureAtlas,
+        metrics: &ScaledMetrics,
+        glyph_info: &GlyphInfo,
+        bin: SubpixelBin,
+        location: &skrifa::instance::Location,
+    ) -> Option<GlyphAllocation> {
+        let glyph_id = glyph_info.id?;
+
+        debug_assert!(
+            glyph_id != skrifa::GlyphId::NOTDEF,
+            "Can't allocate glyph for id 0"
+        );
+
+        let mut path = kurbo::BezPath::new();
+        let mut pen = VelloPen {
+            path: &mut path,
+            x_offset: bin.as_float() as f64,
+        };
+
+        self.with_dependent_mut(|_, font_data| {
+            let outline = font_data.outline_glyphs.get(glyph_id)?;
+
+            if let Some(hinting_instance) = &mut font_data.hinting_instance {
+                let size = skrifa::instance::Size::new(metrics.scale);
+                if hinting_instance.size() != size {
+                    hinting_instance
+                        .reconfigure(
+                            &font_data.outline_glyphs,
+                            size,
+                            location,
+                            skrifa::outline::Target::Smooth {
+                                mode: skrifa::outline::SmoothMode::Normal,
+                                symmetric_rendering: true,
+                                preserve_linear_metrics: true,
+                            },
+                        )
+                        .ok()?;
+                }
+                let draw_settings = skrifa::outline::DrawSettings::hinted(hinting_instance, false);
+                outline.draw(draw_settings, &mut pen).ok()?;
+            } else {
+                let draw_settings = skrifa::outline::DrawSettings::unhinted(
+                    skrifa::instance::Size::new(metrics.scale),
+                    location,
+                );
+                outline.draw(draw_settings, &mut pen).ok()?;
+            }
+
+            Some(())
+        })?;
+
+        let bounds = path.control_box().expand();
+        let width = bounds.width() as u16;
+        let height = bounds.height() as u16;
+
+        let mut ctx = vello_cpu::RenderContext::new(width, height);
+        ctx.set_transform(kurbo::Affine::translate((-bounds.x0, -bounds.y0)));
+        ctx.set_paint(color::OpaqueColor::<color::Srgb>::WHITE);
+        ctx.fill_path(&path);
+        let mut dest = vello_cpu::Pixmap::new(width, height);
+        ctx.render_to_pixmap(&mut dest);
+        let uv_rect = if width == 0 || height == 0 {
+            UvRect::default()
+        } else {
+            let glyph_pos = {
+                let alpha_from_coverage = atlas.options().alpha_from_coverage;
+                let (glyph_pos, image) = atlas.allocate((width as usize, height as usize));
+                let pixels = dest.data_as_u8_slice();
+                for y in 0..height as usize {
+                    for x in 0..width as usize {
+                        image[(x + glyph_pos.0, y + glyph_pos.1)] = alpha_from_coverage
+                            .color_from_coverage(
+                                pixels[((y * width as usize) + x) * 4 + 3] as f32 / 255.0,
+                            );
+                    }
+                }
+                glyph_pos
+            };
+            let offset_in_pixels = vec2(bounds.x0 as f32, bounds.y0 as f32);
+            let offset =
+                offset_in_pixels / metrics.pixels_per_point + metrics.y_offset_in_points * Vec2::Y;
+            UvRect {
+                offset,
+                size: vec2(width as f32, height as f32) / metrics.pixels_per_point,
+                min: [glyph_pos.0 as u16, glyph_pos.1 as u16],
+                max: [
+                    (glyph_pos.0 + width as usize) as u16,
+                    (glyph_pos.1 + height as usize) as u16,
+                ],
+            }
+        };
+
+        Some(GlyphAllocation {
+            id: glyph_id,
+            advance_width_px: glyph_info.advance_width_unscaled.0 * metrics.px_scale_factor,
+            uv_rect,
+        })
+    }
+}
+
+struct VelloPen<'a> {
+    path: &'a mut kurbo::BezPath,
+    x_offset: f64,
+}
+
+impl skrifa::outline::OutlinePen for VelloPen<'_> {
+    fn move_to(&mut self, x: f32, y: f32) {
+        self.path.move_to((x as f64 + self.x_offset, -y as f64));
+    }
+
+    fn line_to(&mut self, x: f32, y: f32) {
+        self.path.line_to((x as f64 + self.x_offset, -y as f64));
+    }
+
+    fn quad_to(&mut self, cx0: f32, cy0: f32, x: f32, y: f32) {
+        self.path.quad_to(
+            (cx0 as f64 + self.x_offset, -cy0 as f64),
+            (x as f64 + self.x_offset, -y as f64),
+        );
+    }
+
+    fn curve_to(&mut self, cx0: f32, cy0: f32, cx1: f32, cy1: f32, x: f32, y: f32) {
+        self.path.curve_to(
+            (cx0 as f64 + self.x_offset, -cy0 as f64),
+            (cx1 as f64 + self.x_offset, -cy1 as f64),
+            (x as f64 + self.x_offset, -y as f64),
+        );
+    }
+
+    fn close(&mut self) {
+        self.path.close_path();
+    }
+}
+
 /// A specific font face.
 /// The interface uses points as the unit for everything.
-pub struct FontImpl {
+pub struct FontFace {
     name: String,
-    ab_glyph_font: ab_glyph::FontArc,
+    font: FontCell,
     tweak: FontTweak,
+
+    /// The font weight (100-900) if available from the font file.
+    weight: Option<u16>,
+
+    /// Variable font location (for weight axis, etc.)
+    location: skrifa::instance::Location,
     glyph_info_cache: ahash::HashMap<char, GlyphInfo>,
     glyph_alloc_cache: ahash::HashMap<GlyphCacheKey, GlyphAllocation>,
 }
 
-trait FontExt {
-    fn px_scale_factor(&self, scale: f32) -> f32;
-}
+impl FontFace {
+    pub fn new(
+        options: TextOptions,
+        name: String,
+        font_data: Blob,
+        index: u32,
+        tweak: FontTweak,
+        preferred_weight: Option<u16>,
+    ) -> Result<Self, Box<dyn std::error::Error>> {
+        let font = FontCell::try_new(font_data, |font_data| {
+            let skrifa_font =
+                skrifa::FontRef::from_index(AsRef::<[u8]>::as_ref(font_data.as_ref()), index)?;
 
-impl<T> FontExt for T
-where
-    T: ab_glyph::Font,
-{
-    fn px_scale_factor(&self, scale: f32) -> f32 {
-        let units_per_em = self.units_per_em().unwrap_or_else(|| {
-            panic!("The font unit size exceeds the expected range (16..=16384)")
+            let charmap = skrifa_font.charmap();
+            let glyphs = skrifa_font.outline_glyphs();
+
+            // Note: We use default location here during initialization because
+            // the actual weight will be applied via the stored location during rendering.
+            // The metrics won't be significantly different at this unscaled size.
+            let metrics = skrifa_font.metrics(
+                skrifa::instance::Size::unscaled(),
+                skrifa::instance::LocationRef::default(),
+            );
+            let glyph_metrics = skrifa_font.glyph_metrics(
+                skrifa::instance::Size::unscaled(),
+                skrifa::instance::LocationRef::default(),
+            );
+
+            let hinting_enabled = tweak.hinting_override.unwrap_or(options.font_hinting);
+            let hinting_instance = hinting_enabled
+                .then(|| {
+                    // It doesn't really matter what we put here for options. Since the size is `unscaled()`, we will
+                    // always reconfigure this hinting instance with the real options when rendering for the first time.
+                    skrifa::outline::HintingInstance::new(
+                        &glyphs,
+                        skrifa::instance::Size::unscaled(),
+                        skrifa::instance::LocationRef::default(),
+                        skrifa::outline::Target::default(),
+                    )
+                    .ok()
+                })
+                .flatten();
+
+            Ok::<DependentFontData<'_>, Box<dyn std::error::Error>>(DependentFontData {
+                skrifa: skrifa_font,
+                charmap,
+                outline_glyphs: glyphs,
+                metrics,
+                glyph_metrics,
+                hinting_instance,
+            })
+        })?;
+
+        // Use preferred_weight if provided, otherwise try to read from the OS/2 table or fvar default
+        let weight = preferred_weight.or_else(|| {
+            // First try OS/2 table
+            if let Some(w) = font
+                .borrow_dependent()
+                .skrifa
+                .os2()
+                .ok()
+                .map(|os2| os2.us_weight_class())
+            {
+                return Some(w);
+            }
+            // If no OS/2 or preferred_weight, try to get default from variable font's fvar table
+            font.borrow_dependent()
+                .skrifa
+                .axes()
+                .iter()
+                .find(|axis| axis.tag() == skrifa::raw::types::Tag::new(b"wght"))
+                .map(|axis| axis.default_value() as u16)
         });
-        scale / units_per_em
-    }
-}
 
-impl FontImpl {
-    pub fn new(name: String, ab_glyph_font: ab_glyph::FontArc, tweak: FontTweak) -> Self {
-        Self {
+        // Create location for variable font with weight axis
+        // If weight is provided (either from preferred_weight, OS/2, or fvar default), use it
+        // Otherwise fall back to Location::default() which uses all axis defaults
+        let location = if let Some(w) = weight {
+            font.borrow_dependent()
+                .skrifa
+                .axes()
+                .location([("wght", w as f32)])
+        } else {
+            skrifa::instance::Location::default()
+        };
+
+        Ok(Self {
             name,
-            ab_glyph_font,
+            font,
             tweak,
+            weight,
+            location,
             glyph_info_cache: Default::default(),
             glyph_alloc_cache: Default::default(),
-        }
+        })
+    }
+
+    /// Get the font weight (100-900) if available from the font file.
+    pub fn weight(&self) -> Option<u16> {
+        self.weight
     }
 
     /// Code points that will always be replaced by the replacement character.
@@ -223,10 +470,11 @@ impl FontImpl {
 
     /// An un-ordered iterator over all supported characters.
     fn characters(&self) -> impl Iterator<Item = char> + '_ {
-        self.ab_glyph_font
-            .codepoint_ids()
-            .map(|(_, chr)| chr)
-            .filter(|&chr| !self.ignore_character(chr))
+        self.font
+            .borrow_dependent()
+            .charmap
+            .mappings()
+            .filter_map(|(chr, _)| char::from_u32(chr).filter(|c| !self.ignore_character(*c)))
     }
 
     /// `\n` will result in `None`
@@ -258,7 +506,7 @@ impl FontImpl {
             // https://en.wikipedia.org/wiki/Thin_space
 
             if let Some(space) = self.glyph_info(' ') {
-                let em = self.ab_glyph_font.units_per_em().unwrap_or(1.0);
+                let em = self.font.borrow_dependent().metrics.units_per_em as f32;
                 let advance_width = f32::min(em / 6.0, space.advance_width_unscaled.0 * 0.5); // TODO(emilk): make configurable
                 let glyph_info = GlyphInfo {
                     advance_width_unscaled: advance_width.into(),
@@ -275,52 +523,68 @@ impl FontImpl {
             return Some(glyph_info);
         }
 
-        // Add new character:
-        let glyph_id = self.ab_glyph_font.glyph_id(c);
+        let font_data = self.font.borrow_dependent();
 
-        if glyph_id.0 == 0 {
-            None // unsupported character
-        } else {
-            let glyph_info = GlyphInfo {
-                id: Some(glyph_id),
-                advance_width_unscaled: self.ab_glyph_font.h_advance_unscaled(glyph_id).into(),
-            };
-            self.glyph_info_cache.insert(c, glyph_info);
-            Some(glyph_info)
-        }
+        // Add new character:
+        let glyph_id = font_data
+            .charmap
+            .map(c)
+            .filter(|id| *id != skrifa::GlyphId::NOTDEF)?;
+
+        let glyph_info = GlyphInfo {
+            id: Some(glyph_id),
+            advance_width_unscaled: font_data
+                .glyph_metrics
+                .advance_width(glyph_id)
+                .unwrap_or_default()
+                .into(),
+        };
+        self.glyph_info_cache.insert(c, glyph_info);
+        Some(glyph_info)
     }
 
     #[inline]
     pub(super) fn pair_kerning_pixels(
         &self,
         metrics: &ScaledMetrics,
-        last_glyph_id: ab_glyph::GlyphId,
-        glyph_id: ab_glyph::GlyphId,
+        last_glyph_id: skrifa::GlyphId,
+        glyph_id: skrifa::GlyphId,
     ) -> f32 {
-        self.ab_glyph_font.kern_unscaled(last_glyph_id, glyph_id) * metrics.px_scale_factor
+        let skrifa_font = &self.font.borrow_dependent().skrifa;
+        let Ok(kern) = skrifa_font.kern() else {
+            return 0.0;
+        };
+        kern.subtables()
+            .find_map(|st| match st.ok()?.kind().ok()? {
+                SubtableKind::Format0(table_ref) => table_ref.kerning(last_glyph_id, glyph_id),
+                SubtableKind::Format1(_) => None,
+                SubtableKind::Format2(subtable2) => subtable2.kerning(last_glyph_id, glyph_id),
+                SubtableKind::Format3(table_ref) => table_ref.kerning(last_glyph_id, glyph_id),
+            })
+            .unwrap_or_default() as f32
+            * metrics.px_scale_factor
     }
 
     #[inline]
     pub fn pair_kerning(
         &self,
         metrics: &ScaledMetrics,
-        last_glyph_id: ab_glyph::GlyphId,
-        glyph_id: ab_glyph::GlyphId,
+        last_glyph_id: skrifa::GlyphId,
+        glyph_id: skrifa::GlyphId,
     ) -> f32 {
         self.pair_kerning_pixels(metrics, last_glyph_id, glyph_id) / metrics.pixels_per_point
     }
 
     #[inline(always)]
     pub fn scaled_metrics(&self, pixels_per_point: f32, font_size: f32) -> ScaledMetrics {
-        let pt_scale_factor = self
-            .ab_glyph_font
-            .px_scale_factor(font_size * self.tweak.scale);
-        let ascent = (self.ab_glyph_font.ascent_unscaled() * pt_scale_factor).round_ui();
-        let descent = (self.ab_glyph_font.descent_unscaled() * pt_scale_factor).round_ui();
-        let line_gap = (self.ab_glyph_font.line_gap_unscaled() * pt_scale_factor).round_ui();
+        let pt_scale_factor = self.font.px_scale_factor(font_size * self.tweak.scale);
+        let font_data = self.font.borrow_dependent();
+        let ascent = (font_data.metrics.ascent * pt_scale_factor).round_ui();
+        let descent = (font_data.metrics.descent * pt_scale_factor).round_ui();
+        let line_gap = (font_data.metrics.leading * pt_scale_factor).round_ui();
 
         let scale = font_size * self.tweak.scale * pixels_per_point;
-        let px_scale_factor = self.ab_glyph_font.px_scale_factor(scale);
+        let px_scale_factor = self.font.px_scale_factor(scale);
 
         let y_offset_in_points = ((font_size * self.tweak.scale * self.tweak.y_offset_factor)
             + self.tweak.y_offset)
@@ -329,6 +593,7 @@ impl FontImpl {
         ScaledMetrics {
             pixels_per_point,
             px_scale_factor,
+            scale,
             y_offset_in_points,
             ascent,
             row_height: ascent - descent + line_gap,
@@ -370,77 +635,20 @@ impl FontImpl {
             std::collections::hash_map::Entry::Vacant(entry) => entry,
         };
 
-        debug_assert!(glyph_id.0 != 0, "Can't allocate glyph for id 0");
+        let allocation = self
+            .font
+            .allocate_glyph_uncached(atlas, metrics, &glyph_info, bin, &self.location)
+            .unwrap_or_default();
 
-        let uv_rect = self.ab_glyph_font.outline(glyph_id).map(|outline| {
-            let glyph = ab_glyph::Glyph {
-                id: glyph_id,
-                // We bypass ab-glyph's scaling method because it uses the wrong scale
-                // (https://github.com/alexheretic/ab-glyph/issues/15), and this field is never accessed when
-                // rasterizing. We can just put anything here.
-                scale: PxScale::from(0.0),
-                position: ab_glyph::Point {
-                    x: bin.as_float(),
-                    y: 0.0,
-                },
-            };
-            let outlined = OutlinedGlyph::new(
-                glyph,
-                outline,
-                ab_glyph::PxScaleFactor {
-                    horizontal: metrics.px_scale_factor,
-                    vertical: metrics.px_scale_factor,
-                },
-            );
-            let bb = outlined.px_bounds();
-            let glyph_width = bb.width() as usize;
-            let glyph_height = bb.height() as usize;
-            if glyph_width == 0 || glyph_height == 0 {
-                UvRect::default()
-            } else {
-                let glyph_pos = {
-                    let text_alpha_from_coverage = atlas.text_alpha_from_coverage;
-                    let (glyph_pos, image) = atlas.allocate((glyph_width, glyph_height));
-                    outlined.draw(|x, y, v| {
-                        if 0.0 < v {
-                            let px = glyph_pos.0 + x as usize;
-                            let py = glyph_pos.1 + y as usize;
-                            image[(px, py)] = text_alpha_from_coverage.color_from_coverage(v);
-                        }
-                    });
-                    glyph_pos
-                };
-
-                let offset_in_pixels = vec2(bb.min.x, bb.min.y);
-                let offset = offset_in_pixels / metrics.pixels_per_point
-                    + metrics.y_offset_in_points * Vec2::Y;
-                UvRect {
-                    offset,
-                    size: vec2(glyph_width as f32, glyph_height as f32) / metrics.pixels_per_point,
-                    min: [glyph_pos.0 as u16, glyph_pos.1 as u16],
-                    max: [
-                        (glyph_pos.0 + glyph_width) as u16,
-                        (glyph_pos.1 + glyph_height) as u16,
-                    ],
-                }
-            }
-        });
-        let uv_rect = uv_rect.unwrap_or_default();
-
-        let allocation = GlyphAllocation {
-            id: glyph_id,
-            advance_width_px,
-            uv_rect,
-        };
         entry.insert(allocation);
         (allocation, h_pos_round)
     }
 }
 
 // TODO(emilk): rename?
-/// Wrapper over multiple [`FontImpl`] (e.g. a primary + fallbacks for emojis)
+/// Wrapper over multiple [`FontFace`] (e.g. a primary + fallbacks for emojis)
 pub struct Font<'a> {
-    pub(super) fonts_by_id: &'a mut nohash_hasher::IntMap<FontFaceKey, FontImpl>,
+    pub(super) fonts_by_id: &'a mut nohash_hasher::IntMap<FontFaceKey, FontFace>,
     pub(super) cached_family: &'a mut CachedFamily,
     pub(super) atlas: &'a mut TextureAtlas,
 }
@@ -471,7 +679,7 @@ impl Font<'_> {
             .fonts
             .first()
             .and_then(|key| self.fonts_by_id.get(key))
-            .map(|font_impl| font_impl.scaled_metrics(pixels_per_point, font_size))
+            .map(|font_face| font_face.scaled_metrics(pixels_per_point, font_size))
             .unwrap_or_default()
     }
 
@@ -479,7 +687,7 @@ impl Font<'_> {
     pub fn glyph_width(&mut self, c: char, font_size: f32) -> f32 {
         let (key, glyph_info) = self.glyph_info(c);
         if let Some(font) = &self.fonts_by_id.get(&key) {
-            glyph_info.advance_width_unscaled.0 * font.ab_glyph_font.px_scale_factor(font_size)
+            glyph_info.advance_width_unscaled.0 * font.font.px_scale_factor(font_size)
         } else {
             0.0
         }
@@ -524,7 +732,10 @@ pub struct ScaledMetrics {
     /// Translates "unscaled" units to physical (screen) pixels.
     pub px_scale_factor: f32,
 
-    /// Vertical offset, in UI points.
+    /// Absolute scale in screen pixels, for skrifa.
+    pub scale: f32,
+
+    /// Vertical offset, in UI points (not screen-space).
     pub y_offset_in_points: f32,
 
     /// This is the distance from the top to the baseline.
@@ -540,7 +751,7 @@ pub struct ScaledMetrics {
 
 /// Code points that will always be invisible (zero width).
 ///
-/// See also [`FontImpl::ignore_character`].
+/// See also [`FontFace::ignore_character`].
 #[inline]
 fn invisible_char(c: char) -> bool {
     if c == '\r' {
diff --git a/crates/epaint/src/text/fonts.rs b/crates/epaint/src/text/fonts.rs
index 6bc7ccf8f..8ca78064d 100644
--- a/crates/epaint/src/text/fonts.rs
+++ b/crates/epaint/src/text/fonts.rs
@@ -1,4 +1,5 @@
 use std::{
+    borrow::Cow,
     collections::BTreeMap,
     sync::{
         Arc,
@@ -7,10 +8,10 @@ use std::{
 };
 
 use crate::{
-    AlphaFromCoverage, TextureAtlas,
+    TextureAtlas,
     text::{
-        Galley, LayoutJob, LayoutSection,
-        font::{Font, FontImpl, GlyphInfo},
+        Galley, LayoutJob, LayoutSection, TextOptions,
+        font::{Font, FontFace, GlyphInfo},
     },
 };
 use emath::{NumExt as _, OrderedFloat};
@@ -116,7 +117,7 @@ impl std::fmt::Display for FontFamily {
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct FontData {
     /// The content of a `.ttf` or `.otf` file.
-    pub font: std::borrow::Cow<'static, [u8]>,
+    pub font: Cow<'static, [u8]>,
 
     /// Which font face in the file to use.
     /// When in doubt, use `0`.
@@ -124,28 +125,66 @@ pub struct FontData {
 
     /// Extra scale and vertical tweak to apply to all text of this font.
     pub tweak: FontTweak,
+
+    /// The font weight (100-900), if available.
+    /// Standard values: 100 (Thin), 200 (Extra Light), 300 (Light), 400 (Regular),
+    /// 500 (Medium), 600 (Semi Bold), 700 (Bold), 800 (Extra Bold), 900 (Black).
+    /// `None` if the weight could not be determined.
+    pub weight: Option<u16>,
 }
 
 impl FontData {
     pub fn from_static(font: &'static [u8]) -> Self {
         Self {
-            font: std::borrow::Cow::Borrowed(font),
+            font: Cow::Borrowed(font),
             index: 0,
             tweak: Default::default(),
+            weight: None,
         }
     }
 
     pub fn from_owned(font: Vec<u8>) -> Self {
         Self {
-            font: std::borrow::Cow::Owned(font),
+            font: Cow::Owned(font),
             index: 0,
             tweak: Default::default(),
+            weight: None,
         }
     }
 
     pub fn tweak(self, tweak: FontTweak) -> Self {
         Self { tweak, ..self }
     }
+
+    /// Set the font weight (100-900).
+    ///
+    /// This is typically read automatically from the font file when loaded,
+    /// but can be overridden manually if needed.
+    ///
+    /// Standard weight values:
+    /// - 100: Thin
+    /// - 200: Extra Light
+    /// - 300: Light
+    /// - 400: Regular/Normal
+    /// - 500: Medium
+    /// - 600: Semi Bold
+    /// - 700: Bold
+    /// - 800: Extra Bold
+    /// - 900: Black
+    ///
+    /// # Example
+    /// ```
+    /// # use epaint::text::FontData;
+    /// let font_data = FontData::from_static(include_bytes!("../../../epaint_default_fonts/fonts/Ubuntu-Light.ttf"))
+    ///     .weight(300); // Override to Light weight
+    /// assert_eq!(font_data.weight, Some(300));
+    /// ```
+    pub fn weight(self, weight: u16) -> Self {
+        Self {
+            weight: Some(weight),
+            ..self
+        }
+    }
 }
 
 impl AsRef<[u8]> for FontData {
@@ -184,6 +223,11 @@ pub struct FontTweak {
     ///
     /// Example value: `2.0`.
     pub y_offset: f32,
+
+    /// Override the global font hinting setting for this specific font.
+    ///
+    /// `None` means use the global setting.
+    pub hinting_override: Option<bool>,
 }
 
 impl Default for FontTweak {
@@ -192,24 +236,20 @@ impl Default for FontTweak {
             scale: 1.0,
             y_offset_factor: 0.0,
             y_offset: 0.0,
+            hinting_override: None,
         }
     }
 }
 
 // ----------------------------------------------------------------------------
 
-fn ab_glyph_font_from_font_data(name: &str, data: &FontData) -> ab_glyph::FontArc {
-    match &data.font {
-        std::borrow::Cow::Borrowed(bytes) => {
-            ab_glyph::FontRef::try_from_slice_and_index(bytes, data.index)
-                .map(ab_glyph::FontArc::from)
-        }
-        std::borrow::Cow::Owned(bytes) => {
-            ab_glyph::FontVec::try_from_vec_and_index(bytes.clone(), data.index)
-                .map(ab_glyph::FontArc::from)
-        }
+pub type Blob = Arc<dyn AsRef<[u8]> + Send + Sync>;
+
+fn blob_from_font_data(data: &FontData) -> Blob {
+    match data.clone().font {
+        Cow::Borrowed(bytes) => Arc::new(bytes) as Blob,
+        Cow::Owned(bytes) => Arc::new(bytes) as Blob,
     }
-    .unwrap_or_else(|err| panic!("Error parsing {name:?} TTF/OTF font file: {err}"))
 }
 
 /// Describes the font data and the sizes to use.
@@ -438,7 +478,7 @@ pub(super) struct CachedFamily {
 impl CachedFamily {
     fn new(
         fonts: Vec<FontFaceKey>,
-        fonts_by_id: &mut nohash_hasher::IntMap<FontFaceKey, FontImpl>,
+        fonts_by_id: &mut nohash_hasher::IntMap<FontFaceKey, FontFace>,
     ) -> Self {
         if fonts.is_empty() {
             return Self {
@@ -476,11 +516,11 @@ impl CachedFamily {
     pub(crate) fn glyph_info_no_cache_or_fallback(
         &mut self,
         c: char,
-        fonts_by_id: &mut nohash_hasher::IntMap<FontFaceKey, FontImpl>,
+        fonts_by_id: &mut nohash_hasher::IntMap<FontFaceKey, FontFace>,
     ) -> Option<(FontFaceKey, GlyphInfo)> {
         for font_key in &self.fonts {
-            let font_impl = fonts_by_id.get_mut(font_key).expect("Nonexistent font ID");
-            if let Some(glyph_info) = font_impl.glyph_info(c) {
+            let font_face = fonts_by_id.get_mut(font_key).expect("Nonexistent font ID");
+            if let Some(glyph_info) = font_face.glyph_info(c) {
                 self.glyph_info_cache.insert(c, (*font_key, glyph_info));
                 return Some((*font_key, glyph_info));
             }
@@ -508,43 +548,29 @@ pub struct Fonts {
 impl Fonts {
     /// Create a new [`Fonts`] for text layout.
     /// This call is expensive, so only create one [`Fonts`] and then reuse it.
-    ///
-    /// * `max_texture_side`: largest supported texture size (one side).
-    pub fn new(
-        max_texture_side: usize,
-        text_alpha_from_coverage: AlphaFromCoverage,
-        definitions: FontDefinitions,
-    ) -> Self {
+    pub fn new(options: TextOptions, definitions: FontDefinitions) -> Self {
         Self {
-            fonts: FontsImpl::new(max_texture_side, text_alpha_from_coverage, definitions),
+            fonts: FontsImpl::new(options, definitions),
             galley_cache: Default::default(),
         }
     }
 
-    /// Call at the start of each frame with the latest known
-    /// `pixels_per_point`, `max_texture_side`, and `text_alpha_from_coverage`.
+    /// Call at the start of each frame with the latest known [`TextOptions`].
     ///
     /// Call after painting the previous frame, but before using [`Fonts`] for the new frame.
     ///
-    /// This function will react to changes in `pixels_per_point`, `max_texture_side`, and `text_alpha_from_coverage`,
+    /// This function will react to changes in [`TextOptions`],
     /// as well as notice when the font atlas is getting full, and handle that.
-    pub fn begin_pass(
-        &mut self,
-        max_texture_side: usize,
-        text_alpha_from_coverage: AlphaFromCoverage,
-    ) {
-        let max_texture_side_changed = self.fonts.max_texture_side != max_texture_side;
-        let text_alpha_from_coverage_changed =
-            self.fonts.atlas.text_alpha_from_coverage != text_alpha_from_coverage;
+    pub fn begin_pass(&mut self, options: TextOptions) {
+        let text_options_changed = self.fonts.options() != &options;
         let font_atlas_almost_full = self.fonts.atlas.fill_ratio() > 0.8;
-        let needs_recreate =
-            max_texture_side_changed || text_alpha_from_coverage_changed || font_atlas_almost_full;
+        let needs_recreate = text_options_changed || font_atlas_almost_full;
 
         if needs_recreate {
             let definitions = self.fonts.definitions.clone();
 
             *self = Self {
-                fonts: FontsImpl::new(max_texture_side, text_alpha_from_coverage, definitions),
+                fonts: FontsImpl::new(options, definitions),
                 galley_cache: Default::default(),
             };
         }
@@ -558,8 +584,8 @@ impl Fonts {
     }
 
     #[inline]
-    pub fn max_texture_side(&self) -> usize {
-        self.fonts.max_texture_side
+    pub fn options(&self) -> &TextOptions {
+        self.texture_atlas().options()
     }
 
     #[inline]
@@ -628,8 +654,8 @@ pub struct FontsView<'a> {
 
 impl FontsView<'_> {
     #[inline]
-    pub fn max_texture_side(&self) -> usize {
-        self.fonts.max_texture_side
+    pub fn options(&self) -> &TextOptions {
+        self.fonts.options()
     }
 
     #[inline]
@@ -671,6 +697,7 @@ impl FontsView<'_> {
     /// Height of one row of text in points.
     ///
     /// Returns a value rounded to [`emath::GUI_ROUNDING`].
+    #[inline]
     pub fn row_height(&mut self, font_id: &FontId) -> f32 {
         self.fonts
             .font(&font_id.family)
@@ -716,6 +743,7 @@ impl FontsView<'_> {
     /// Will wrap text at the given width and line break at `\n`.
     ///
     /// The implementation uses memoization so repeated calls are cheap.
+    #[inline]
     pub fn layout(
         &mut self,
         text: String,
@@ -730,6 +758,7 @@ impl FontsView<'_> {
     /// Will line break at `\n`.
     ///
     /// The implementation uses memoization so repeated calls are cheap.
+    #[inline]
     pub fn layout_no_wrap(
         &mut self,
         text: String,
@@ -743,6 +772,7 @@ impl FontsView<'_> {
     /// Like [`Self::layout`], made for when you want to pick a color for the text later.
     ///
     /// The implementation uses memoization so repeated calls are cheap.
+    #[inline]
     pub fn layout_delayed_color(
         &mut self,
         text: String,
@@ -759,10 +789,9 @@ impl FontsView<'_> {
 ///
 /// Required in order to paint text.
 pub struct FontsImpl {
-    max_texture_side: usize,
     definitions: FontDefinitions,
     atlas: TextureAtlas,
-    fonts_by_id: nohash_hasher::IntMap<FontFaceKey, FontImpl>,
+    fonts_by_id: nohash_hasher::IntMap<FontFaceKey, FontFace>,
     fonts_by_name: ahash::HashMap<String, FontFaceKey>,
     family_cache: ahash::HashMap<FontFamily, CachedFamily>,
 }
@@ -770,36 +799,43 @@ pub struct FontsImpl {
 impl FontsImpl {
     /// Create a new [`FontsImpl`] for text layout.
     /// This call is expensive, so only create one [`FontsImpl`] and then reuse it.
-    pub fn new(
-        max_texture_side: usize,
-        text_alpha_from_coverage: AlphaFromCoverage,
-        definitions: FontDefinitions,
-    ) -> Self {
-        let texture_width = max_texture_side.at_most(16 * 1024);
+    pub fn new(options: TextOptions, definitions: FontDefinitions) -> Self {
+        let texture_width = options.max_texture_side.at_most(16 * 1024);
         let initial_height = 32; // Keep initial font atlas small, so it is fast to upload to GPU. This will expand as needed anyways.
-        let atlas = TextureAtlas::new([texture_width, initial_height], text_alpha_from_coverage);
+        let atlas = TextureAtlas::new([texture_width, initial_height], options);
 
-        let mut fonts_by_id: nohash_hasher::IntMap<FontFaceKey, FontImpl> = Default::default();
-        let mut font_impls: ahash::HashMap<String, FontFaceKey> = Default::default();
+        let mut fonts_by_id: nohash_hasher::IntMap<FontFaceKey, FontFace> = Default::default();
+        let mut fonts_by_name: ahash::HashMap<String, FontFaceKey> = Default::default();
         for (name, font_data) in &definitions.font_data {
             let tweak = font_data.tweak;
-            let ab_glyph = ab_glyph_font_from_font_data(name, font_data);
-            let font_impl = FontImpl::new(name.clone(), ab_glyph, tweak);
+            let blob = blob_from_font_data(font_data);
+            let font_face = FontFace::new(
+                options,
+                name.clone(),
+                blob,
+                font_data.index,
+                tweak,
+                font_data.weight,
+            )
+            .unwrap_or_else(|err| panic!("Error parsing {name:?} TTF/OTF font file: {err}"));
             let key = FontFaceKey::new();
-            fonts_by_id.insert(key, font_impl);
-            font_impls.insert(name.clone(), key);
+            fonts_by_id.insert(key, font_face);
+            fonts_by_name.insert(name.clone(), key);
         }
 
         Self {
-            max_texture_side,
             definitions,
             atlas,
             fonts_by_id,
-            fonts_by_name: font_impls,
+            fonts_by_name,
             family_cache: Default::default(),
         }
     }
 
+    pub fn options(&self) -> &TextOptions {
+        self.atlas.options()
+    }
+
     /// Get the right font implementation from [`FontFamily`].
     pub fn font(&mut self, family: &FontFamily) -> Font<'_> {
         let cached_family = self.family_cache.entry(family.clone()).or_insert_with(|| {
@@ -825,6 +861,26 @@ impl FontsImpl {
             atlas: &mut self.atlas,
         }
     }
+
+    /// Get the weight of a font by name, if available.
+    ///
+    /// Returns the weight value (100-900) read from the font file's OS/2 table,
+    /// or `None` if the font is not found or doesn't contain weight information.
+    ///
+    /// # Example
+    /// ```
+    /// # use epaint::text::{FontDefinitions, FontsImpl};
+    /// # use epaint::TextOptions;
+    /// let fonts_impl = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
+    /// if let Some(weight) = fonts_impl.font_weight("Hack") {
+    ///     println!("Hack font weight: {}", weight);
+    /// }
+    /// ```
+    pub fn font_weight(&self, font_name: &str) -> Option<u16> {
+        let key = self.fonts_by_name.get(font_name)?;
+        let font_face = self.fonts_by_id.get(key)?;
+        font_face.weight()
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -889,14 +945,14 @@ impl GalleyCache {
                 let cached = entry.into_mut();
                 cached.last_used = self.generation;
 
-                let galley = cached.galley.clone();
+                let galley = Arc::clone(&cached.galley);
                 if let Some(children) = &cached.children {
                     // The point of `allow_split_paragraphs` is to split large jobs into paragraph,
                     // and then cache each paragraph individually.
                     // That way, if we edit a single paragraph, only that paragraph will be re-layouted.
                     // For that to work we need to keep all the child/paragraph
                     // galleys alive while the parent galley is alive:
-                    for child_hash in children.clone().iter() {
+                    for child_hash in Arc::clone(children).iter() {
                         if let Some(cached_child) = self.cache.get_mut(child_hash) {
                             cached_child.last_used = self.generation;
                         }
@@ -922,7 +978,7 @@ impl GalleyCache {
                         CachedGalley {
                             last_used: self.generation,
                             children: Some(child_hashes.into()),
-                            galley: galley.clone(),
+                            galley: Arc::clone(&galley),
                         },
                     );
                     galley
@@ -932,7 +988,7 @@ impl GalleyCache {
                     entry.insert(CachedGalley {
                         last_used: self.generation,
                         children: None,
-                        galley: galley.clone(),
+                        galley: Arc::clone(&galley),
                     });
                     galley
                 }
@@ -1192,12 +1248,7 @@ mod tests {
     #[test]
     fn test_split_paragraphs() {
         for pixels_per_point in [1.0, 2.0_f32.sqrt(), 2.0] {
-            let max_texture_side = 4096;
-            let mut fonts = FontsImpl::new(
-                max_texture_side,
-                AlphaFromCoverage::default(),
-                FontDefinitions::default(),
-            );
+            let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
 
             for halign in [Align::Min, Align::Center, Align::Max] {
                 for justify in [false, true] {
@@ -1255,11 +1306,7 @@ mod tests {
         let rounded_output_to_gui = [false, true];
 
         for pixels_per_point in pixels_per_point {
-            let mut fonts = FontsImpl::new(
-                1024,
-                AlphaFromCoverage::default(),
-                FontDefinitions::default(),
-            );
+            let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
 
             for &max_width in &max_widths {
                 for round_output_to_gui in rounded_output_to_gui {
@@ -1306,7 +1353,7 @@ mod tests {
 
     #[test]
     fn test_fallback_glyph_width() {
-        let mut fonts = Fonts::new(1024, AlphaFromCoverage::default(), FontDefinitions::empty());
+        let mut fonts = Fonts::new(TextOptions::default(), FontDefinitions::empty());
         let mut view = fonts.with_pixels_per_point(1.0);
 
         let width = view.glyph_width(&FontId::new(12.0, FontFamily::Proportional), ' ');
diff --git a/crates/epaint/src/text/mod.rs b/crates/epaint/src/text/mod.rs
index e0f4a3a98..b40ba45b8 100644
--- a/crates/epaint/src/text/mod.rs
+++ b/crates/epaint/src/text/mod.rs
@@ -20,3 +20,31 @@ pub use {
 
 /// Suggested character to use to replace those in password text fields.
 pub const PASSWORD_REPLACEMENT_CHAR: char = '•';
+
+/// Controls how we render text
+#[derive(Clone, Copy, Debug, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+pub struct TextOptions {
+    /// Maximum size of the font texture.
+    pub max_texture_side: usize,
+
+    /// Controls how to convert glyph coverage to alpha.
+    pub alpha_from_coverage: crate::AlphaFromCoverage,
+
+    /// Whether to enable font hinting
+    ///
+    /// (round some font coordinates to pixels for sharper text).
+    ///
+    /// Default is `true`.
+    pub font_hinting: bool,
+}
+
+impl Default for TextOptions {
+    fn default() -> Self {
+        Self {
+            max_texture_side: 2048, // Small but portable
+            alpha_from_coverage: crate::AlphaFromCoverage::default(),
+            font_hinting: true,
+        }
+    }
+}
diff --git a/crates/epaint/src/text/text_layout.rs b/crates/epaint/src/text/text_layout.rs
index 1db56731d..5b2400646 100644
--- a/crates/epaint/src/text/text_layout.rs
+++ b/crates/epaint/src/text/text_layout.rs
@@ -1,3 +1,5 @@
+#![expect(clippy::unwrap_used)] // TODO(emilk): remove unwraps
+
 use std::sync::Arc;
 
 use emath::{Align, GuiRounding as _, NumExt as _, Pos2, Rect, Vec2, pos2, vec2};
@@ -176,7 +178,7 @@ fn layout_section(
 
     // Optimization: only recompute `ScaledMetrics` when the concrete `FontImpl` changes.
     let mut current_font = FontFaceKey::INVALID;
-    let mut current_font_impl_metrics = ScaledMetrics::default();
+    let mut current_font_face_metrics = ScaledMetrics::default();
 
     for chr in job.text[byte_range.clone()].chars() {
         if job.break_on_newline && chr == '\n' {
@@ -185,20 +187,20 @@ fn layout_section(
             paragraph.empty_paragraph_height = line_height; // TODO(emilk): replace this hack with actually including `\n` in the glyphs?
         } else {
             let (font_id, glyph_info) = font.glyph_info(chr);
-            let mut font_impl = font.fonts_by_id.get_mut(&font_id);
+            let mut font_face = font.fonts_by_id.get_mut(&font_id);
             if current_font != font_id {
                 current_font = font_id;
-                current_font_impl_metrics = font_impl
+                current_font_face_metrics = font_face
                     .as_ref()
-                    .map(|font_impl| font_impl.scaled_metrics(pixels_per_point, font_size))
+                    .map(|font_face| font_face.scaled_metrics(pixels_per_point, font_size))
                     .unwrap_or_default();
             }
 
-            if let (Some(font_impl), Some(last_glyph_id), Some(glyph_id)) =
-                (&font_impl, last_glyph_id, glyph_info.id)
+            if let (Some(font_face), Some(last_glyph_id), Some(glyph_id)) =
+                (&font_face, last_glyph_id, glyph_info.id)
             {
-                paragraph.cursor_x_px += font_impl.pair_kerning_pixels(
-                    &current_font_impl_metrics,
+                paragraph.cursor_x_px += font_face.pair_kerning_pixels(
+                    &current_font_face_metrics,
                     last_glyph_id,
                     glyph_id,
                 );
@@ -207,10 +209,10 @@ fn layout_section(
                 paragraph.cursor_x_px += extra_letter_spacing * pixels_per_point;
             }
 
-            let (glyph_alloc, physical_x) = if let Some(font_impl) = font_impl.as_mut() {
-                font_impl.allocate_glyph(
+            let (glyph_alloc, physical_x) = if let Some(font_face) = font_face.as_mut() {
+                font_face.allocate_glyph(
                     font.atlas,
-                    &current_font_impl_metrics,
+                    &current_font_face_metrics,
                     glyph_info,
                     chr,
                     paragraph.cursor_x_px,
@@ -224,8 +226,8 @@ fn layout_section(
                 pos: pos2(physical_x as f32 / pixels_per_point, f32::NAN),
                 advance_width: glyph_alloc.advance_width_px / pixels_per_point,
                 line_height,
-                font_impl_height: current_font_impl_metrics.row_height,
-                font_impl_ascent: current_font_impl_metrics.ascent,
+                font_face_height: current_font_face_metrics.row_height,
+                font_face_ascent: current_font_face_metrics.ascent,
                 font_height: font_metrics.row_height,
                 font_ascent: font_metrics.ascent,
                 uv_rect: glyph_alloc.uv_rect,
@@ -463,22 +465,22 @@ fn replace_last_glyph_with_overflow_character(
         let font_size = section.format.font_id.size;
 
         let (font_id, glyph_info) = font.glyph_info(overflow_character);
-        let mut font_impl = font.fonts_by_id.get_mut(&font_id);
-        let font_impl_metrics = font_impl
+        let mut font_face = font.fonts_by_id.get_mut(&font_id);
+        let font_face_metrics = font_face
             .as_mut()
             .map(|f| f.scaled_metrics(pixels_per_point, font_size))
             .unwrap_or_default();
 
         let overflow_glyph_x = if let Some(prev_glyph) = row.glyphs.last() {
             // Kern the overflow character properly
-            let pair_kerning = font_impl
+            let pair_kerning = font_face
                 .as_mut()
-                .map(|font_impl| {
+                .map(|font_face| {
                     if let (Some(prev_glyph_id), Some(overflow_glyph_id)) = (
-                        font_impl.glyph_info(prev_glyph.chr).and_then(|g| g.id),
-                        font_impl.glyph_info(overflow_character).and_then(|g| g.id),
+                        font_face.glyph_info(prev_glyph.chr).and_then(|g| g.id),
+                        font_face.glyph_info(overflow_character).and_then(|g| g.id),
                     ) {
-                        font_impl.pair_kerning(&font_impl_metrics, prev_glyph_id, overflow_glyph_id)
+                        font_face.pair_kerning(&font_face_metrics, prev_glyph_id, overflow_glyph_id)
                     } else {
                         0.0
                     }
@@ -490,10 +492,10 @@ fn replace_last_glyph_with_overflow_character(
             0.0 // TODO(emilk): heed paragraph leading_space 😬
         };
 
-        let replacement_glyph_width = font_impl
+        let replacement_glyph_width = font_face
             .as_mut()
             .and_then(|f| f.glyph_info(overflow_character))
-            .map(|i| i.advance_width_unscaled.0 * font_impl_metrics.px_scale_factor)
+            .map(|i| i.advance_width_unscaled.0 * font_face_metrics.px_scale_factor)
             .unwrap_or_default();
 
         // Check if we're within width budget:
@@ -502,12 +504,12 @@ fn replace_last_glyph_with_overflow_character(
         {
             // we are done
 
-            let (replacement_glyph_alloc, physical_x) = font_impl
+            let (replacement_glyph_alloc, physical_x) = font_face
                 .as_mut()
                 .map(|f| {
                     f.allocate_glyph(
                         font.atlas,
-                        &font_impl_metrics,
+                        &font_face_metrics,
                         glyph_info,
                         overflow_character,
                         overflow_glyph_x * pixels_per_point,
@@ -526,8 +528,8 @@ fn replace_last_glyph_with_overflow_character(
                 pos: pos2(physical_x as f32 / pixels_per_point, f32::NAN),
                 advance_width: replacement_glyph_alloc.advance_width_px / pixels_per_point,
                 line_height,
-                font_impl_height: font_impl_metrics.row_height,
-                font_impl_ascent: font_impl_metrics.ascent,
+                font_face_height: font_face_metrics.row_height,
+                font_face_ascent: font_face_metrics.ascent,
                 font_height: font_metrics.row_height,
                 font_ascent: font_metrics.ascent,
                 uv_rect: replacement_glyph_alloc.uv_rect,
@@ -668,14 +670,14 @@ fn galley_from_rows(
         for glyph in &mut row.glyphs {
             let format = &job.sections[glyph.section_index as usize].format;
 
-            glyph.pos.y = glyph.font_impl_ascent
+            glyph.pos.y = glyph.font_face_ascent
 
                 // Apply valign to the different in height of the entire row, and the height of this `Font`:
                 + format.valign.to_factor() * (max_row_height - glyph.line_height)
 
                 // When mixing different `FontImpl` (e.g. latin and emojis),
                 // we always center the difference:
-                + 0.5 * (glyph.font_height - glyph.font_impl_height);
+                + 0.5 * (glyph.font_height - glyph.font_face_height);
 
             glyph.pos.y = point_scale.round_to_pixel(glyph.pos.y);
         }
@@ -1050,18 +1052,13 @@ impl RowBreakCandidates {
 
 #[cfg(test)]
 mod tests {
-    use crate::AlphaFromCoverage;
 
     use super::{super::*, *};
 
     #[test]
     fn test_zero_max_width() {
         let pixels_per_point = 1.0;
-        let mut fonts = FontsImpl::new(
-            1024,
-            AlphaFromCoverage::default(),
-            FontDefinitions::default(),
-        );
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
         let mut layout_job = LayoutJob::single_section("W".into(), TextFormat::default());
         layout_job.wrap.max_width = 0.0;
         let galley = layout(&mut fonts, pixels_per_point, layout_job.into());
@@ -1074,11 +1071,7 @@ mod tests {
 
         let pixels_per_point = 1.0;
 
-        let mut fonts = FontsImpl::new(
-            1024,
-            AlphaFromCoverage::default(),
-            FontDefinitions::default(),
-        );
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
         let text_format = TextFormat {
             font_id: FontId::monospace(12.0),
             ..Default::default()
@@ -1124,11 +1117,7 @@ mod tests {
     #[test]
     fn test_cjk() {
         let pixels_per_point = 1.0;
-        let mut fonts = FontsImpl::new(
-            1024,
-            AlphaFromCoverage::default(),
-            FontDefinitions::default(),
-        );
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
         let mut layout_job = LayoutJob::single_section(
             "日本語とEnglishの混在した文章".into(),
             TextFormat::default(),
@@ -1144,11 +1133,7 @@ mod tests {
     #[test]
     fn test_pre_cjk() {
         let pixels_per_point = 1.0;
-        let mut fonts = FontsImpl::new(
-            1024,
-            AlphaFromCoverage::default(),
-            FontDefinitions::default(),
-        );
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
         let mut layout_job = LayoutJob::single_section(
             "日本語とEnglishの混在した文章".into(),
             TextFormat::default(),
@@ -1164,11 +1149,7 @@ mod tests {
     #[test]
     fn test_truncate_width() {
         let pixels_per_point = 1.0;
-        let mut fonts = FontsImpl::new(
-            1024,
-            AlphaFromCoverage::default(),
-            FontDefinitions::default(),
-        );
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
         let mut layout_job =
             LayoutJob::single_section("# DNA\nMore text".into(), TextFormat::default());
         layout_job.wrap.max_width = f32::INFINITY;
@@ -1188,11 +1169,7 @@ mod tests {
     #[test]
     fn test_empty_row() {
         let pixels_per_point = 1.0;
-        let mut fonts = FontsImpl::new(
-            1024,
-            AlphaFromCoverage::default(),
-            FontDefinitions::default(),
-        );
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
 
         let font_id = FontId::default();
         let font_height = fonts
@@ -1225,11 +1202,7 @@ mod tests {
     #[test]
     fn test_end_with_newline() {
         let pixels_per_point = 1.0;
-        let mut fonts = FontsImpl::new(
-            1024,
-            AlphaFromCoverage::default(),
-            FontDefinitions::default(),
-        );
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
 
         let font_id = FontId::default();
         let font_height = fonts
diff --git a/crates/epaint/src/text/text_layout_types.rs b/crates/epaint/src/text/text_layout_types.rs
index f3963394a..3e8a53d9e 100644
--- a/crates/epaint/src/text/text_layout_types.rs
+++ b/crates/epaint/src/text/text_layout_types.rs
@@ -1,6 +1,3 @@
-#![allow(clippy::derived_hash_with_manual_eq)] // We need to impl Hash for f32, but we don't implement Eq, which is fine
-#![allow(clippy::wrong_self_convention)] // We use `from_` to indicate conversion direction. It's non-diomatic, but makes sense in this context.
-
 use std::ops::Range;
 use std::sync::Arc;
 
@@ -686,11 +683,11 @@ pub struct Glyph {
     /// The row/line height of this font.
     pub font_height: f32,
 
-    /// The ascent of the sub-font within the font (`FontImpl`).
-    pub font_impl_ascent: f32,
+    /// The ascent of the sub-font within the font (`FontFace`).
+    pub font_face_ascent: f32,
 
-    /// The row/line height of the sub-font within the font (`FontImpl`).
-    pub font_impl_height: f32,
+    /// The row/line height of the sub-font within the font (`FontFace`).
+    pub font_face_height: f32,
 
     /// Position and size of the glyph in the font texture, in texels.
     pub uv_rect: UvRect,
@@ -876,7 +873,7 @@ impl Galley {
                     ends_with_newline |= !is_last_galley && is_last_row_in_galley;
                     super::PlacedRow {
                         pos: new_pos,
-                        row: placed_row.row.clone(),
+                        row: Arc::clone(&placed_row.row),
                         ends_with_newline,
                     }
                 }));
diff --git a/crates/epaint/src/texture_atlas.rs b/crates/epaint/src/texture_atlas.rs
index 6488d9079..9a77c142a 100644
--- a/crates/epaint/src/texture_atlas.rs
+++ b/crates/epaint/src/texture_atlas.rs
@@ -1,7 +1,7 @@
 use ecolor::Color32;
 use emath::{Rect, remap_clamp};
 
-use crate::{AlphaFromCoverage, ColorImage, ImageDelta};
+use crate::{ColorImage, ImageDelta, TextOptions};
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 struct Rectu {
@@ -75,11 +75,11 @@ pub struct TextureAtlas {
     discs: Vec<PrerasterizedDisc>,
 
     /// Controls how to convert glyph coverage to alpha.
-    pub(crate) text_alpha_from_coverage: AlphaFromCoverage,
+    options: TextOptions,
 }
 
 impl TextureAtlas {
-    pub fn new(size: [usize; 2], text_alpha_from_coverage: AlphaFromCoverage) -> Self {
+    pub fn new(size: [usize; 2], options: TextOptions) -> Self {
         assert!(size[0] >= 1024, "Tiny texture atlas");
         let mut atlas = Self {
             image: ColorImage::filled(size, Color32::TRANSPARENT),
@@ -88,7 +88,7 @@ impl TextureAtlas {
             row_height: 0,
             overflowed: false,
             discs: vec![], // will be filled in below
-            text_alpha_from_coverage,
+            options,
         };
 
         // Make the top left pixel fully white for `WHITE_UV`, i.e. painting something with solid color:
@@ -121,7 +121,7 @@ impl TextureAtlas {
                     let coverage =
                         remap_clamp(distance_to_center, (r - 0.5)..=(r + 0.5), 1.0..=0.0);
                     image[((x as i32 + hw + dx) as usize, (y as i32 + hw + dy) as usize)] =
-                        text_alpha_from_coverage.color_from_coverage(coverage);
+                        options.alpha_from_coverage.color_from_coverage(coverage);
                 }
             }
             atlas.discs.push(PrerasterizedDisc {
@@ -138,6 +138,10 @@ impl TextureAtlas {
         atlas
     }
 
+    pub fn options(&self) -> &TextOptions {
+        &self.options
+    }
+
     pub fn size(&self) -> [usize; 2] {
         self.image.size
     }
diff --git a/crates/epaint/src/texture_handle.rs b/crates/epaint/src/texture_handle.rs
index 919b7405f..bbbf490b5 100644
--- a/crates/epaint/src/texture_handle.rs
+++ b/crates/epaint/src/texture_handle.rs
@@ -32,7 +32,7 @@ impl Clone for TextureHandle {
     fn clone(&self) -> Self {
         self.tex_mngr.write().retain(self.id);
         Self {
-            tex_mngr: self.tex_mngr.clone(),
+            tex_mngr: Arc::clone(&self.tex_mngr),
             id: self.id,
         }
     }
diff --git a/crates/epaint_default_fonts/CHANGELOG.md b/crates/epaint_default_fonts/CHANGELOG.md
index 3f131cb55..58fd310f4 100644
--- a/crates/epaint_default_fonts/CHANGELOG.md
+++ b/crates/epaint_default_fonts/CHANGELOG.md
@@ -5,6 +5,10 @@ This file is updated upon each release.
 Changes since the last release can be found at <https://github.com/emilk/egui/compare/latest...HEAD> or by running the `scripts/generate_changelog.py` script.
 
 
+## 0.33.3 - 2025-12-11
+Nothing new
+
+
 ## 0.33.2 - 2025-11-13
 Nothing new
 
diff --git a/deny.toml b/deny.toml
index c7206ff26..1b3bd8b12 100644
--- a/deny.toml
+++ b/deny.toml
@@ -51,6 +51,7 @@ skip = [
   { name = "core-foundation" }, # version conflict between winit and wgpu ecosystems
   { name = "core-graphics-types" }, # version conflict between winit and wgpu ecosystems
   { name = "getrandom" }, # ring / rustls (and thus ehttp) still depend on getrandom 0.2
+  { name = "kurbo" }, # Old version because of resvg
   { name = "quick-xml" }, # old version via wayland-scanner
   { name = "redox_syscall" }, # old version via winit
   { name = "rustc-hash" }, # Small enough
diff --git a/examples/confirm_exit/Cargo.toml b/examples/confirm_exit/Cargo.toml
index 2724ae079..755d9dd46 100644
--- a/examples/confirm_exit/Cargo.toml
+++ b/examples/confirm_exit/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/confirm_exit/src/main.rs b/examples/confirm_exit/src/main.rs
index e02c5c1d0..6c26bed96 100644
--- a/examples/confirm_exit/src/main.rs
+++ b/examples/confirm_exit/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::egui;
 
@@ -23,16 +23,16 @@ struct MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("Try to close the window");
         });
 
-        if ctx.input(|i| i.viewport().close_requested()) {
+        if ui.input(|i| i.viewport().close_requested()) {
             if self.allowed_to_close {
                 // do nothing - we will close
             } else {
-                ctx.send_viewport_cmd(egui::ViewportCommand::CancelClose);
+                ui.send_viewport_cmd(egui::ViewportCommand::CancelClose);
                 self.show_confirmation_dialog = true;
             }
         }
@@ -41,7 +41,7 @@ impl eframe::App for MyApp {
             egui::Window::new("Do you want to quit?")
                 .collapsible(false)
                 .resizable(false)
-                .show(ctx, |ui| {
+                .show(ui.ctx(), |ui| {
                     ui.horizontal(|ui| {
                         if ui.button("No").clicked() {
                             self.show_confirmation_dialog = false;
@@ -51,7 +51,7 @@ impl eframe::App for MyApp {
                         if ui.button("Yes").clicked() {
                             self.show_confirmation_dialog = false;
                             self.allowed_to_close = true;
-                            ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close);
+                            ui.send_viewport_cmd(egui::ViewportCommand::Close);
                         }
                     });
                 });
diff --git a/examples/custom_3d_glow/Cargo.toml b/examples/custom_3d_glow/Cargo.toml
index 8636b0f43..ed1d15516 100644
--- a/examples/custom_3d_glow/Cargo.toml
+++ b/examples/custom_3d_glow/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
@@ -14,6 +14,7 @@ workspace = true
 [dependencies]
 eframe = { workspace = true, features = [
   "default",
+  "glow",
   "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
 env_logger = { workspace = true, features = ["auto-color", "humantime"] }
diff --git a/examples/custom_3d_glow/src/main.rs b/examples/custom_3d_glow/src/main.rs
index 224295877..6b804ed1c 100644
--- a/examples/custom_3d_glow/src/main.rs
+++ b/examples/custom_3d_glow/src/main.rs
@@ -1,7 +1,7 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
-#![allow(unsafe_code)]
-#![allow(clippy::undocumented_unsafe_blocks)]
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(unsafe_code)]
+#![expect(clippy::undocumented_unsafe_blocks)]
 
 use eframe::{egui, egui_glow, glow};
 
@@ -43,8 +43,8 @@ impl MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 ui.spacing_mut().item_spacing.x = 0.0;
                 ui.label("The triangle is being painted using ");
@@ -75,7 +75,7 @@ impl MyApp {
 
         // Clone locals so we can move them into the paint callback:
         let angle = self.angle;
-        let rotating_triangle = self.rotating_triangle.clone();
+        let rotating_triangle = Arc::clone(&self.rotating_triangle);
 
         let callback = egui::PaintCallback {
             rect,
diff --git a/examples/custom_font/Cargo.toml b/examples/custom_font/Cargo.toml
index b10bd12cb..d2dcf350e 100644
--- a/examples/custom_font/Cargo.toml
+++ b/examples/custom_font/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/custom_font/src/main.rs b/examples/custom_font/src/main.rs
index c487b6714..851a4fb92 100644
--- a/examples/custom_font/src/main.rs
+++ b/examples/custom_font/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::{
     egui,
@@ -86,8 +86,8 @@ impl MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("egui using custom fonts");
             ui.text_edit_multiline(&mut self.text);
         });
diff --git a/examples/custom_font_style/Cargo.toml b/examples/custom_font_style/Cargo.toml
index 373225f60..e31911c1a 100644
--- a/examples/custom_font_style/Cargo.toml
+++ b/examples/custom_font_style/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["tami5 <kkharji@proton.me>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/custom_font_style/src/main.rs b/examples/custom_font_style/src/main.rs
index 4600fbff3..742bf4036 100644
--- a/examples/custom_font_style/src/main.rs
+++ b/examples/custom_font_style/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::egui;
 use egui::{FontFamily, FontId, RichText, TextStyle};
@@ -65,8 +65,8 @@ impl MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, content);
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, content);
     }
 }
 
diff --git a/examples/custom_keypad/Cargo.toml b/examples/custom_keypad/Cargo.toml
index 6c3cd0f2f..024196e7d 100644
--- a/examples/custom_keypad/Cargo.toml
+++ b/examples/custom_keypad/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Varphone Wong <varphone@qq.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/custom_keypad/src/keypad.rs b/examples/custom_keypad/src/keypad.rs
index df8d1f484..028ce5834 100644
--- a/examples/custom_keypad/src/keypad.rs
+++ b/examples/custom_keypad/src/keypad.rs
@@ -179,9 +179,9 @@ impl Keypad {
             )
         });
 
-        let is_first_show = ctx.wants_keyboard_input() && state.focus != focus;
+        let is_first_show = ctx.egui_wants_keyboard_input() && state.focus != focus;
         if is_first_show {
-            let y = ctx.style().spacing.interact_size.y * 1.25;
+            let y = ctx.global_style().spacing.interact_size.y * 1.25;
             state.open = true;
             state.start_pos = ctx.input(|i| {
                 i.pointer
diff --git a/examples/custom_keypad/src/main.rs b/examples/custom_keypad/src/main.rs
index cac549ce2..67e3126aa 100644
--- a/examples/custom_keypad/src/main.rs
+++ b/examples/custom_keypad/src/main.rs
@@ -1,5 +1,5 @@
 // #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 use eframe::egui;
 
 mod keypad;
@@ -44,11 +44,11 @@ impl Default for MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
         egui::Window::new("Custom Keypad")
             .default_pos([100.0, 100.0])
             .title_bar(true)
-            .show(ctx, |ui| {
+            .show(ui.ctx(), |ui| {
                 ui.horizontal(|ui| {
                     ui.label("Your name: ");
                     ui.text_edit_singleline(&mut self.name);
@@ -60,7 +60,7 @@ impl eframe::App for MyApp {
                 ui.label(format!("Hello '{}', age {}", self.name, self.age));
             });
 
-        self.keypad.show(ctx);
+        self.keypad.show(ui.ctx());
     }
 
     fn raw_input_hook(&mut self, ctx: &egui::Context, raw_input: &mut egui::RawInput) {
diff --git a/examples/custom_style/Cargo.toml b/examples/custom_style/Cargo.toml
index d4f874e96..83174df40 100644
--- a/examples/custom_style/Cargo.toml
+++ b/examples/custom_style/Cargo.toml
@@ -3,7 +3,7 @@ name = "custom_style"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/custom_style/src/main.rs b/examples/custom_style/src/main.rs
index 58f7e1d3a..b8e1599de 100644
--- a/examples/custom_style/src/main.rs
+++ b/examples/custom_style/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::egui::{
     self, Color32, Stroke, Style, Theme, global_theme_preference_buttons, style::Selection,
@@ -57,8 +57,8 @@ impl MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("egui using a customized style");
             ui.label("Switch between dark and light mode to see the different styles in action.");
             global_theme_preference_buttons(ui);
diff --git a/examples/custom_window_frame/Cargo.toml b/examples/custom_window_frame/Cargo.toml
index 453893583..049ee9a1a 100644
--- a/examples/custom_window_frame/Cargo.toml
+++ b/examples/custom_window_frame/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/custom_window_frame/src/main.rs b/examples/custom_window_frame/src/main.rs
index bc7ddcb82..49b3276f0 100644
--- a/examples/custom_window_frame/src/main.rs
+++ b/examples/custom_window_frame/src/main.rs
@@ -31,8 +31,8 @@ impl eframe::App for MyApp {
         egui::Rgba::TRANSPARENT.to_array() // Make sure we don't paint anything behind the rounded corners
     }
 
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        custom_window_frame(ctx, "egui with custom frame", |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        custom_window_frame(ui, "egui with custom frame", |ui| {
             ui.label("This is just the contents of the window.");
             ui.horizontal(|ui| {
                 ui.label("egui theme:");
@@ -42,18 +42,20 @@ impl eframe::App for MyApp {
     }
 }
 
-fn custom_window_frame(ctx: &egui::Context, title: &str, add_contents: impl FnOnce(&mut egui::Ui)) {
-    use egui::{CentralPanel, UiBuilder};
+fn custom_window_frame(ui: &mut egui::Ui, title: &str, add_contents: impl FnOnce(&mut egui::Ui)) {
+    use egui::UiBuilder;
 
     let panel_frame = egui::Frame::new()
-        .fill(ctx.style().visuals.window_fill())
+        .fill(ui.global_style().visuals.window_fill())
         .corner_radius(10)
-        .stroke(ctx.style().visuals.widgets.noninteractive.fg_stroke)
+        .stroke(ui.global_style().visuals.widgets.noninteractive.fg_stroke)
         .outer_margin(1); // so the stroke is within the bounds
 
-    CentralPanel::default().frame(panel_frame).show(ctx, |ui| {
+    panel_frame.show(ui, |ui| {
         let app_rect = ui.max_rect();
 
+        ui.expand_to_include_rect(app_rect); // Expand frame to include it all
+
         let title_bar_height = 32.0;
         let title_bar_rect = {
             let mut rect = app_rect;
@@ -106,12 +108,11 @@ fn title_bar_ui(ui: &mut egui::Ui, title_bar_rect: eframe::epaint::Rect, title:
     // Interact with the title bar (drag to move window):
     if title_bar_response.double_clicked() {
         let is_maximized = ui.input(|i| i.viewport().maximized.unwrap_or(false));
-        ui.ctx()
-            .send_viewport_cmd(ViewportCommand::Maximized(!is_maximized));
+        ui.send_viewport_cmd(ViewportCommand::Maximized(!is_maximized));
     }
 
     if title_bar_response.drag_started_by(PointerButton::Primary) {
-        ui.ctx().send_viewport_cmd(ViewportCommand::StartDrag);
+        ui.send_viewport_cmd(ViewportCommand::StartDrag);
     }
 
     ui.scope_builder(
@@ -137,7 +138,7 @@ fn close_maximize_minimize(ui: &mut egui::Ui) {
         .add(Button::new(RichText::new("❌").size(button_height)))
         .on_hover_text("Close the window");
     if close_response.clicked() {
-        ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close);
+        ui.send_viewport_cmd(egui::ViewportCommand::Close);
     }
 
     let is_maximized = ui.input(|i| i.viewport().maximized.unwrap_or(false));
@@ -146,15 +147,14 @@ fn close_maximize_minimize(ui: &mut egui::Ui) {
             .add(Button::new(RichText::new("🗗").size(button_height)))
             .on_hover_text("Restore window");
         if maximized_response.clicked() {
-            ui.ctx()
-                .send_viewport_cmd(ViewportCommand::Maximized(false));
+            ui.send_viewport_cmd(ViewportCommand::Maximized(false));
         }
     } else {
         let maximized_response = ui
             .add(Button::new(RichText::new("🗗").size(button_height)))
             .on_hover_text("Maximize window");
         if maximized_response.clicked() {
-            ui.ctx().send_viewport_cmd(ViewportCommand::Maximized(true));
+            ui.send_viewport_cmd(ViewportCommand::Maximized(true));
         }
     }
 
@@ -162,6 +162,6 @@ fn close_maximize_minimize(ui: &mut egui::Ui) {
         .add(Button::new(RichText::new("🗕").size(button_height)))
         .on_hover_text("Minimize the window");
     if minimized_response.clicked() {
-        ui.ctx().send_viewport_cmd(ViewportCommand::Minimized(true));
+        ui.send_viewport_cmd(ViewportCommand::Minimized(true));
     }
 }
diff --git a/examples/external_eventloop/Cargo.toml b/examples/external_eventloop/Cargo.toml
index d54d1b1c5..3341f1c65 100644
--- a/examples/external_eventloop/Cargo.toml
+++ b/examples/external_eventloop/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Will Brown <opensource@rebeagle.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/external_eventloop/src/main.rs b/examples/external_eventloop/src/main.rs
index d72f6914a..a940fd7d0 100644
--- a/examples/external_eventloop/src/main.rs
+++ b/examples/external_eventloop/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs, clippy::unwrap_used)] // it's an example
 
 use eframe::{UserEvent, egui};
 use std::{cell::Cell, rc::Rc};
@@ -44,8 +44,8 @@ impl Default for MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("My External Eventloop Application");
 
             ui.horizontal(|ui| {
@@ -68,7 +68,7 @@ impl eframe::App for MyApp {
             }
 
             if self.blinky {
-                let now = ui.ctx().input(|i| i.time);
+                let now = ui.input(|i| i.time);
                 let blink = now % 1.0 < 0.5;
                 egui::Frame::new()
                     .inner_margin(3)
@@ -82,7 +82,7 @@ impl eframe::App for MyApp {
                         ui.label("Blinky!");
                     });
 
-                ctx.request_repaint_after_secs((0.5 - (now % 0.5)) as f32);
+                ui.request_repaint_after_secs((0.5 - (now % 0.5)) as f32);
             }
         });
     }
diff --git a/examples/external_eventloop_async/Cargo.toml b/examples/external_eventloop_async/Cargo.toml
index c0537b107..73c08210b 100644
--- a/examples/external_eventloop_async/Cargo.toml
+++ b/examples/external_eventloop_async/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Will Brown <opensource@rebeagle.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/external_eventloop_async/src/app.rs b/examples/external_eventloop_async/src/app.rs
index a7b3e0efe..07f4d4a98 100644
--- a/examples/external_eventloop_async/src/app.rs
+++ b/examples/external_eventloop_async/src/app.rs
@@ -1,8 +1,12 @@
-use eframe::{EframePumpStatus, UserEvent, egui};
+#![expect(clippy::unwrap_used)] // It's an example
+
 use std::{cell::Cell, io, os::fd::AsRawFd as _, rc::Rc, time::Duration};
+
 use tokio::task::LocalSet;
 use winit::event_loop::{ControlFlow, EventLoop};
 
+use eframe::{EframePumpStatus, UserEvent, egui};
+
 pub fn run() -> io::Result<()> {
     env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
     let options = eframe::NativeOptions {
@@ -76,8 +80,8 @@ impl Default for MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("My External Eventloop Application");
 
             ui.horizontal(|ui| {
@@ -85,8 +89,8 @@ impl eframe::App for MyApp {
                     self.value.set(self.value.get() + 1);
                 }
                 if ui.button("Increment Later").clicked() {
-                    let value = self.value.clone();
-                    let ctx = ctx.clone();
+                    let value = Rc::clone(&self.value);
+                    let ctx = ui.ctx().clone();
                     tokio::task::spawn_local(async move {
                         tokio::time::sleep(Duration::from_secs(1)).await;
                         value.set(value.get() + 1);
@@ -109,7 +113,7 @@ impl eframe::App for MyApp {
             }
 
             if self.blinky {
-                let now = ui.ctx().input(|i| i.time);
+                let now = ui.input(|i| i.time);
                 let blink = now % 1.0 < 0.5;
                 egui::Frame::new()
                     .inner_margin(3)
@@ -123,7 +127,7 @@ impl eframe::App for MyApp {
                         ui.label("Blinky!");
                     });
 
-                ctx.request_repaint_after_secs((0.5 - (now % 0.5)) as f32);
+                ui.request_repaint_after_secs((0.5 - (now % 0.5)) as f32);
             }
         });
     }
diff --git a/examples/external_eventloop_async/src/main.rs b/examples/external_eventloop_async/src/main.rs
index f77dea941..9827c96b6 100644
--- a/examples/external_eventloop_async/src/main.rs
+++ b/examples/external_eventloop_async/src/main.rs
@@ -1,4 +1,4 @@
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 #[cfg(target_os = "linux")]
 mod app;
diff --git a/examples/file_dialog/Cargo.toml b/examples/file_dialog/Cargo.toml
index a3b5318b0..f0512e329 100644
--- a/examples/file_dialog/Cargo.toml
+++ b/examples/file_dialog/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/file_dialog/src/main.rs b/examples/file_dialog/src/main.rs
index 9a8bbe966..63e7bb0a8 100644
--- a/examples/file_dialog/src/main.rs
+++ b/examples/file_dialog/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::egui;
 
@@ -25,8 +25,8 @@ struct MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.label("Drag-and-drop files onto the window!");
 
             if ui.button("Open file…").clicked()
@@ -73,10 +73,10 @@ impl eframe::App for MyApp {
             }
         });
 
-        preview_files_being_dropped(ctx);
+        preview_files_being_dropped(ui.ctx());
 
         // Collect dropped files:
-        ctx.input(|i| {
+        ui.input(|i| {
             if !i.raw.dropped_files.is_empty() {
                 self.dropped_files.clone_from(&i.raw.dropped_files);
             }
@@ -113,7 +113,7 @@ fn preview_files_being_dropped(ctx: &egui::Context) {
             content_rect.center(),
             Align2::CENTER_CENTER,
             text,
-            TextStyle::Heading.resolve(&ctx.style()),
+            TextStyle::Heading.resolve(&ctx.global_style()),
             Color32::WHITE,
         );
     }
diff --git a/examples/hello_android/Cargo.toml b/examples/hello_android/Cargo.toml
index c4b5a93f3..7c8444f99 100644
--- a/examples/hello_android/Cargo.toml
+++ b/examples/hello_android/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 # `unsafe_code` is required for `#[no_mangle]`, disable workspace lints to workaround lint error.
diff --git a/examples/hello_android/src/lib.rs b/examples/hello_android/src/lib.rs
index 1de7684f5..2ab777ea7 100644
--- a/examples/hello_android/src/lib.rs
+++ b/examples/hello_android/src/lib.rs
@@ -36,15 +36,17 @@ impl MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
         // Reserve some space at the top so the demo ui isn't hidden behind the android status bar
         // TODO(lucasmerlin): This is a pretty big hack, should be fixed once safe_area implemented
         // for android:
         // https://github.com/rust-windowing/winit/issues/3910
-        egui::Panel::top("status_bar_space").show(ctx, |ui| {
+        egui::Panel::top("status_bar_space").show_inside(ui, |ui| {
             ui.set_height(32.0);
         });
 
-        self.demo.ui(ctx);
+        egui::CentralPanel::default().show_inside(ui, |ui| {
+            self.demo.ui(ui);
+        });
     }
 }
diff --git a/examples/hello_world/Cargo.toml b/examples/hello_world/Cargo.toml
index 00e279898..1f94588ae 100644
--- a/examples/hello_world/Cargo.toml
+++ b/examples/hello_world/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/hello_world/src/main.rs b/examples/hello_world/src/main.rs
index 6b85198a4..55f4d7821 100644
--- a/examples/hello_world/src/main.rs
+++ b/examples/hello_world/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::egui;
 
@@ -36,8 +36,8 @@ impl Default for MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("My egui Application");
             ui.horizontal(|ui| {
                 let name_label = ui.label("Your name: ");
diff --git a/examples/hello_world_par/Cargo.toml b/examples/hello_world_par/Cargo.toml
index 84f1fe7e1..ef719b742 100644
--- a/examples/hello_world_par/Cargo.toml
+++ b/examples/hello_world_par/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Maxim Osipenko <maxim1999max@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/hello_world_par/src/main.rs b/examples/hello_world_par/src/main.rs
index 7eeb7a2b6..b064c65bd 100644
--- a/examples/hello_world_par/src/main.rs
+++ b/examples/hello_world_par/src/main.rs
@@ -1,7 +1,7 @@
 //! This example shows that you can use egui in parallel from multiple threads.
 
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(clippy::unwrap_used)] // it's an example
 
 use std::sync::mpsc;
 use std::thread::JoinHandle;
@@ -116,15 +116,15 @@ impl std::ops::Drop for MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::Window::new("Main thread").show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::Window::new("Main thread").show(ui.ctx(), |ui| {
             if ui.button("Spawn another thread").clicked() {
                 self.spawn_thread();
             }
         });
 
         for (_handle, show_tx) in &self.threads {
-            let _ = show_tx.send(ctx.clone());
+            let _ = show_tx.send(ui.ctx().clone());
         }
 
         for _ in 0..self.threads.len() {
diff --git a/examples/hello_world_simple/Cargo.toml b/examples/hello_world_simple/Cargo.toml
index 954db50aa..572b98f71 100644
--- a/examples/hello_world_simple/Cargo.toml
+++ b/examples/hello_world_simple/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/hello_world_simple/src/main.rs b/examples/hello_world_simple/src/main.rs
index 4fe49a89d..cbdfcf1f1 100644
--- a/examples/hello_world_simple/src/main.rs
+++ b/examples/hello_world_simple/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::egui;
 
@@ -15,8 +15,8 @@ fn main() -> eframe::Result {
     let mut name = "Arthur".to_owned();
     let mut age = 42;
 
-    eframe::run_simple_native("My egui App", options, move |ctx, _frame| {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    eframe::run_ui_native("My egui App", options, move |ui, _frame| {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("My egui Application");
             ui.horizontal(|ui| {
                 let name_label = ui.label("Your name: ");
diff --git a/examples/images/Cargo.toml b/examples/images/Cargo.toml
index 2618618ae..7c3b77b7c 100644
--- a/examples/images/Cargo.toml
+++ b/examples/images/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Jan Procházka <github.com/jprochazk>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/images/src/main.rs b/examples/images/src/main.rs
index d7ccfd7b4..8259ccdc7 100644
--- a/examples/images/src/main.rs
+++ b/examples/images/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::egui;
 
@@ -24,8 +24,8 @@ fn main() -> eframe::Result {
 struct MyApp {}
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             egui::ScrollArea::both().show(ui, |ui| {
                 ui.image(egui::include_image!("cat.webp"))
                     .on_hover_text_at_pointer("WebP");
diff --git a/examples/keyboard_events/Cargo.toml b/examples/keyboard_events/Cargo.toml
index f3786152c..23265be36 100644
--- a/examples/keyboard_events/Cargo.toml
+++ b/examples/keyboard_events/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Jose Palazon <jose@palako.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/keyboard_events/src/main.rs b/examples/keyboard_events/src/main.rs
index 4ea099434..a008ac20d 100644
--- a/examples/keyboard_events/src/main.rs
+++ b/examples/keyboard_events/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::egui;
 use egui::{Key, ScrollArea};
@@ -20,8 +20,8 @@ struct Content {
 }
 
 impl eframe::App for Content {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("Press/Hold/Release example. Press A to test.");
             if ui.button("Clear").clicked() {
                 self.text.clear();
@@ -33,14 +33,14 @@ impl eframe::App for Content {
                     ui.label(&self.text);
                 });
 
-            if ctx.input(|i| i.key_pressed(Key::A)) {
+            if ui.input(|i| i.key_pressed(Key::A)) {
                 self.text.push_str("\nPressed");
             }
-            if ctx.input(|i| i.key_down(Key::A)) {
+            if ui.input(|i| i.key_down(Key::A)) {
                 self.text.push_str("\nHeld");
-                ui.ctx().request_repaint(); // make sure we note the holding.
+                ui.request_repaint(); // make sure we note the holding.
             }
-            if ctx.input(|i| i.key_released(Key::A)) {
+            if ui.input(|i| i.key_released(Key::A)) {
                 self.text.push_str("\nReleased");
             }
         });
diff --git a/examples/multiple_viewports/Cargo.toml b/examples/multiple_viewports/Cargo.toml
index 3187bf16d..07e68831a 100644
--- a/examples/multiple_viewports/Cargo.toml
+++ b/examples/multiple_viewports/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/multiple_viewports/src/main.rs b/examples/multiple_viewports/src/main.rs
index 919c24a3a..253e81b0e 100644
--- a/examples/multiple_viewports/src/main.rs
+++ b/examples/multiple_viewports/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use std::sync::{
     Arc,
@@ -35,8 +35,8 @@ struct MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.label("Hello from the root viewport");
 
             ui.checkbox(
@@ -44,55 +44,68 @@ impl eframe::App for MyApp {
                 "Show immediate child viewport",
             );
 
-            let mut show_deferred_viewport = self.show_deferred_viewport.load(Ordering::Relaxed);
-            ui.checkbox(&mut show_deferred_viewport, "Show deferred child viewport");
-            self.show_deferred_viewport
-                .store(show_deferred_viewport, Ordering::Relaxed);
+            {
+                let mut show_deferred_viewport =
+                    self.show_deferred_viewport.load(Ordering::Relaxed);
+                ui.checkbox(&mut show_deferred_viewport, "Show deferred child viewport");
+                self.show_deferred_viewport
+                    .store(show_deferred_viewport, Ordering::Relaxed);
+            }
+
+            ui.add_space(16.0);
+            {
+                let mut embedded = ui.embed_viewports();
+                ui.checkbox(&mut embedded, "Embed all viewports");
+                ui.set_embed_viewports(embedded);
+            }
         });
 
         if self.show_immediate_viewport {
-            ctx.show_viewport_immediate(
+            ui.ctx().show_viewport_immediate(
                 egui::ViewportId::from_hash_of("immediate_viewport"),
                 egui::ViewportBuilder::default()
                     .with_title("Immediate Viewport")
                     .with_inner_size([200.0, 100.0]),
-                |ctx, class| {
-                    assert!(
-                        class == egui::ViewportClass::Immediate,
-                        "This egui backend doesn't support multiple viewports"
-                    );
+                |ui, class| {
+                    if class == egui::ViewportClass::EmbeddedWindow {
+                        ui.label(
+                            "This viewport is embedded in the parent window, and cannot be moved outside of it.",
+                        );
+                    } else {
+                        egui::CentralPanel::default().show_inside(ui, |ui| {
+                            ui.label("Hello from immediate viewport");
 
-                    egui::CentralPanel::default().show(ctx, |ui| {
-                        ui.label("Hello from immediate viewport");
-                    });
-
-                    if ctx.input(|i| i.viewport().close_requested()) {
-                        // Tell parent viewport that we should not show next frame:
-                        self.show_immediate_viewport = false;
+                            if ui.input(|i| i.viewport().close_requested()) {
+                                // Tell parent viewport that we should not show next frame:
+                                self.show_immediate_viewport = false;
+                            }
+                        });
                     }
                 },
             );
         }
 
         if self.show_deferred_viewport.load(Ordering::Relaxed) {
-            let show_deferred_viewport = self.show_deferred_viewport.clone();
-            ctx.show_viewport_deferred(
+            let show_deferred_viewport = Arc::clone(&self.show_deferred_viewport);
+            ui.ctx().show_viewport_deferred(
                 egui::ViewportId::from_hash_of("deferred_viewport"),
                 egui::ViewportBuilder::default()
                     .with_title("Deferred Viewport")
                     .with_inner_size([200.0, 100.0]),
-                move |ctx, class| {
-                    assert!(
-                        class == egui::ViewportClass::Deferred,
-                        "This egui backend doesn't support multiple viewports"
-                    );
+                move |ui, class| {
+                    if class == egui::ViewportClass::EmbeddedWindow {
+                        ui.label(
+                            "This viewport is embedded in the parent window, and cannot be moved outside of it.",
+                        );
+                    } else {
+                        egui::CentralPanel::default().show_inside(ui, |ui| {
+                            ui.label("Hello from deferred viewport");
 
-                    egui::CentralPanel::default().show(ctx, |ui| {
-                        ui.label("Hello from deferred viewport");
-                    });
-                    if ctx.input(|i| i.viewport().close_requested()) {
-                        // Tell parent to close us.
-                        show_deferred_viewport.store(false, Ordering::Relaxed);
+                            if ui.input(|i| i.viewport().close_requested()) {
+                                // Tell parent to close us.
+                                show_deferred_viewport.store(false, Ordering::Relaxed);
+                            }
+                        });
                     }
                 },
             );
diff --git a/examples/popups/src/main.rs b/examples/popups/src/main.rs
index 3da475832..16e0cf049 100644
--- a/examples/popups/src/main.rs
+++ b/examples/popups/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::egui::{CentralPanel, ComboBox, Popup, PopupCloseBehavior};
 
@@ -18,8 +18,8 @@ struct MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &eframe::egui::Context, _frame: &mut eframe::Frame) {
-        CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut eframe::egui::Ui, _frame: &mut eframe::Frame) {
+        CentralPanel::default().show_inside(ui, |ui| {
             ui.label("PopupCloseBehavior::CloseOnClick popup");
             ComboBox::from_label("ComboBox")
                 .selected_text(format!("{}", self.number))
diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml
index 2fd92d2ab..49e6598db 100644
--- a/examples/puffin_profiler/Cargo.toml
+++ b/examples/puffin_profiler/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [package.metadata.cargo-machete]
diff --git a/examples/puffin_profiler/src/main.rs b/examples/puffin_profiler/src/main.rs
index 942b57a4a..3b7ebddb1 100644
--- a/examples/puffin_profiler/src/main.rs
+++ b/examples/puffin_profiler/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use std::sync::{
     Arc,
@@ -54,8 +54,8 @@ impl Default for MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("Example of how to use the puffin profiler with egui");
             ui.separator();
 
@@ -65,7 +65,7 @@ impl eframe::App for MyApp {
             ui.horizontal(|ui| {
                 ui.monospace(cmd);
                 if ui.small_button("📋").clicked() {
-                    ui.ctx().copy_text(cmd.into());
+                    ui.copy_text(cmd.into());
                 }
             });
 
@@ -75,7 +75,7 @@ impl eframe::App for MyApp {
                 ui.checkbox(&mut self.keep_repainting, "Keep repainting");
                 if self.keep_repainting {
                     ui.spinner();
-                    ui.ctx().request_repaint();
+                    ui.request_repaint();
                 } else {
                     ui.label("Repainting on events (e.g. mouse movement)");
                 }
@@ -103,12 +103,12 @@ impl eframe::App for MyApp {
         });
 
         if self.show_immediate_viewport {
-            ctx.show_viewport_immediate(
+            ui.ctx().show_viewport_immediate(
                 egui::ViewportId::from_hash_of("immediate_viewport"),
                 egui::ViewportBuilder::default()
                     .with_title("Immediate Viewport")
                     .with_inner_size([200.0, 100.0]),
-                |ctx, class| {
+                |ui, class| {
                     puffin::profile_scope!("immediate_viewport");
 
                     assert!(
@@ -116,11 +116,11 @@ impl eframe::App for MyApp {
                         "This egui backend doesn't support multiple viewports"
                     );
 
-                    egui::CentralPanel::default().show(ctx, |ui| {
+                    egui::CentralPanel::default().show_inside(ui, |ui| {
                         ui.label("Hello from immediate viewport");
                     });
 
-                    if ctx.input(|i| i.viewport().close_requested()) {
+                    if ui.input(|i| i.viewport().close_requested()) {
                         // Tell parent viewport that we should not show next frame:
                         self.show_immediate_viewport = false;
                     }
@@ -129,13 +129,13 @@ impl eframe::App for MyApp {
         }
 
         if self.show_deferred_viewport.load(Ordering::Relaxed) {
-            let show_deferred_viewport = self.show_deferred_viewport.clone();
-            ctx.show_viewport_deferred(
+            let show_deferred_viewport = Arc::clone(&self.show_deferred_viewport);
+            ui.ctx().show_viewport_deferred(
                 egui::ViewportId::from_hash_of("deferred_viewport"),
                 egui::ViewportBuilder::default()
                     .with_title("Deferred Viewport")
                     .with_inner_size([200.0, 100.0]),
-                move |ctx, class| {
+                move |ui, class| {
                     puffin::profile_scope!("deferred_viewport");
 
                     assert!(
@@ -143,10 +143,10 @@ impl eframe::App for MyApp {
                         "This egui backend doesn't support multiple viewports"
                     );
 
-                    egui::CentralPanel::default().show(ctx, |ui| {
+                    egui::CentralPanel::default().show_inside(ui, |ui| {
                         ui.label("Hello from deferred viewport");
                     });
-                    if ctx.input(|i| i.viewport().close_requested()) {
+                    if ui.input(|i| i.viewport().close_requested()) {
                         // Tell parent to close us.
                         show_deferred_viewport.store(false, Ordering::Relaxed);
                     }
diff --git a/examples/screenshot/Cargo.toml b/examples/screenshot/Cargo.toml
index 983963469..40a8c1c4f 100644
--- a/examples/screenshot/Cargo.toml
+++ b/examples/screenshot/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["René Rössler <rene@freshx.de>", "Andreas Faber <andreas.mfaber@gmail.com"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/screenshot/src/main.rs b/examples/screenshot/src/main.rs
index 0cff59a93..6cb285157 100644
--- a/examples/screenshot/src/main.rs
+++ b/examples/screenshot/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs, clippy::unwrap_used)] // it's an example
 
 use std::sync::Arc;
 
@@ -27,8 +27,8 @@ struct MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             if let Some(screenshot) = self.screenshot.take() {
                 self.texture = Some(ui.ctx().load_texture(
                     "screenshot",
@@ -45,7 +45,7 @@ impl eframe::App for MyApp {
 
                 if ui.button("save to 'top_left.png'").clicked() {
                     self.save_to_file = true;
-                    ctx.send_viewport_cmd(egui::ViewportCommand::Screenshot(Default::default()));
+                    ui.send_viewport_cmd(egui::ViewportCommand::Screenshot(Default::default()));
                 }
 
                 ui.with_layout(egui::Layout::top_down(egui::Align::RIGHT), |ui| {
@@ -54,17 +54,13 @@ impl eframe::App for MyApp {
                             .add(egui::Label::new("hover me!").sense(egui::Sense::hover()))
                             .hovered()
                         {
-                            ctx.set_theme(egui::Theme::Dark);
+                            ui.ctx().set_theme(egui::Theme::Dark);
                         } else {
-                            ctx.set_theme(egui::Theme::Light);
+                            ui.ctx().set_theme(egui::Theme::Light);
                         }
-                        ctx.send_viewport_cmd(
-                            egui::ViewportCommand::Screenshot(Default::default()),
-                        );
+                        ui.send_viewport_cmd(egui::ViewportCommand::Screenshot(Default::default()));
                     } else if ui.button("take screenshot!").clicked() {
-                        ctx.send_viewport_cmd(
-                            egui::ViewportCommand::Screenshot(Default::default()),
-                        );
+                        ui.send_viewport_cmd(egui::ViewportCommand::Screenshot(Default::default()));
                     }
                 });
             });
@@ -96,12 +92,12 @@ impl eframe::App for MyApp {
                             .unwrap();
                             self.save_to_file = false;
                         }
-                        self.screenshot = Some(image.clone());
+                        self.screenshot = Some(Arc::clone(image));
                     }
                 }
             });
 
-            ctx.request_repaint();
+            ui.request_repaint();
         });
     }
 }
diff --git a/examples/serial_windows/Cargo.toml b/examples/serial_windows/Cargo.toml
index 7b1347f01..1263b5fe3 100644
--- a/examples/serial_windows/Cargo.toml
+++ b/examples/serial_windows/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/serial_windows/src/main.rs b/examples/serial_windows/src/main.rs
index 0b2f0e78b..9959f9b01 100644
--- a/examples/serial_windows/src/main.rs
+++ b/examples/serial_windows/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::egui;
 
@@ -43,8 +43,8 @@ struct MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             let label_text = if self.has_next {
                 "When this window is closed the next will be opened after a short delay"
             } else {
@@ -54,7 +54,7 @@ impl eframe::App for MyApp {
 
             if ui.button("Close").clicked() {
                 log::info!("Pressed Close button");
-                ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close);
+                ui.send_viewport_cmd(egui::ViewportCommand::Close);
             }
         });
     }
diff --git a/examples/user_attention/Cargo.toml b/examples/user_attention/Cargo.toml
index 2bd156cc3..084a53b59 100644
--- a/examples/user_attention/Cargo.toml
+++ b/examples/user_attention/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["TicClick <ya@ticclick.ch>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/examples/user_attention/src/main.rs b/examples/user_attention/src/main.rs
index ccec8c92a..c26dd903c 100644
--- a/examples/user_attention/src/main.rs
+++ b/examples/user_attention/src/main.rs
@@ -1,8 +1,8 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
 
 use eframe::{CreationContext, NativeOptions, egui};
-use egui::{Button, CentralPanel, Context, UserAttentionType};
+use egui::{Button, CentralPanel, UserAttentionType};
 
 use std::time::{Duration, SystemTime};
 
@@ -55,12 +55,12 @@ impl Application {
 }
 
 impl eframe::App for Application {
-    fn update(&mut self, ctx: &Context, _frame: &mut eframe::Frame) {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
         if let Some(request_at) = self.request_at
             && request_at < SystemTime::now()
         {
             self.request_at = None;
-            ctx.send_viewport_cmd(egui::ViewportCommand::RequestUserAttention(self.attention));
+            ui.send_viewport_cmd(egui::ViewportCommand::RequestUserAttention(self.attention));
             if self.auto_reset {
                 self.auto_reset = false;
                 self.reset_at = Some(SystemTime::now() + Self::attention_reset_timeout());
@@ -71,12 +71,12 @@ impl eframe::App for Application {
             && reset_at < SystemTime::now()
         {
             self.reset_at = None;
-            ctx.send_viewport_cmd(egui::ViewportCommand::RequestUserAttention(
+            ui.send_viewport_cmd(egui::ViewportCommand::RequestUserAttention(
                 UserAttentionType::Reset,
             ));
         }
 
-        CentralPanel::default().show(ctx, |ui| {
+        CentralPanel::default().show_inside(ui, |ui| {
             ui.vertical(|ui| {
                 ui.horizontal(|ui| {
                     ui.label("Attention type:");
@@ -131,6 +131,6 @@ impl eframe::App for Application {
             });
         });
 
-        ctx.request_repaint_after(Self::repaint_max_timeout());
+        ui.request_repaint_after(Self::repaint_max_timeout());
     }
 }
diff --git a/kittest.toml b/kittest.toml
new file mode 100644
index 000000000..4c9076b66
--- /dev/null
+++ b/kittest.toml
@@ -0,0 +1,10 @@
+output_path = "tests/snapshots"
+
+# Other OSes get a higher threshold so they can still run tests locally without failures due to small rendering
+# differences.
+# To update snapshots, update them via ./scripts/update_snapshots_from_ci.sh or via kitdiff
+threshold = 2.0
+
+[mac]
+# Since our CI runs snapshot tests on macOS, this is our source of truth.
+threshold = 0.6
diff --git a/rust-toolchain b/rust-toolchain
index 20a74465b..ce5b50987 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -5,6 +5,6 @@
 # to the user in the error, instead of "error: invalid channel name '[toolchain]'".
 
 [toolchain]
-channel = "1.88.0"
+channel = "1.92.0"
 components = ["rustfmt", "clippy"]
 targets = ["wasm32-unknown-unknown"]
diff --git a/scripts/check.sh b/scripts/check.sh
index 9c08f3fc6..71dc38386 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -9,7 +9,7 @@ set -x
 # Checks all tests, lints etc.
 # Basically does what the CI does.
 
-# cargo +1.88.0 install --quiet typos-cli
+# cargo +1.92.0 install --quiet typos-cli
 
 export RUSTFLAGS="-D warnings"
 export RUSTDOCFLAGS="-D warnings" # https://github.com/emilk/egui/pull/1454
diff --git a/scripts/clippy_wasm/clippy.toml b/scripts/clippy_wasm/clippy.toml
index d2b8365d9..ba2d71c8f 100644
--- a/scripts/clippy_wasm/clippy.toml
+++ b/scripts/clippy_wasm/clippy.toml
@@ -6,7 +6,7 @@
 # -----------------------------------------------------------------------------
 # Section identical to the root clippy.toml:
 
-msrv = "1.88"
+msrv = "1.92"
 
 allow-unwrap-in-tests = true
 
diff --git a/tests/egui_tests/tests/snapshots/button_shortcut.png b/tests/egui_tests/tests/snapshots/button_shortcut.png
index 7f39196b8..de7d64b4d 100644
--- a/tests/egui_tests/tests/snapshots/button_shortcut.png
+++ b/tests/egui_tests/tests/snapshots/button_shortcut.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5befd84158b582c79a968f36e43c7017187b364824eb4470b048d133e62f9360
-size 1600
+oid sha256:cbf68b6934dae0868bc9cf0891baf5acf110284d297cfa348e756237fca64a28
+size 1564
diff --git a/tests/egui_tests/tests/snapshots/grow_all.png b/tests/egui_tests/tests/snapshots/grow_all.png
index 373889987..3e5208fe0 100644
--- a/tests/egui_tests/tests/snapshots/grow_all.png
+++ b/tests/egui_tests/tests/snapshots/grow_all.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:469a1b1faa71da472c07bcc7103933db9964440a4c49dc596220f070e9b483f5
-size 14375
+oid sha256:2b91ae9e626d885b049d80dc9421275e147f4a3501c21ff4740b0f59d9c2998b
+size 13930
diff --git a/tests/egui_tests/tests/snapshots/hovering_should_preserve_text_format.png b/tests/egui_tests/tests/snapshots/hovering_should_preserve_text_format.png
index 038ce78db..672418f84 100644
--- a/tests/egui_tests/tests/snapshots/hovering_should_preserve_text_format.png
+++ b/tests/egui_tests/tests/snapshots/hovering_should_preserve_text_format.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c83e094b1f0dede0195cc77f5caa3b7d13249364612b03c02f0ef5f2af5e28ad
-size 12512
+oid sha256:3a5669c2c354c6ea42d8eaeb2eb39b65130a87807cbba8382dcc24d59790e794
+size 12181
diff --git a/tests/egui_tests/tests/snapshots/layout/atoms_image.png b/tests/egui_tests/tests/snapshots/layout/atoms_image.png
index bf98d3d2d..200ea6476 100644
--- a/tests/egui_tests/tests/snapshots/layout/atoms_image.png
+++ b/tests/egui_tests/tests/snapshots/layout/atoms_image.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:070638cd5c174200161498123a612e4a58d58517b539e91e289d1e3dd38670bb
-size 388531
+oid sha256:2e236f71e26e1a96acf9cd135b5db3a9cb0df374b87c3e283023dd14df193411
+size 369870
diff --git a/tests/egui_tests/tests/snapshots/layout/atoms_minimal.png b/tests/egui_tests/tests/snapshots/layout/atoms_minimal.png
index ae17dff6a..3c982b37e 100644
--- a/tests/egui_tests/tests/snapshots/layout/atoms_minimal.png
+++ b/tests/egui_tests/tests/snapshots/layout/atoms_minimal.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac8885d6e5325b5f1f0ccb11f185df5c4937b66c80159aa8cf53930f5c8045e2
-size 395599
+oid sha256:096ec8246969f85cfa0cb8d58731be9aaf82b7dac70dc064ec999b1eed25e1ef
+size 368552
diff --git a/tests/egui_tests/tests/snapshots/layout/atoms_multi_grow.png b/tests/egui_tests/tests/snapshots/layout/atoms_multi_grow.png
index 97c181c70..664e23a9b 100644
--- a/tests/egui_tests/tests/snapshots/layout/atoms_multi_grow.png
+++ b/tests/egui_tests/tests/snapshots/layout/atoms_multi_grow.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05b891dd999050150f4cd4226a1c68673b352f04d08d405751d66c698c7711c5
-size 309736
+oid sha256:0813583ca9658b5f27f3585e59f829b71c86061619d7f61a16cc2ccf0906a322
+size 291213
diff --git a/tests/egui_tests/tests/snapshots/layout/button.png b/tests/egui_tests/tests/snapshots/layout/button.png
index e53754f51..21449927d 100644
--- a/tests/egui_tests/tests/snapshots/layout/button.png
+++ b/tests/egui_tests/tests/snapshots/layout/button.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e8a7835e3fd22aafc22b6c536051367e2c27c8607fbe5d8b6b6cf6d0ba3d54f
-size 332771
+oid sha256:e822c2324268d6e6168f9510aa1caec94df38dd0c163afcdecad11f2b1740936
+size 314449
diff --git a/tests/egui_tests/tests/snapshots/layout/button_image.png b/tests/egui_tests/tests/snapshots/layout/button_image.png
index ece6568e9..4ee6cffa2 100644
--- a/tests/egui_tests/tests/snapshots/layout/button_image.png
+++ b/tests/egui_tests/tests/snapshots/layout/button_image.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:59cbb416865f8bede12b449d8e65baddb6949df017face2782a3492de7a058e3
-size 355276
+oid sha256:682dd89e15ee289a87a592c93ac2b9ec3172cd4fedcc02072c0516a9ae9ecd64
+size 335687
diff --git a/tests/egui_tests/tests/snapshots/layout/button_image_shortcut.png b/tests/egui_tests/tests/snapshots/layout/button_image_shortcut.png
index 13f860b83..5b74267e1 100644
--- a/tests/egui_tests/tests/snapshots/layout/button_image_shortcut.png
+++ b/tests/egui_tests/tests/snapshots/layout/button_image_shortcut.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cad07a16b6f0eb8c7647c7d0500ea99c68dddf2eef892b4df48aa20f581e8a85
-size 438837
+oid sha256:e2d22c9e7fd701be1dc1581635cdfa2829e02db9c6f66bf54eac106ebd7344a3
+size 421041
diff --git a/tests/egui_tests/tests/snapshots/layout/checkbox.png b/tests/egui_tests/tests/snapshots/layout/checkbox.png
index 18ebbdb7c..c1e993885 100644
--- a/tests/egui_tests/tests/snapshots/layout/checkbox.png
+++ b/tests/egui_tests/tests/snapshots/layout/checkbox.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4747efdf758e7e8e2d7f3954d9595dfd45d3b4b86923b8ff39c8a96002bb4825
-size 408726
+oid sha256:ee91ad31d625930c55ae4ac41011f2018ef11ba20cefe5686b7338671fd6c32e
+size 389522
diff --git a/tests/egui_tests/tests/snapshots/layout/checkbox_checked.png b/tests/egui_tests/tests/snapshots/layout/checkbox_checked.png
index 127aa7f30..4b972d966 100644
--- a/tests/egui_tests/tests/snapshots/layout/checkbox_checked.png
+++ b/tests/egui_tests/tests/snapshots/layout/checkbox_checked.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a3ca4b3a47ff516f9b05799cdf5f92845ae1e058728d635986cc61b7317f110
-size 437102
+oid sha256:bcb5e0ec12a4bb7aba8ca8b53622fb2c204411ec66d7745bdb06e01bd1ffc731
+size 417596
diff --git a/tests/egui_tests/tests/snapshots/layout/drag_value.png b/tests/egui_tests/tests/snapshots/layout/drag_value.png
index 471d3b867..44bf0bfcb 100644
--- a/tests/egui_tests/tests/snapshots/layout/drag_value.png
+++ b/tests/egui_tests/tests/snapshots/layout/drag_value.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c168f197bec3bc780553db0a47f464f8d76afc606e28e2545ecd91f174abe551
-size 249781
+oid sha256:b2cd4d27748e193d4f46ad7a5be6ff411ad3152b4fd546c0dc98dd3bb5333d93
+size 236090
diff --git a/tests/egui_tests/tests/snapshots/layout/radio.png b/tests/egui_tests/tests/snapshots/layout/radio.png
index 07e20176d..d3930768e 100644
--- a/tests/egui_tests/tests/snapshots/layout/radio.png
+++ b/tests/egui_tests/tests/snapshots/layout/radio.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39f1985a3a975b1b9a179d3b1bd5832e0b4c30d10232babf2e4736f55b43989f
-size 350051
+oid sha256:c15ece11f5c45d4bb89096a4d7146032e109fd9a099f2f37641e2676f7c3e184
+size 327971
diff --git a/tests/egui_tests/tests/snapshots/layout/radio_checked.png b/tests/egui_tests/tests/snapshots/layout/radio_checked.png
index 2163011e6..c2d12eb98 100644
--- a/tests/egui_tests/tests/snapshots/layout/radio_checked.png
+++ b/tests/egui_tests/tests/snapshots/layout/radio_checked.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:18a38fe66d5ac8f2cf5c109f1cd9c29951e5bf8428b6bf0d4587dfc8f8c5c890
-size 370205
+oid sha256:5942409a24177f84e067bcb488d8f976a0a6ad432f9f8603be2fdd4269d79efa
+size 347946
diff --git a/tests/egui_tests/tests/snapshots/layout/selectable_value.png b/tests/egui_tests/tests/snapshots/layout/selectable_value.png
index 2ee7f7d0e..e2ea0c1f4 100644
--- a/tests/egui_tests/tests/snapshots/layout/selectable_value.png
+++ b/tests/egui_tests/tests/snapshots/layout/selectable_value.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bfc900ea84b408564652df487e705311b164d9bd3ff5631c3cebb83b06497a7b
-size 410131
+oid sha256:2c082417d4f65be1efc6c040d2acaf02d899ceaa547ba86f530e1d2e94f4e385
+size 389160
diff --git a/tests/egui_tests/tests/snapshots/layout/selectable_value_selected.png b/tests/egui_tests/tests/snapshots/layout/selectable_value_selected.png
index 7e3dd6319..2a2553a30 100644
--- a/tests/egui_tests/tests/snapshots/layout/selectable_value_selected.png
+++ b/tests/egui_tests/tests/snapshots/layout/selectable_value_selected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9d08ce85c9210a7d9046480ab208040e5ba399c40acaecf5cb43f807534bce9
-size 423523
+oid sha256:7edb1db196e1a6c740503d976f5f8e4dd9d3d4dd07e8391ce77f01f411cae315
+size 402030
diff --git a/tests/egui_tests/tests/snapshots/layout/slider.png b/tests/egui_tests/tests/snapshots/layout/slider.png
index b8cc394c4..b7d9edcd5 100644
--- a/tests/egui_tests/tests/snapshots/layout/slider.png
+++ b/tests/egui_tests/tests/snapshots/layout/slider.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b402195e54bdbd09985e4b30a025083298f29ab747b809fbb864c8dfef0975eb
-size 289714
+oid sha256:e8bd1515d5c4045f4cd1b5d0c4f48469bd7e3ce738a95f741e9254e02ea28185
+size 276004
diff --git a/tests/egui_tests/tests/snapshots/layout/text_edit.png b/tests/egui_tests/tests/snapshots/layout/text_edit.png
index 8b53899dd..379b33806 100644
--- a/tests/egui_tests/tests/snapshots/layout/text_edit.png
+++ b/tests/egui_tests/tests/snapshots/layout/text_edit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5ed6af3a92790e07b71e71637b5d6bb45d55a7d26738d438714aca64d7f4534c
-size 245394
+oid sha256:61dde59ee92a1c22aba7fd8decf62d88d1ed81c10cd969ce65c451185f7ca58b
+size 221618
diff --git a/tests/egui_tests/tests/snapshots/layout/text_edit_clip.png b/tests/egui_tests/tests/snapshots/layout/text_edit_clip.png
index 0c4327b58..ccc29355f 100644
--- a/tests/egui_tests/tests/snapshots/layout/text_edit_clip.png
+++ b/tests/egui_tests/tests/snapshots/layout/text_edit_clip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0f107d95fee9a5fb5fbfd2422452e1820738a84c81774587dbfa8153e91e4c73
-size 414552
+oid sha256:c2a7ad1a4568f0ed7f203453697982603fad8b7e9852b4193216ebff1624671d
+size 384210
diff --git a/tests/egui_tests/tests/snapshots/layout/text_edit_no_clip.png b/tests/egui_tests/tests/snapshots/layout/text_edit_no_clip.png
index ecc6efa8b..9ac2cefee 100644
--- a/tests/egui_tests/tests/snapshots/layout/text_edit_no_clip.png
+++ b/tests/egui_tests/tests/snapshots/layout/text_edit_no_clip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6c1aebada9349f8cb4046469b0a6f9796a21f88b6724bd85cd832a40b8007409
-size 540527
+oid sha256:54a2f4004a71af18ffc42bba723a69855af4913ddedd8185688a59f9967e5a13
+size 509495
diff --git a/tests/egui_tests/tests/snapshots/layout/text_edit_placeholder_clip.png b/tests/egui_tests/tests/snapshots/layout/text_edit_placeholder_clip.png
index 780fec82f..e74e0f928 100644
--- a/tests/egui_tests/tests/snapshots/layout/text_edit_placeholder_clip.png
+++ b/tests/egui_tests/tests/snapshots/layout/text_edit_placeholder_clip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:685de2e33ff26aafa87426bcda18bb9963c2deb2a811cd0aae4450af0e245a06
-size 390735
+oid sha256:2ab3a86f34c5cce033903cd67c1070dcc509e385e62e05358e1329968bfb1e95
+size 363693
diff --git a/tests/egui_tests/tests/snapshots/max_width.png b/tests/egui_tests/tests/snapshots/max_width.png
index a10284911..6534961a8 100644
--- a/tests/egui_tests/tests/snapshots/max_width.png
+++ b/tests/egui_tests/tests/snapshots/max_width.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e2dc33b2d4caddac86dd8649d09ff3d57187a0152240f824a6aa170a35dd719
-size 8570
+oid sha256:ea5546e2e72aa5181edfe260cf5b506a30fea8c3db049c080bafc303223ba95f
+size 8367
diff --git a/tests/egui_tests/tests/snapshots/max_width_and_grow.png b/tests/egui_tests/tests/snapshots/max_width_and_grow.png
index b0d5c134f..54dddf7e8 100644
--- a/tests/egui_tests/tests/snapshots/max_width_and_grow.png
+++ b/tests/egui_tests/tests/snapshots/max_width_and_grow.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36ab2c05eade94dcfe524651a0954c122aea754976af94a73a7efd950055c9eb
-size 8574
+oid sha256:7d65a6c7e855a5476369422577d02f5e2a96814b100d7385f172fa9506189849
+size 8369
diff --git a/tests/egui_tests/tests/snapshots/shrink_first_text.png b/tests/egui_tests/tests/snapshots/shrink_first_text.png
index 7bae217bb..81680a36a 100644
--- a/tests/egui_tests/tests/snapshots/shrink_first_text.png
+++ b/tests/egui_tests/tests/snapshots/shrink_first_text.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c2ba53264abcaa2ee79858ddbd475ed35aa28d146b846cbc080c26911d373ea6
-size 11881
+oid sha256:77ff29a1441d11f3b13ddaf5f6dd5f2c5781bc418887e1c2eabe00679958cba6
+size 11448
diff --git a/tests/egui_tests/tests/snapshots/shrink_last_text.png b/tests/egui_tests/tests/snapshots/shrink_last_text.png
index 821490e52..6f7b28c16 100644
--- a/tests/egui_tests/tests/snapshots/shrink_last_text.png
+++ b/tests/egui_tests/tests/snapshots/shrink_last_text.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:082d80ae144338dce45169c02038b6dc5b75d7b6d93c2a8213ddbb2a8784cc92
-size 12435
+oid sha256:23923d37e4dd848b043c7118e651ddade82c0df180652d8f0dcb829b1b6245d6
+size 12009
diff --git a/tests/egui_tests/tests/snapshots/sides/default_long.png b/tests/egui_tests/tests/snapshots/sides/default_long.png
index 452ed723a..ae862c32d 100644
--- a/tests/egui_tests/tests/snapshots/sides/default_long.png
+++ b/tests/egui_tests/tests/snapshots/sides/default_long.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0e455b08f4674a9326682771f12456a71cc22dfd733ee965fdbbb5582cba0380
-size 8176
+oid sha256:9c970aab8c09558b806c81f57fc1d695992cb9f6e735a3fb2be75997c106a141
+size 8214
diff --git a/tests/egui_tests/tests/snapshots/sides/default_long_fit_contents.png b/tests/egui_tests/tests/snapshots/sides/default_long_fit_contents.png
index ce5996d2f..842f41171 100644
--- a/tests/egui_tests/tests/snapshots/sides/default_long_fit_contents.png
+++ b/tests/egui_tests/tests/snapshots/sides/default_long_fit_contents.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36600579bd2b5a9f255c9d843ccb76e74c622bc7d206962f52e3519e21dc2cfc
-size 8963
+oid sha256:3afbf9e4d598907f088d3f09b1cf2b70c682062f1f4b98aa98b997121f763040
+size 8802
diff --git a/tests/egui_tests/tests/snapshots/sides/default_short.png b/tests/egui_tests/tests/snapshots/sides/default_short.png
index 2d7ccae52..f19a5afbf 100644
--- a/tests/egui_tests/tests/snapshots/sides/default_short.png
+++ b/tests/egui_tests/tests/snapshots/sides/default_short.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ad4ffb19388aeafd11891f487953525c335b0d10bceb455274df532582733c8
-size 1700
+oid sha256:da2b06feee78b808eab7ec4286b5050244b18b056f08dc49c417da8ff08bed0c
+size 1637
diff --git a/tests/egui_tests/tests/snapshots/sides/default_short_fit_contents.png b/tests/egui_tests/tests/snapshots/sides/default_short_fit_contents.png
index 9c5635e19..099d55cb5 100644
--- a/tests/egui_tests/tests/snapshots/sides/default_short_fit_contents.png
+++ b/tests/egui_tests/tests/snapshots/sides/default_short_fit_contents.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a2985caf40b9bacf9f18c84240181f84bea04cc413a009d5ca68c8d544ffa35
-size 1305
+oid sha256:a0a38c58ae7a30256e9491bfeb1155f2df6bba2a656ed9611fa945cbe2ebdc43
+size 1242
diff --git a/tests/egui_tests/tests/snapshots/sides/shrink_left_long.png b/tests/egui_tests/tests/snapshots/sides/shrink_left_long.png
index cc17a1c48..ebf7424c3 100644
--- a/tests/egui_tests/tests/snapshots/sides/shrink_left_long.png
+++ b/tests/egui_tests/tests/snapshots/sides/shrink_left_long.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d36fb3c42b7f74e0b6dd8e73b9f8455e7fac035f5979cb93769e6a3f5453fdbc
-size 7239
+oid sha256:46bca727290bb0fc5a9a28137385e7ee4821390d1594704ce5e0ea089f28dacf
+size 7079
diff --git a/tests/egui_tests/tests/snapshots/sides/shrink_left_long_fit_contents.png b/tests/egui_tests/tests/snapshots/sides/shrink_left_long_fit_contents.png
index ce5996d2f..842f41171 100644
--- a/tests/egui_tests/tests/snapshots/sides/shrink_left_long_fit_contents.png
+++ b/tests/egui_tests/tests/snapshots/sides/shrink_left_long_fit_contents.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36600579bd2b5a9f255c9d843ccb76e74c622bc7d206962f52e3519e21dc2cfc
-size 8963
+oid sha256:3afbf9e4d598907f088d3f09b1cf2b70c682062f1f4b98aa98b997121f763040
+size 8802
diff --git a/tests/egui_tests/tests/snapshots/sides/shrink_left_short.png b/tests/egui_tests/tests/snapshots/sides/shrink_left_short.png
index 2d7ccae52..f19a5afbf 100644
--- a/tests/egui_tests/tests/snapshots/sides/shrink_left_short.png
+++ b/tests/egui_tests/tests/snapshots/sides/shrink_left_short.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ad4ffb19388aeafd11891f487953525c335b0d10bceb455274df532582733c8
-size 1700
+oid sha256:da2b06feee78b808eab7ec4286b5050244b18b056f08dc49c417da8ff08bed0c
+size 1637
diff --git a/tests/egui_tests/tests/snapshots/sides/shrink_left_short_fit_contents.png b/tests/egui_tests/tests/snapshots/sides/shrink_left_short_fit_contents.png
index 9c5635e19..099d55cb5 100644
--- a/tests/egui_tests/tests/snapshots/sides/shrink_left_short_fit_contents.png
+++ b/tests/egui_tests/tests/snapshots/sides/shrink_left_short_fit_contents.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a2985caf40b9bacf9f18c84240181f84bea04cc413a009d5ca68c8d544ffa35
-size 1305
+oid sha256:a0a38c58ae7a30256e9491bfeb1155f2df6bba2a656ed9611fa945cbe2ebdc43
+size 1242
diff --git a/tests/egui_tests/tests/snapshots/sides/shrink_right_long.png b/tests/egui_tests/tests/snapshots/sides/shrink_right_long.png
index 03ca0a66e..d1cfeb533 100644
--- a/tests/egui_tests/tests/snapshots/sides/shrink_right_long.png
+++ b/tests/egui_tests/tests/snapshots/sides/shrink_right_long.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89d9445d7aaff34ace5322af6efc308f261cf5becfdd11aa7fec016236ecfa84
-size 7064
+oid sha256:841f69878a4b9331f8ab4730d212384a82a9de14b9fba0d6964cd3010900132a
+size 6939
diff --git a/tests/egui_tests/tests/snapshots/sides/shrink_right_long_fit_contents.png b/tests/egui_tests/tests/snapshots/sides/shrink_right_long_fit_contents.png
index ce5996d2f..842f41171 100644
--- a/tests/egui_tests/tests/snapshots/sides/shrink_right_long_fit_contents.png
+++ b/tests/egui_tests/tests/snapshots/sides/shrink_right_long_fit_contents.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36600579bd2b5a9f255c9d843ccb76e74c622bc7d206962f52e3519e21dc2cfc
-size 8963
+oid sha256:3afbf9e4d598907f088d3f09b1cf2b70c682062f1f4b98aa98b997121f763040
+size 8802
diff --git a/tests/egui_tests/tests/snapshots/sides/shrink_right_short.png b/tests/egui_tests/tests/snapshots/sides/shrink_right_short.png
index 2d7ccae52..f19a5afbf 100644
--- a/tests/egui_tests/tests/snapshots/sides/shrink_right_short.png
+++ b/tests/egui_tests/tests/snapshots/sides/shrink_right_short.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ad4ffb19388aeafd11891f487953525c335b0d10bceb455274df532582733c8
-size 1700
+oid sha256:da2b06feee78b808eab7ec4286b5050244b18b056f08dc49c417da8ff08bed0c
+size 1637
diff --git a/tests/egui_tests/tests/snapshots/sides/shrink_right_short_fit_contents.png b/tests/egui_tests/tests/snapshots/sides/shrink_right_short_fit_contents.png
index 9c5635e19..099d55cb5 100644
--- a/tests/egui_tests/tests/snapshots/sides/shrink_right_short_fit_contents.png
+++ b/tests/egui_tests/tests/snapshots/sides/shrink_right_short_fit_contents.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a2985caf40b9bacf9f18c84240181f84bea04cc413a009d5ca68c8d544ffa35
-size 1305
+oid sha256:a0a38c58ae7a30256e9491bfeb1155f2df6bba2a656ed9611fa945cbe2ebdc43
+size 1242
diff --git a/tests/egui_tests/tests/snapshots/sides/wrap_left_long.png b/tests/egui_tests/tests/snapshots/sides/wrap_left_long.png
index 48332d65b..be67eaf7a 100644
--- a/tests/egui_tests/tests/snapshots/sides/wrap_left_long.png
+++ b/tests/egui_tests/tests/snapshots/sides/wrap_left_long.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7487a1b77fd2db2493bca7d42128aad7a0049962599c8b5add2b7b25376a37d
-size 9381
+oid sha256:602bc370e3929995c9b17415b513b412e0e12433f2c2b9120c58ea63c747ed79
+size 9184
diff --git a/tests/egui_tests/tests/snapshots/sides/wrap_left_long_fit_contents.png b/tests/egui_tests/tests/snapshots/sides/wrap_left_long_fit_contents.png
index ce5996d2f..842f41171 100644
--- a/tests/egui_tests/tests/snapshots/sides/wrap_left_long_fit_contents.png
+++ b/tests/egui_tests/tests/snapshots/sides/wrap_left_long_fit_contents.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36600579bd2b5a9f255c9d843ccb76e74c622bc7d206962f52e3519e21dc2cfc
-size 8963
+oid sha256:3afbf9e4d598907f088d3f09b1cf2b70c682062f1f4b98aa98b997121f763040
+size 8802
diff --git a/tests/egui_tests/tests/snapshots/sides/wrap_left_short.png b/tests/egui_tests/tests/snapshots/sides/wrap_left_short.png
index 2d7ccae52..f19a5afbf 100644
--- a/tests/egui_tests/tests/snapshots/sides/wrap_left_short.png
+++ b/tests/egui_tests/tests/snapshots/sides/wrap_left_short.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ad4ffb19388aeafd11891f487953525c335b0d10bceb455274df532582733c8
-size 1700
+oid sha256:da2b06feee78b808eab7ec4286b5050244b18b056f08dc49c417da8ff08bed0c
+size 1637
diff --git a/tests/egui_tests/tests/snapshots/sides/wrap_left_short_fit_contents.png b/tests/egui_tests/tests/snapshots/sides/wrap_left_short_fit_contents.png
index 9c5635e19..099d55cb5 100644
--- a/tests/egui_tests/tests/snapshots/sides/wrap_left_short_fit_contents.png
+++ b/tests/egui_tests/tests/snapshots/sides/wrap_left_short_fit_contents.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a2985caf40b9bacf9f18c84240181f84bea04cc413a009d5ca68c8d544ffa35
-size 1305
+oid sha256:a0a38c58ae7a30256e9491bfeb1155f2df6bba2a656ed9611fa945cbe2ebdc43
+size 1242
diff --git a/tests/egui_tests/tests/snapshots/sides/wrap_right_long.png b/tests/egui_tests/tests/snapshots/sides/wrap_right_long.png
index fa65ff9db..cb31d61e1 100644
--- a/tests/egui_tests/tests/snapshots/sides/wrap_right_long.png
+++ b/tests/egui_tests/tests/snapshots/sides/wrap_right_long.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f614fb9b2aba8cc5a6997a519ca92083fb4378a36f335570d9e870159267f40
-size 9495
+oid sha256:b9165daef8acd038a1527192ded0b7cd5d03f235be737308ade467df33b6c8a0
+size 9192
diff --git a/tests/egui_tests/tests/snapshots/sides/wrap_right_long_fit_contents.png b/tests/egui_tests/tests/snapshots/sides/wrap_right_long_fit_contents.png
index ce5996d2f..842f41171 100644
--- a/tests/egui_tests/tests/snapshots/sides/wrap_right_long_fit_contents.png
+++ b/tests/egui_tests/tests/snapshots/sides/wrap_right_long_fit_contents.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36600579bd2b5a9f255c9d843ccb76e74c622bc7d206962f52e3519e21dc2cfc
-size 8963
+oid sha256:3afbf9e4d598907f088d3f09b1cf2b70c682062f1f4b98aa98b997121f763040
+size 8802
diff --git a/tests/egui_tests/tests/snapshots/sides/wrap_right_short.png b/tests/egui_tests/tests/snapshots/sides/wrap_right_short.png
index 2d7ccae52..f19a5afbf 100644
--- a/tests/egui_tests/tests/snapshots/sides/wrap_right_short.png
+++ b/tests/egui_tests/tests/snapshots/sides/wrap_right_short.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6ad4ffb19388aeafd11891f487953525c335b0d10bceb455274df532582733c8
-size 1700
+oid sha256:da2b06feee78b808eab7ec4286b5050244b18b056f08dc49c417da8ff08bed0c
+size 1637
diff --git a/tests/egui_tests/tests/snapshots/sides/wrap_right_short_fit_contents.png b/tests/egui_tests/tests/snapshots/sides/wrap_right_short_fit_contents.png
index 9c5635e19..099d55cb5 100644
--- a/tests/egui_tests/tests/snapshots/sides/wrap_right_short_fit_contents.png
+++ b/tests/egui_tests/tests/snapshots/sides/wrap_right_short_fit_contents.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7a2985caf40b9bacf9f18c84240181f84bea04cc413a009d5ca68c8d544ffa35
-size 1305
+oid sha256:a0a38c58ae7a30256e9491bfeb1155f2df6bba2a656ed9611fa945cbe2ebdc43
+size 1242
diff --git a/tests/egui_tests/tests/snapshots/size_max_size.png b/tests/egui_tests/tests/snapshots/size_max_size.png
index 9c5ac8be3..12b526287 100644
--- a/tests/egui_tests/tests/snapshots/size_max_size.png
+++ b/tests/egui_tests/tests/snapshots/size_max_size.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5230bd00a43990b30e523528b609e04916dab3cf87a59d56e39dcd5926f47aa5
-size 8838
+oid sha256:f2d9b0884adb89f598dd0c7eb421c0c8e8bcdaa1cbca02f4646c777711a005c2
+size 8655
diff --git a/tests/egui_tests/tests/snapshots/text_edit_rtl_0.png b/tests/egui_tests/tests/snapshots/text_edit_rtl_0.png
index d93540222..440e1e818 100644
--- a/tests/egui_tests/tests/snapshots/text_edit_rtl_0.png
+++ b/tests/egui_tests/tests/snapshots/text_edit_rtl_0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:336581facb1ec989a43291ed76bd8ddb552c46137a75601f466e6dc4dae77278
-size 2395
+oid sha256:ddd940c1ed581471b1448c04296d48b829939025980479a122edfe9b9bd0321e
+size 2321
diff --git a/tests/egui_tests/tests/snapshots/text_edit_rtl_1.png b/tests/egui_tests/tests/snapshots/text_edit_rtl_1.png
index 2ae957da9..d0f6cb316 100644
--- a/tests/egui_tests/tests/snapshots/text_edit_rtl_1.png
+++ b/tests/egui_tests/tests/snapshots/text_edit_rtl_1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b0684c53a20eaa90a9dccef8ac3eaa2a6eede7c770e7bbbba6d995f43584d99
-size 2353
+oid sha256:a53c074ad4cb1f0e38d6d7144cb661a2b68d809203bfca636ff5a60d8582a651
+size 2288
diff --git a/tests/egui_tests/tests/snapshots/text_edit_rtl_2.png b/tests/egui_tests/tests/snapshots/text_edit_rtl_2.png
index b9235740d..e618bf8dd 100644
--- a/tests/egui_tests/tests/snapshots/text_edit_rtl_2.png
+++ b/tests/egui_tests/tests/snapshots/text_edit_rtl_2.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:38f325f2e741f18f897502c176f9a7efe276e9adab41a144511121dd8b8a3073
-size 3079
+oid sha256:0a9be0d364374237ea9c3cbfc3703f47f4345d81cecbdcf6c4b49688c4c282ad
+size 2982
diff --git a/tests/egui_tests/tests/snapshots/visuals/button.png b/tests/egui_tests/tests/snapshots/visuals/button.png
index 4204dd1d3..ffe31f06a 100644
--- a/tests/egui_tests/tests/snapshots/visuals/button.png
+++ b/tests/egui_tests/tests/snapshots/visuals/button.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6d0c3773bc3698fbd1bd1eb1aa1ed45938d5cb94696bfcec56e4e7e865871baf
-size 11143
+oid sha256:ec81a46d44402d5e709d825e42de99a2f7b9707f77dc5f94e277ae9fd77b6fae
+size 10903
diff --git a/tests/egui_tests/tests/snapshots/visuals/button_image.png b/tests/egui_tests/tests/snapshots/visuals/button_image.png
index 5d1e74292..162712f09 100644
--- a/tests/egui_tests/tests/snapshots/visuals/button_image.png
+++ b/tests/egui_tests/tests/snapshots/visuals/button_image.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9764ab5549e0775380b1db3c9a9a1d47c6520bcd5b8781f922e97e3524c362aa
-size 12133
+oid sha256:a6a3eb59ff208d106c3808265d4bef10d80b634f74d99476c3541d997b30bc56
+size 11967
diff --git a/tests/egui_tests/tests/snapshots/visuals/button_image_shortcut.png b/tests/egui_tests/tests/snapshots/visuals/button_image_shortcut.png
index b2f5646d3..4027ef68b 100644
--- a/tests/egui_tests/tests/snapshots/visuals/button_image_shortcut.png
+++ b/tests/egui_tests/tests/snapshots/visuals/button_image_shortcut.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d0c7d4b161f7a1f9cadb3e285edcd08588b9e47e10c5579183c824ae4e7be1b
-size 15170
+oid sha256:176df42437cc8f6f97bba4b0f9bea72c9359f69e66abfa289d0701814f8ad258
+size 14746
diff --git a/tests/egui_tests/tests/snapshots/visuals/button_image_shortcut_selected.png b/tests/egui_tests/tests/snapshots/visuals/button_image_shortcut_selected.png
index 3f20c4379..b742787c0 100644
--- a/tests/egui_tests/tests/snapshots/visuals/button_image_shortcut_selected.png
+++ b/tests/egui_tests/tests/snapshots/visuals/button_image_shortcut_selected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65359fcb0f01627876e697684b185c60812dd1591b0f42174673712939e2f193
-size 14852
+oid sha256:5003e67baed533e485448b953b616804047b9da25d2758b288c96e65d7f37b0f
+size 14323
diff --git a/tests/egui_tests/tests/snapshots/visuals/checkbox.png b/tests/egui_tests/tests/snapshots/visuals/checkbox.png
index 2145ceee7..29f33406f 100644
--- a/tests/egui_tests/tests/snapshots/visuals/checkbox.png
+++ b/tests/egui_tests/tests/snapshots/visuals/checkbox.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:68347d7eb452a6f30fa93778f9ebd17f20c1425426472d3ebe4c8b55fc0ba8ea
-size 13774
+oid sha256:929d06a271e98f0c0a2a72fc63648693b22885f80beda0a7baa5858ceb6f952b
+size 13507
diff --git a/tests/egui_tests/tests/snapshots/visuals/checkbox_checked.png b/tests/egui_tests/tests/snapshots/visuals/checkbox_checked.png
index ec012113b..145020884 100644
--- a/tests/egui_tests/tests/snapshots/visuals/checkbox_checked.png
+++ b/tests/egui_tests/tests/snapshots/visuals/checkbox_checked.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2c323b3b530be2c4ff195e369e86df49ef28de0696fb33a74361d9dbd95e37ae
-size 14889
+oid sha256:880881761251b70d2c841b8aef3895e95a5eea499d2ff554d3f68b888fb167f9
+size 14571
diff --git a/tests/egui_tests/tests/snapshots/visuals/drag_value.png b/tests/egui_tests/tests/snapshots/visuals/drag_value.png
index 05f63136b..2b04df5a5 100644
--- a/tests/egui_tests/tests/snapshots/visuals/drag_value.png
+++ b/tests/egui_tests/tests/snapshots/visuals/drag_value.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a48d2014ed6295d61f3200389315662b89e7efba27a93fded255cce7bd21e05
-size 8675
+oid sha256:3d42e002c3fd34f96d58ddfd4d2f91cf1ac7755ff71b5da315be4bee6bf00e03
+size 8411
diff --git a/tests/egui_tests/tests/snapshots/visuals/radio.png b/tests/egui_tests/tests/snapshots/visuals/radio.png
index 298841d6a..4da91f2b3 100644
--- a/tests/egui_tests/tests/snapshots/visuals/radio.png
+++ b/tests/egui_tests/tests/snapshots/visuals/radio.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdaeee74db8c9527e6656b4a3026ed18cb58c4761f1155768a456d6d58dc79e2
-size 12549
+oid sha256:d54388fca5de500aafde4efc73df5cc15a72ce5443c9f527ffb70430c08e60e9
+size 11871
diff --git a/tests/egui_tests/tests/snapshots/visuals/radio_checked.png b/tests/egui_tests/tests/snapshots/visuals/radio_checked.png
index 02590ce3d..f91c4a549 100644
--- a/tests/egui_tests/tests/snapshots/visuals/radio_checked.png
+++ b/tests/egui_tests/tests/snapshots/visuals/radio_checked.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3dfbfd35264e4d35a594c72ef0fb9575b090301e112a98228d3070fa85aa4e42
-size 13240
+oid sha256:8aec08c983f71cf4fa81e88ba1751de1253d9ba6d28692b824912ad4764471bc
+size 12563
diff --git a/tests/egui_tests/tests/snapshots/visuals/selectable_value.png b/tests/egui_tests/tests/snapshots/visuals/selectable_value.png
index 85cb2a451..88069ed9d 100644
--- a/tests/egui_tests/tests/snapshots/visuals/selectable_value.png
+++ b/tests/egui_tests/tests/snapshots/visuals/selectable_value.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cbaa88e2769bd9dbffa9b3ced36585c00b4ad6ca91ae61a6becc63a495a812fc
-size 14116
+oid sha256:79f8fd0df269a45ee5a8cb6ddd1501a562e92de2bec15ab28016ceb2834c3c90
+size 13908
diff --git a/tests/egui_tests/tests/snapshots/visuals/selectable_value_selected.png b/tests/egui_tests/tests/snapshots/visuals/selectable_value_selected.png
index 8f0cfb4a9..2ab268abb 100644
--- a/tests/egui_tests/tests/snapshots/visuals/selectable_value_selected.png
+++ b/tests/egui_tests/tests/snapshots/visuals/selectable_value_selected.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b1bac7bec0c22e9530ef2428c4233be7a1c3554c653b6344a2d7b981c5455920
-size 14142
+oid sha256:966c55de5786c1ad0165e0cca29481d51770e23173b5dda14e40013669d3db6d
+size 13889
diff --git a/tests/egui_tests/tests/snapshots/visuals/slider.png b/tests/egui_tests/tests/snapshots/visuals/slider.png
index fd9b15b73..8a1b9cf30 100644
--- a/tests/egui_tests/tests/snapshots/visuals/slider.png
+++ b/tests/egui_tests/tests/snapshots/visuals/slider.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3667467ff1cf2ce210ec1e1555b40bba827008c5ee40d25ccaf082d2718c6d77
-size 10144
+oid sha256:ff67666113e08d60f1d2310a3a5fca30316953cdabfcc4b259ee816eb498f209
+size 9900
diff --git a/tests/egui_tests/tests/snapshots/visuals/text_edit.png b/tests/egui_tests/tests/snapshots/visuals/text_edit.png
index 649a05fc4..4de5e3bd0 100644
--- a/tests/egui_tests/tests/snapshots/visuals/text_edit.png
+++ b/tests/egui_tests/tests/snapshots/visuals/text_edit.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d06b03948190e2d6408c339b97ec3f3e2104ffc7da61f5935b7df8bb89c9d7aa
-size 8813
+oid sha256:8d259d113aa23089992b04f19e71c743272dda3fc9baa9612565158f15ace57e
+size 8159
diff --git a/tests/egui_tests/tests/snapshots/visuals/text_edit_clip.png b/tests/egui_tests/tests/snapshots/visuals/text_edit_clip.png
index 70c4bfe8f..192fa8f74 100644
--- a/tests/egui_tests/tests/snapshots/visuals/text_edit_clip.png
+++ b/tests/egui_tests/tests/snapshots/visuals/text_edit_clip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2be8ebcc7d8cc7b3824ae27c57969c0d1bc2d5affb8f3f9df687fb3d1860280
-size 11567
+oid sha256:a1e56f1b6970c14830d8869f4d8cacfed821ec2b3aab7033b1bfd213a864da79
+size 10959
diff --git a/tests/egui_tests/tests/snapshots/visuals/text_edit_no_clip.png b/tests/egui_tests/tests/snapshots/visuals/text_edit_no_clip.png
index a5bda4b8f..dbfa8856a 100644
--- a/tests/egui_tests/tests/snapshots/visuals/text_edit_no_clip.png
+++ b/tests/egui_tests/tests/snapshots/visuals/text_edit_no_clip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:934263e4413e48ea3abf8b53e213f3a61459b697b30cf05436e2d2e6a3d48e3c
-size 22356
+oid sha256:b1533e0ebaf0bd161e651d21ed81d36e8f0be06003357d9e5091ce2db4df5b7d
+size 21517
diff --git a/tests/egui_tests/tests/snapshots/visuals/text_edit_placeholder_clip.png b/tests/egui_tests/tests/snapshots/visuals/text_edit_placeholder_clip.png
index e49bb4414..decd09bf9 100644
--- a/tests/egui_tests/tests/snapshots/visuals/text_edit_placeholder_clip.png
+++ b/tests/egui_tests/tests/snapshots/visuals/text_edit_placeholder_clip.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:eb3230e609246415501d89984bb59ee1dad1241b8054009e7a5108efe3965904
-size 10880
+oid sha256:493649ea09351835147aa6cc800858939dd44beafe37adc488b63b291d58e3b3
+size 10302
diff --git a/tests/egui_tests/tests/test_widgets.rs b/tests/egui_tests/tests/test_widgets.rs
index 440b1939b..a53ad4a0c 100644
--- a/tests/egui_tests/tests/test_widgets.rs
+++ b/tests/egui_tests/tests/test_widgets.rs
@@ -1,3 +1,5 @@
+#![expect(clippy::unwrap_used)] // it's a test
+
 use egui::accesskit::Role;
 use egui::load::SizedTexture;
 use egui::{
@@ -339,7 +341,7 @@ impl<'a> VisualTests<'a> {
 
         f(&mut harness);
 
-        harness.step();
+        harness.run();
 
         let image = harness.render().expect("Failed to render harness");
 
diff --git a/tests/test_egui_extras_compilation/Cargo.toml b/tests/test_egui_extras_compilation/Cargo.toml
index 1e812f1e4..3598362a9 100644
--- a/tests/test_egui_extras_compilation/Cargo.toml
+++ b/tests/test_egui_extras_compilation/Cargo.toml
@@ -3,7 +3,7 @@ name = "test_egui_extras_compilation"
 version = "0.1.0"
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/tests/test_inline_glow_paint/Cargo.toml b/tests/test_inline_glow_paint/Cargo.toml
index 6a72df652..090ccae4c 100644
--- a/tests/test_inline_glow_paint/Cargo.toml
+++ b/tests/test_inline_glow_paint/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/tests/test_inline_glow_paint/src/main.rs b/tests/test_inline_glow_paint/src/main.rs
index 3245af348..576934bf3 100644
--- a/tests/test_inline_glow_paint/src/main.rs
+++ b/tests/test_inline_glow_paint/src/main.rs
@@ -1,6 +1,10 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
-#![allow(clippy::undocumented_unsafe_blocks)]
+#![expect(
+    // it's a test:
+    clippy::undocumented_unsafe_blocks,
+    clippy::unwrap_used,
+    rustdoc::missing_crate_level_docs
+)]
 
 // Test that we can paint to the screen using glow directly.
 
@@ -25,7 +29,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 struct MyTestApp {}
 
 impl eframe::App for MyTestApp {
-    fn update(&mut self, ctx: &egui::Context, frame: &mut eframe::Frame) {
+    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
         use glow::HasContext as _;
         let gl = frame.gl().unwrap();
 
@@ -37,7 +41,7 @@ impl eframe::App for MyTestApp {
             gl.clear(glow::COLOR_BUFFER_BIT);
         }
 
-        egui::Window::new("Floating Window").show(ctx, |ui| {
+        egui::Window::new("Floating Window").show(ui.ctx(), |ui| {
             ui.label("The background should be purple.");
         });
     }
diff --git a/tests/test_size_pass/Cargo.toml b/tests/test_size_pass/Cargo.toml
index a9cd1494c..56e2c7f47 100644
--- a/tests/test_size_pass/Cargo.toml
+++ b/tests/test_size_pass/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/tests/test_size_pass/src/main.rs b/tests/test_size_pass/src/main.rs
index ce645eb98..814def92b 100644
--- a/tests/test_size_pass/src/main.rs
+++ b/tests/test_size_pass/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's a test
+#![expect(rustdoc::missing_crate_level_docs)] // it's a test
 
 use eframe::egui;
 
@@ -7,9 +7,9 @@ fn main() -> eframe::Result {
     env_logger::init(); // Use `RUST_LOG=debug` to see logs.
 
     let options = eframe::NativeOptions::default();
-    eframe::run_simple_native("My egui App", options, move |ctx, _frame| {
+    eframe::run_ui_native("My egui App", options, move |ui, _frame| {
         // A bottom panel to force the tooltips to consider if the fit below or under the widget:
-        egui::Panel::bottom("bottom").show(ctx, |ui| {
+        egui::Panel::bottom("bottom").show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 ui.vertical(|ui| {
                     ui.label("Single tooltips:");
@@ -33,10 +33,10 @@ fn main() -> eframe::Result {
             });
         });
 
-        egui::CentralPanel::default().show(ctx, |ui| {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.horizontal(|ui| {
                 if ui.button("Reset egui memory").clicked() {
-                    ctx.memory_mut(|mem| *mem = Default::default());
+                    ui.memory_mut(|mem| *mem = Default::default());
                 }
 
                 ui.with_layout(egui::Layout::right_to_left(egui::Align::BOTTOM), |ui| {
@@ -95,8 +95,7 @@ fn main() -> eframe::Result {
                 .selected_text("ComboBox")
                 .width(100.0)
                 .show_ui(ui, |ui| {
-                    ui.ctx()
-                        .debug_painter()
+                    ui.debug_painter()
                         .debug_rect(ui.max_rect(), egui::Color32::RED, "");
 
                     ui.label("Hello");
diff --git a/tests/test_ui_stack/Cargo.toml b/tests/test_ui_stack/Cargo.toml
index c0e5ffbd2..ec1b17689 100644
--- a/tests/test_ui_stack/Cargo.toml
+++ b/tests/test_ui_stack/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Antoine Beyeler <abeyeler@gmail.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/tests/test_ui_stack/src/main.rs b/tests/test_ui_stack/src/main.rs
index bb2158297..a2ce967b8 100644
--- a/tests/test_ui_stack/src/main.rs
+++ b/tests/test_ui_stack/src/main.rs
@@ -1,5 +1,7 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(rustdoc::missing_crate_level_docs)] // it's an example
+
+use std::sync::Arc;
 
 use eframe::egui;
 use eframe::egui::{Rangef, Shape, UiKind};
@@ -31,10 +33,10 @@ struct MyApp {
 }
 
 impl eframe::App for MyApp {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        ctx.all_styles_mut(|style| style.interaction.tooltip_delay = 0.0);
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        ui.all_styles_mut(|style| style.interaction.tooltip_delay = 0.0);
 
-        egui::Panel::left("side_panel_left").show(ctx, |ui| {
+        egui::Panel::left("side_panel_left").show_inside(ui, |ui| {
             ui.heading("Information");
             ui.label(
                 "This is a demo/test environment of the `UiStack` feature. The tables display \
@@ -49,7 +51,7 @@ impl eframe::App for MyApp {
             ui.checkbox(&mut self.show_memory, "📝 Memory");
             ui.add_space(10.0);
             if ui.button("Reset egui memory").clicked() {
-                ctx.memory_mut(|mem| *mem = Default::default());
+                ui.memory_mut(|mem| *mem = Default::default());
             }
             ui.add_space(20.0);
 
@@ -82,7 +84,7 @@ impl eframe::App for MyApp {
             });
         });
 
-        egui::Panel::right("side_panel_right").show(ctx, |ui| {
+        egui::Panel::right("side_panel_right").show_inside(ui, |ui| {
             egui::ScrollArea::both().auto_shrink(false).show(ui, |ui| {
                 stack_ui(ui);
 
@@ -92,7 +94,7 @@ impl eframe::App for MyApp {
             });
         });
 
-        egui::CentralPanel::default().show(ctx, |ui| {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             egui::ScrollArea::both().auto_shrink(false).show(ui, |ui| {
                 ui.label("stack here:");
                 stack_ui(ui);
@@ -158,7 +160,7 @@ impl eframe::App for MyApp {
                             row.col(|ui| {
                                 ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
                                 ui.label("See stack below");
-                                cell_stack = Some(ui.stack().clone());
+                                cell_stack = Some(Arc::clone(ui.stack()));
                             });
                         });
                     });
@@ -172,7 +174,7 @@ impl eframe::App for MyApp {
 
         egui::Panel::bottom("bottom_panel")
             .resizable(true)
-            .show(ctx, |ui| {
+            .show_inside(ui, |ui| {
                 egui::ScrollArea::vertical()
                     .auto_shrink(false)
                     .show(ui, |ui| {
@@ -186,30 +188,31 @@ impl eframe::App for MyApp {
 
         egui::Window::new("Window")
             .pivot(egui::Align2::RIGHT_TOP)
-            .show(ctx, |ui| {
+            .show(ui.ctx(), |ui| {
                 full_span_widget(ui, false);
                 ui.add_space(20.0);
                 stack_ui(ui);
             });
 
+        let ctx = ui.ctx().clone();
         egui::Window::new("🔧 Settings")
             .open(&mut self.show_settings)
             .vscroll(true)
-            .show(ctx, |ui| {
+            .show(&ctx, |ui| {
                 ctx.settings_ui(ui);
             });
 
         egui::Window::new("🔍 Inspection")
             .open(&mut self.show_inspection)
             .vscroll(true)
-            .show(ctx, |ui| {
+            .show(&ctx, |ui| {
                 ctx.inspection_ui(ui);
             });
 
         egui::Window::new("📝 Memory")
             .open(&mut self.show_memory)
             .resizable(false)
-            .show(ctx, |ui| {
+            .show(&ctx, |ui| {
                 ctx.memory_ui(ui);
             });
     }
@@ -252,7 +255,7 @@ fn full_span_horizontal_range(ui_stack: &egui::UiStack) -> Rangef {
 }
 
 fn stack_ui(ui: &mut egui::Ui) {
-    let ui_stack = ui.stack().clone();
+    let ui_stack = Arc::clone(ui.stack());
     ui.scope(|ui| {
         stack_ui_impl(ui, &ui_stack);
     });
@@ -297,12 +300,12 @@ fn stack_ui_impl(ui: &mut egui::Ui, stack: &egui::UiStack) {
                         body.row(20.0, |mut row| {
                             row.col(|ui| {
                                 if ui.label(format!("{:?}", node.id)).hovered() {
-                                    ui.ctx().debug_painter().debug_rect(
+                                    ui.debug_painter().debug_rect(
                                         node.max_rect,
                                         egui::Color32::GREEN,
                                         "max",
                                     );
-                                    ui.ctx().debug_painter().circle_filled(
+                                    ui.debug_painter().circle_filled(
                                         node.min_rect.min,
                                         2.0,
                                         egui::Color32::RED,
diff --git a/tests/test_viewports/Cargo.toml b/tests/test_viewports/Cargo.toml
index ae396709d..0c73b6d11 100644
--- a/tests/test_viewports/Cargo.toml
+++ b/tests/test_viewports/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["konkitoman"]
 license = "MIT OR Apache-2.0"
 edition = "2024"
-rust-version = "1.88"
+rust-version = "1.92"
 publish = false
 
 [lints]
diff --git a/tests/test_viewports/src/main.rs b/tests/test_viewports/src/main.rs
index a862dbd32..3330c1313 100644
--- a/tests/test_viewports/src/main.rs
+++ b/tests/test_viewports/src/main.rs
@@ -1,5 +1,5 @@
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] // hide console window on Windows in release
-#![allow(rustdoc::missing_crate_level_docs)] // it's an example
+#![expect(clippy::unwrap_used, rustdoc::missing_crate_level_docs)] // it's a test
 
 use std::sync::Arc;
 
@@ -76,35 +76,29 @@ impl ViewportState {
 
         if immediate {
             let mut vp_state = vp_state.write();
-            ctx.show_viewport_immediate(vp_id, viewport, move |ctx, class| {
-                if ctx.input(|i| i.viewport().close_requested()) {
+            ctx.show_viewport_immediate(vp_id, viewport, move |ui, class| {
+                if ui.input(|i| i.viewport().close_requested()) {
                     vp_state.visible = false;
                 }
-                show_as_popup(ctx, class, &title, vp_id.into(), |ui: &mut egui::Ui| {
+                show_as_popup(ui, class, |ui: &mut egui::Ui| {
                     generic_child_ui(ui, &mut vp_state, close_button);
                 });
             });
         } else {
             let count = Arc::new(RwLock::new(0));
-            ctx.show_viewport_deferred(vp_id, viewport, move |ctx, class| {
+            ctx.show_viewport_deferred(vp_id, viewport, move |ui, class| {
                 let mut vp_state = vp_state.write();
-                if ctx.input(|i| i.viewport().close_requested()) {
+                if ui.input(|i| i.viewport().close_requested()) {
                     vp_state.visible = false;
                 }
-                let count = count.clone();
-                show_as_popup(
-                    ctx,
-                    class,
-                    &title,
-                    vp_id.into(),
-                    move |ui: &mut egui::Ui| {
-                        let current_count = *count.read();
-                        ui.label(format!("Callback has been reused {current_count} times"));
-                        *count.write() += 1;
+                let count = Arc::clone(&count);
+                show_as_popup(ui, class, move |ui: &mut egui::Ui| {
+                    let current_count = *count.read();
+                    ui.label(format!("Callback has been reused {current_count} times"));
+                    *count.write() += 1;
 
-                        generic_child_ui(ui, &mut vp_state, close_button);
-                    },
-                );
+                    generic_child_ui(ui, &mut vp_state, close_button);
+                });
             });
         }
     }
@@ -159,18 +153,18 @@ impl Default for App {
 }
 
 impl eframe::App for App {
-    fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        egui::CentralPanel::default().show(ctx, |ui| {
+    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+        egui::CentralPanel::default().show_inside(ui, |ui| {
             ui.heading("Root viewport");
             {
-                let mut embed_viewports = ctx.embed_viewports();
+                let mut embed_viewports = ui.embed_viewports();
                 ui.checkbox(&mut embed_viewports, "Embed all viewports");
                 if ui.button("Open all viewports").clicked() {
                     for viewport in &self.top {
                         viewport.write().set_visible_recursive(true);
                     }
                 }
-                ctx.set_embed_viewports(embed_viewports);
+                ui.set_embed_viewports(embed_viewports);
             }
             ui.checkbox(&mut self.close_button, "with close button");
             generic_ui(ui, &self.top, self.close_button);
@@ -180,17 +174,15 @@ impl eframe::App for App {
 
 /// This will make the content as a popup if cannot has his own native window
 fn show_as_popup(
-    ctx: &egui::Context,
+    ui: &mut egui::Ui,
     class: egui::ViewportClass,
-    title: &str,
-    id: Id,
     content: impl FnOnce(&mut egui::Ui),
 ) {
-    if class == egui::ViewportClass::Embedded {
-        // Not a real viewport
-        egui::Window::new(title).id(id).show(ctx, content);
+    if class == egui::ViewportClass::EmbeddedWindow {
+        // Not a real viewport - already has a frame
+        content(ui);
     } else {
-        egui::CentralPanel::default().show(ctx, content);
+        egui::CentralPanel::default().show_inside(ui, content);
     }
 }
 
@@ -199,7 +191,7 @@ fn generic_child_ui(ui: &mut egui::Ui, vp_state: &mut ViewportState, close_butto
         ui.label("Title:");
         if ui.text_edit_singleline(&mut vp_state.title).changed() {
             // Title changes
-            ui.ctx().send_viewport_cmd_to(
+            ui.send_viewport_cmd_to(
                 vp_state.id,
                 egui::ViewportCommand::Title(vp_state.title.clone()),
             );
@@ -297,7 +289,7 @@ fn generic_ui(ui: &mut egui::Ui, children: &[Arc<RwLock<ViewportState>>], close_
                 *visible
             };
             if visible {
-                ViewportState::show(child.clone(), &ctx, close_button);
+                ViewportState::show(Arc::clone(child), &ctx, close_button);
             }
         }
     }
@@ -339,7 +331,7 @@ fn drag_and_drop_test(ui: &mut egui::Ui) {
         }
 
         fn insert(&mut self, container: Id, col: usize, value: impl Into<String>) {
-            assert!(col <= COLS, "The coll should be less then: {COLS}");
+            assert!(col < COLS, "The coll should be less than: {COLS}");
 
             let value: String = value.into();
             let id = Id::new(format!("%{}% {}", self.counter, &value));
@@ -355,7 +347,7 @@ fn drag_and_drop_test(ui: &mut egui::Ui) {
         }
 
         fn cols(&self, container: Id, col: usize) -> Vec<(Id, String)> {
-            assert!(col <= COLS, "The col should be less then: {COLS}");
+            assert!(col < COLS, "The col should be less than: {COLS}");
             let container_data = &self.containers_data[&container];
             container_data[col]
                 .iter()
@@ -368,7 +360,7 @@ fn drag_and_drop_test(ui: &mut egui::Ui) {
             let Some(id) = self.is_dragged.take() else {
                 return;
             };
-            assert!(col <= COLS, "The col should be less then: {COLS}");
+            assert!(col < COLS, "The col should be less than: {COLS}");
 
             // Should be a better way to do this!
             #[expect(clippy::iter_over_hash_type)]
@@ -430,11 +422,11 @@ fn drag_source<R>(
         // Check for drags:
         let response = ui.interact(res.response.rect, id, egui::Sense::drag());
         if response.hovered() {
-            ui.ctx().set_cursor_icon(egui::CursorIcon::Grab);
+            ui.set_cursor_icon(egui::CursorIcon::Grab);
         }
         res
     } else {
-        ui.ctx().set_cursor_icon(egui::CursorIcon::Grabbing);
+        ui.set_cursor_icon(egui::CursorIcon::Grabbing);
 
         // Paint the body to a new layer:
         let layer_id = egui::LayerId::new(egui::Order::Tooltip, id);
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 0f16c5454..81471d622 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -1,7 +1,6 @@
 //! Helper crate for running scripts within the `egui` repo
 
-#![allow(clippy::print_stdout)]
-#![allow(clippy::print_stderr)]
+#![expect(clippy::print_stderr, clippy::print_stdout)]
 #![allow(clippy::exit)]
 
 mod deny;
diff --git a/xtask/src/utils.rs b/xtask/src/utils.rs
index b45295aea..f6bf09828 100644
--- a/xtask/src/utils.rs
+++ b/xtask/src/utils.rs
@@ -1,3 +1,5 @@
+#![expect(clippy::unwrap_used)]
+
 use std::{
     env,
     io::{self, Write as _},