diff --git a/.github/workflows/cargo_machete.yml b/.github/workflows/cargo_machete.yml
deleted file mode 100644
index 1dc162e56..000000000
--- a/.github/workflows/cargo_machete.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Cargo Machete
-
-on: [push, pull_request]
-
-jobs:
-  cargo-machete:
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    steps:
-      - uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: 1.92
-      - name: Machete install
-        ## The official cargo-machete action
-        uses: bnjbvr/cargo-machete@v0.9.1
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Machete Check
-        run: cargo machete
diff --git a/.github/workflows/cargo_shear.yml b/.github/workflows/cargo_shear.yml
new file mode 100644
index 000000000..734abacb5
--- /dev/null
+++ b/.github/workflows/cargo_shear.yml
@@ -0,0 +1,25 @@
+# Looks for unused crates.
+name: Cargo Shear
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  cargo-shear:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Cargo Shear
+        uses: taiki-e/install-action@v2.48.7
+        with:
+          tool: cargo-shear@1.11.2
+
+      - name: Run Cargo Shear
+        run: |
+          cargo shear
diff --git a/.github/workflows/enforce_branch_name.yml b/.github/workflows/enforce_branch_name.yml
index 8c2b28d37..b9df4030d 100644
--- a/.github/workflows/enforce_branch_name.yml
+++ b/.github/workflows/enforce_branch_name.yml
@@ -4,17 +4,23 @@ on:
   pull_request_target:
     types: [opened, reopened, synchronize]
 
+permissions:
+  issues: write
+
 jobs:
   check-source-branch:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
       - name: Check PR source branch
+        env:
+          IS_FORK: ${{ github.event.pull_request.head.repo.fork }}
+          HEAD_REF: ${{ github.event.pull_request.head.ref }}
         run: |
           # Check if PR is from a fork
-          if [[ "${{ github.event.pull_request.head.repo.fork }}" == "true" ]]; then
+          if [[ "$IS_FORK" == "true" ]]; then
             # Check if PR is from the master/main branch of a fork
-            if [[ "${{ github.event.pull_request.head.ref }}" == "master" || "${{ github.event.pull_request.head.ref }}" == "main" ]]; then
+            if [[ "$HEAD_REF" == "master" || "$HEAD_REF" == "main" ]]; then
               echo "ERROR: Pull requests from the master/main branch of forks are not allowed, because it prevents maintainers from contributing to your PR"
               echo "Please create a feature branch in your fork and submit the PR from that branch instead."
               exit 1
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 9018d251b..2122e5b99 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -94,7 +94,7 @@ jobs:
       - name: wasm-bindgen
         uses: jetli/wasm-bindgen-action@v0.1.0
         with:
-          version: "0.2.100" # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml
+          version: "0.2.108" # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml
 
       - run: ./scripts/wasm_bindgen_check.sh --skip-setup
 
diff --git a/.github/workflows/taplo.yml b/.github/workflows/taplo.yml
new file mode 100644
index 000000000..11a7b978a
--- /dev/null
+++ b/.github/workflows/taplo.yml
@@ -0,0 +1,25 @@
+# Checks that all TOML files are formatted with taplo.
+name: Taplo
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  taplo:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Taplo
+        uses: taiki-e/install-action@v2.48.7
+        with:
+          tool: taplo-cli@0.9.3
+
+      - name: Check TOML formatting
+        run: |
+          taplo fmt --check
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 12010e287..4bae7a734 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,146 @@ 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.34.2 - 2026-05-04
+### ⭐ Added
+* Add regression test for O(n²) word boundary scan [#8077](https://github.com/emilk/egui/pull/8077) by [@hallyhaa](https://github.com/hallyhaa)
+
+### 🐛 Fixed
+* Fix wrong color of last glyph of selected text [#8075](https://github.com/emilk/egui/pull/8075) by [@emilk](https://github.com/emilk)
+* Fix text selection of centered and right-aligned text [#8076](https://github.com/emilk/egui/pull/8076) by [@emilk](https://github.com/emilk)
+* Fix `Context::is_pointer_over_egui` and `Context::egui_wants_pointer_input` [#8081](https://github.com/emilk/egui/pull/8081) by [@emilk](https://github.com/emilk)
+* Fix centered & right aligned `TextEdit` [#8082](https://github.com/emilk/egui/pull/8082) by [@lucasmerlin](https://github.com/lucasmerlin)
+
+### 🚀 Performance
+* Optimize text selection performance for large documents [#7917](https://github.com/emilk/egui/pull/7917) by [@rustbasic](https://github.com/rustbasic)
+
+
+## 0.34.1 - 2026-03-27
+Nothing new
+
+
+## 0.34.0 - 2026-03-26
+
+### Highlights from this release
+- Sharper text unlocked by switching font rendering crate to [`skrifa`](https://crates.io/crates/skrifa)
+- Fade out edges of `ScrollArea`s
+- Use `Ui` as the main entrypoint
+
+### Skrifa and font hinting
+The font rendering backend was switched from `ab_glyph` to `skrifa` + `vello_cpu`. This enabled us support
+font hinting and variations. It also paves the way for more font improvements in the future, like support for color
+emojis and adding helpers for variations like `RichText::bold`.
+
+Font hinting makes text more clear (look at the =):
+
+https://github.com/user-attachments/assets/ea9151ec-869f-4c05-ab59-836114683417
+
+We now support setting variable font parameters:
+
+https://github.com/user-attachments/assets/0febde1c-ebf6-4d85-8f96-86ec0f934ecf
+
+(Unfortunately there is currently a bug with variations, meaning changing them live like this won't work in practise.
+There is a [draft PR](https://github.com/emilk/egui/pull/8029) to fix it, but it didn't make the release)
+
+* Replace ab_glyph with Skrifa + vello_cpu; enable font hinting [#7694](https://github.com/emilk/egui/pull/7694) by [@valadaptive](https://github.com/valadaptive)
+* Add font variations API [#7859](https://github.com/emilk/egui/pull/7859) by [@valadaptive](https://github.com/valadaptive)
+
+### More `Ui`, less `Context`
+egui has long had a confusing overlap in responsibilities between `Context` and `Ui`.
+In particular, you could add panels to either one (or both!).
+In this release, we switch from having `Context` be the main entrypoint, and instead provide whole-app `Ui`.
+In egui we've replaced `Context::run` with `Context::run_ui`, and changed viewports to be given a `&mut Ui` instead of `Context`.
+In `eframe` we've deprecated `App::update` replaced it with `App::ui` (which provides a `&mut Ui` instead of a `&Context`).
+
+In addition to this, `Ui` now derefs to `Context`, so all code like `ui.ctx().input(…)` can now be written `ui.input(…)`.
+This means you are much less likely to have to use naked `Context`s.
+`Context` can still be useful though, since they implement `Clone` and can be sent to other threads so you can call `.request_repaint` on them.
+
+* Add `Context::run_ui` [#7736](https://github.com/emilk/egui/pull/7736) by [@emilk](https://github.com/emilk)
+* Add `Deref<Target = Context>` for `Ui` [#7770](https://github.com/emilk/egui/pull/7770) by [@emilk](https://github.com/emilk)
+* Replace `App::update` with `fn logic` and `fn ui` [#7775](https://github.com/emilk/egui/pull/7775) by [@emilk](https://github.com/emilk)
+* Rename `Context::style` to `global_style`; avoid confusion w/ `Ui::style` [#7772](https://github.com/emilk/egui/pull/7772) by [@emilk](https://github.com/emilk)
+* Rename functions in `Context` to avoid confusion [#7773](https://github.com/emilk/egui/pull/7773) by [@emilk](https://github.com/emilk)
+* Viewports: give the caller a `Ui` instead of `Context` [#7779](https://github.com/emilk/egui/pull/7779) by [@emilk](https://github.com/emilk)
+
+### Changed panel API
+As part of the above work, we have unified the panel API.
+`SidePanel` and `TopBottomPanel` are deprecated, replaced by a single `Panel`.
+Furthermore, it is now deprecated to use panels directly on `Context`. Use the `show_inside` functions instead, acting on `Ui`s.
+
+This unification and simplification will make it easier to maintain and improve panels going forward.
+
+* Add `Panel` to replace `SidePanel` and `TopBottomPanel` [#5659](https://github.com/emilk/egui/pull/5659) by [@sharky98](https://github.com/sharky98)
+* Deprecate using `Panel` directly on a `Context` [#7781](https://github.com/emilk/egui/pull/7781) by [@emilk](https://github.com/emilk)
+* Deprecate `CentralPanel::show` [#7783](https://github.com/emilk/egui/pull/7783) by [@emilk](https://github.com/emilk)
+* Deprecate `Context::used_size` and `Context::available_rect` [#7788](https://github.com/emilk/egui/pull/7788) by [@emilk](https://github.com/emilk)
+
+### ⭐ Added
+* Add `is_scrolling`/`is_smooth_scrolling` util, checking for active scroll action [#7669](https://github.com/emilk/egui/pull/7669) by [@IsseW](https://github.com/IsseW)
+* Allow multiple atoms in `Button::shortcut_text` and `right_text` [#7696](https://github.com/emilk/egui/pull/7696) by [@emilk](https://github.com/emilk)
+* Add `ScrollArea::content_margin` [#7722](https://github.com/emilk/egui/pull/7722) by [@emilk](https://github.com/emilk)
+* Per-widget style [#7667](https://github.com/emilk/egui/pull/7667) by [@AdrienZianne](https://github.com/AdrienZianne)
+* Plugin: export `TypedPluginGuard` and `TypedPluginHandle` [#7780](https://github.com/emilk/egui/pull/7780) by [@apekros](https://github.com/apekros)
+* Add `ViewportInfo::occluded` and `visible` [#7948](https://github.com/emilk/egui/pull/7948) by [@emilk](https://github.com/emilk)
+* Add `Atom` prefix/suffix support to `DragValue` [#7949](https://github.com/emilk/egui/pull/7949) by [@lucasmerlin](https://github.com/lucasmerlin)
+* ⚠️ Atom improvements: `Atom::id`, `align`, `closure`, `max_size` [#7958](https://github.com/emilk/egui/pull/7958) by [@lucasmerlin](https://github.com/lucasmerlin)
+* Add `DebugOptions::warn_if_rect_changes_id` [#7984](https://github.com/emilk/egui/pull/7984) by [@emilk](https://github.com/emilk)
+* `TextEdit` `Atom` prefix/suffix [#7587](https://github.com/emilk/egui/pull/7587) by [@lucasmerlin](https://github.com/lucasmerlin)
+* Add `Button::left_text` [#7955](https://github.com/emilk/egui/pull/7955) by [@rustbasic](https://github.com/rustbasic)
+* Add `Response::parent_id` [#8010](https://github.com/emilk/egui/pull/8010) by [@lucasmerlin](https://github.com/lucasmerlin)
+* Add `Context::text_edit_focused` [#8014](https://github.com/emilk/egui/pull/8014) by [@emilk](https://github.com/emilk)
+* Add `Context::time` [#8017](https://github.com/emilk/egui/pull/8017) by [@emilk](https://github.com/emilk)
+* Add `Ui::is_tooltip` [#8016](https://github.com/emilk/egui/pull/8016) by [@emilk](https://github.com/emilk)
+* Add `UiStack::bg_color` [#8020](https://github.com/emilk/egui/pull/8020) by [@emilk](https://github.com/emilk)
+* Make `egui::IdSet` public [#8019](https://github.com/emilk/egui/pull/8019) by [@lucasmerlin](https://github.com/lucasmerlin)
+* Add raw key methods to TypeIdMap [#8007](https://github.com/emilk/egui/pull/8007) by [@AlexanderSchuetz97](https://github.com/AlexanderSchuetz97)
+
+### 🔧 Changed
+* Remove `accesskit` feature and always depend on `accesskit` [#7701](https://github.com/emilk/egui/pull/7701) by [@emilk](https://github.com/emilk)
+* Update MSRV from 1.88 to 1.92 [#7793](https://github.com/emilk/egui/pull/7793) by [@JasperBRiedel](https://github.com/JasperBRiedel)
+* Improve modifier handling when scrolling [#7678](https://github.com/emilk/egui/pull/7678) by [@emilk](https://github.com/emilk)
+* Apply preferred font weight when loading variable fonts [#7790](https://github.com/emilk/egui/pull/7790) by [@pmnxis](https://github.com/pmnxis)
+* Make scroll bars and resize splitters visible to accesskit [#7804](https://github.com/emilk/egui/pull/7804) by [@emilk](https://github.com/emilk)
+* Allow moving existing widgets to the top of interaction stack [#7805](https://github.com/emilk/egui/pull/7805) by [@emilk](https://github.com/emilk)
+* Slightly change interact behavior around thin splitters [#7806](https://github.com/emilk/egui/pull/7806) by [@emilk](https://github.com/emilk)
+* Move window resize interaction to be over contents [#7807](https://github.com/emilk/egui/pull/7807) by [@emilk](https://github.com/emilk)
+* Don't expand widgets on hover [#7808](https://github.com/emilk/egui/pull/7808) by [@emilk](https://github.com/emilk)
+* Make `FrameCache::get` return a reference instead of cloning the cached value [#7834](https://github.com/emilk/egui/pull/7834) by [@KonaeAkira](https://github.com/KonaeAkira)
+* Update selected dependencies [#7920](https://github.com/emilk/egui/pull/7920) by [@oscargus](https://github.com/oscargus)
+* Make `Galley::pos_from_layout_cursor` `pub` [#7864](https://github.com/emilk/egui/pull/7864) by [@dionb](https://github.com/dionb)
+* Update accesskit to 0.24.0 (and related deps) [#7850](https://github.com/emilk/egui/pull/7850) by [@delan](https://github.com/delan)
+* Quit on Ctrl-Q [#7985](https://github.com/emilk/egui/pull/7985) by [@emilk](https://github.com/emilk)
+* Fade out the edges of `ScrollAreas` [#8018](https://github.com/emilk/egui/pull/8018) by [@emilk](https://github.com/emilk)
+
+### 🔥 Removed
+* Remove `CacheTrait::as_any_mut` [#7833](https://github.com/emilk/egui/pull/7833) by [@emilk](https://github.com/emilk)
+
+### 🐛 Fixed
+* Fix: ensure `CentralPanel::show_inside` allocates space in parent [#7778](https://github.com/emilk/egui/pull/7778) by [@emilk](https://github.com/emilk)
+* Heed constrain rect when auto-positioning windows [#7786](https://github.com/emilk/egui/pull/7786) by [@emilk](https://github.com/emilk)
+* Fix jitter when hovering edge of scroll area close to resize splitter [#7803](https://github.com/emilk/egui/pull/7803) by [@emilk](https://github.com/emilk)
+* Don't focus Areas, Windows and ScrollAreas [#7827](https://github.com/emilk/egui/pull/7827) by [@lucasmerlin](https://github.com/lucasmerlin)
+* Fix backspacing leaving last character in IME prediction not removed on macOS native and Safari [#7810](https://github.com/emilk/egui/pull/7810) by [@umajho](https://github.com/umajho)
+* Implemented distance threshold for double/triple clicks [#7817](https://github.com/emilk/egui/pull/7817) by [@bl4ze4447](https://github.com/bl4ze4447)
+* Fix `CentralPanel::show_inside_dyn` to round `panel_rect` [#7868](https://github.com/emilk/egui/pull/7868) by [@ripopov](https://github.com/ripopov)
+* Stop ctrl+arrow etc from moving focus [#7897](https://github.com/emilk/egui/pull/7897) by [@emilk](https://github.com/emilk)
+* Fix scroll area not consuming scroll events [#7904](https://github.com/emilk/egui/pull/7904) by [@lucasmerlin](https://github.com/lucasmerlin)
+* Pass in an explicit id in `UiBuilder`, to avoid wrapping passed in ids with Id::new() [#7925](https://github.com/emilk/egui/pull/7925) by [@lucasmerlin](https://github.com/lucasmerlin)
+* Fix crash when dragging a DragValue through small floats [#7939](https://github.com/emilk/egui/pull/7939) by [@Fyrecean](https://github.com/Fyrecean)
+* Fix emoji icon font [#7940](https://github.com/emilk/egui/pull/7940) by [@Jhynjhiruu](https://github.com/Jhynjhiruu)
+* Fixes the overly aggressive overflow elision in `truncate()` and similar for os scaling other than 100% [#7867](https://github.com/emilk/egui/pull/7867) by [@RndUsr123](https://github.com/RndUsr123)
+* Fix text color when selecting newline character [#7951](https://github.com/emilk/egui/pull/7951) by [@emilk](https://github.com/emilk)
+* Fix: repaint on drag-and-drop files [#7953](https://github.com/emilk/egui/pull/7953) by [@emilk](https://github.com/emilk)
+* Fix instable IDs following animated panels [#7994](https://github.com/emilk/egui/pull/7994) by [@emilk](https://github.com/emilk)
+* Enables every combination of `TextEdit` and `LayoutJob` alignments [#7831](https://github.com/emilk/egui/pull/7831) by [@RndUsr123](https://github.com/RndUsr123)
+* Fix `horizontal_wrapping` row height after using `text_edit_multiline` [#8000](https://github.com/emilk/egui/pull/8000) by [@optozorax](https://github.com/optozorax)
+* Fix menu keyboard toggle for open submenus [#7957](https://github.com/emilk/egui/pull/7957) by [@fjkorf](https://github.com/fjkorf)
+* Fix: `Visuals::interact_cursor` support in `Button` [#7986](https://github.com/emilk/egui/pull/7986) by [@mango766](https://github.com/mango766)
+
+### 🚀 Performance
+* Shrink the byte-size of `Response` slightly [#8011](https://github.com/emilk/egui/pull/8011) by [@emilk](https://github.com/emilk)
+
+
 ## 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)
diff --git a/Cargo.lock b/Cargo.lock
index 800618e4a..942ddc6e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -96,7 +96,7 @@ dependencies = [
  "hashbrown 0.16.1",
  "static_assertions",
  "windows",
- "windows-core 0.62.2",
+ "windows-core",
 ]
 
 [[package]]
@@ -124,9 +124,9 @@ dependencies = [
 
 [[package]]
 name = "adler2"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
 
 [[package]]
 name = "ahash"
@@ -135,7 +135,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
- "getrandom 0.3.1",
+ "getrandom 0.3.4",
  "once_cell",
  "serde",
  "version_check",
@@ -159,23 +159,22 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "android-activity"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef6978589202a00cd7e118380c448a08b6ed394c3a8df3a430d0898e3a42d046"
+checksum = "0f2a1bb052857d5dd49572219344a7332b31b76405648eabac5bc68978251bcd"
 dependencies = [
  "android-properties",
  "bitflags 2.9.4",
  "cc",
- "cesu8",
  "jni",
- "jni-sys",
  "libc",
  "log",
  "ndk",
  "ndk-context",
  "ndk-sys",
  "num_enum",
- "thiserror 1.0.66",
+ "simd_cesu8",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -281,7 +280,7 @@ dependencies = [
  "clipboard-win",
  "image",
  "log",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-core-graphics",
@@ -369,7 +368,7 @@ dependencies = [
  "futures-lite",
  "parking",
  "polling",
- "rustix 0.38.38",
+ "rustix 0.38.44",
  "slab",
  "tracing",
  "windows-sys 0.59.0",
@@ -401,7 +400,7 @@ dependencies = [
  "cfg-if",
  "event-listener",
  "futures-lite",
- "rustix 0.38.38",
+ "rustix 0.38.44",
  "tracing",
 ]
 
@@ -428,7 +427,7 @@ dependencies = [
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.38",
+ "rustix 0.38.44",
  "signal-hook-registry",
  "slab",
  "windows-sys 0.59.0",
@@ -496,9 +495,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "backtrace"
@@ -512,7 +511,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-link 0.2.1",
+ "windows-link",
 ]
 
 [[package]]
@@ -536,7 +535,16 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
 dependencies = [
- "bit-vec",
+ "bit-vec 0.8.0",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd"
+dependencies = [
+ "bit-vec 0.9.1",
 ]
 
 [[package]]
@@ -545,6 +553,12 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
 
+[[package]]
+name = "bit-vec"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -560,12 +574,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "block"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
-
 [[package]]
 name = "block2"
 version = "0.5.1"
@@ -581,7 +589,7 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 dependencies = [
- "objc2 0.6.3",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -610,15 +618,15 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb"
 
 [[package]]
 name = "bytemuck"
-version = "1.24.0"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
+checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec"
 dependencies = [
  "bytemuck_derive",
 ]
@@ -661,7 +669,7 @@ dependencies = [
  "bitflags 2.9.4",
  "log",
  "polling",
- "rustix 0.38.38",
+ "rustix 0.38.44",
  "slab",
  "thiserror 1.0.66",
 ]
@@ -673,7 +681,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a66a987056935f7efce4ab5668920b5d0dac4a7c99991a67395f13702ddd20"
 dependencies = [
  "calloop",
- "rustix 0.38.38",
+ "rustix 0.38.44",
  "wayland-backend",
  "wayland-client",
 ]
@@ -686,26 +694,21 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.2.16"
+version = "1.2.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c"
+checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
 ]
 
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cfg_aliases"
@@ -722,19 +725,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "chrono"
-version = "0.4.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
-dependencies = [
- "iana-time-zone",
- "js-sys",
- "num-traits",
- "wasm-bindgen",
- "windows-link 0.2.1",
-]
-
 [[package]]
 name = "ciborium"
 version = "0.2.2"
@@ -804,9 +794,9 @@ dependencies = [
 
 [[package]]
 name = "codespan-reporting"
-version = "0.12.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe6d2e5af09e8c8ad56c969f2157a3d4238cebc7c55f0a517728c38f7b200f81"
+checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681"
 dependencies = [
  "serde",
  "termcolor",
@@ -923,7 +913,7 @@ checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
 dependencies = [
  "bitflags 1.3.2",
  "core-foundation 0.9.4",
- "core-graphics-types 0.1.3",
+ "core-graphics-types",
  "foreign-types",
  "libc",
 ]
@@ -939,17 +929,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "core-graphics-types"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
-dependencies = [
- "bitflags 2.9.4",
- "core-foundation 0.10.1",
- "libc",
-]
-
 [[package]]
 name = "core_maths"
 version = "0.1.1"
@@ -961,9 +940,9 @@ dependencies = [
 
 [[package]]
 name = "crc32fast"
-version = "1.4.2"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
 dependencies = [
  "cfg-if",
 ]
@@ -1161,7 +1140,7 @@ dependencies = [
  "bitflags 2.9.4",
  "block2 0.6.2",
  "libc",
- "objc2 0.6.3",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -1186,9 +1165,9 @@ dependencies = [
 
 [[package]]
 name = "document-features"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
 dependencies = [
  "litrs",
 ]
@@ -1207,7 +1186,7 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
 
 [[package]]
 name = "ecolor"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "bytemuck",
  "cint",
@@ -1219,7 +1198,7 @@ dependencies = [
 
 [[package]]
 name = "eframe"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1236,9 +1215,9 @@ dependencies = [
  "image",
  "js-sys",
  "log",
- "objc2 0.5.2",
- "objc2-app-kit 0.2.2",
- "objc2-foundation 0.2.2",
+ "objc2 0.6.4",
+ "objc2-app-kit 0.3.2",
+ "objc2-foundation 0.3.2",
  "parking_lot",
  "percent-encoding",
  "pollster",
@@ -1258,7 +1237,7 @@ dependencies = [
 
 [[package]]
 name = "egui"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "accesskit",
  "ahash",
@@ -1278,7 +1257,7 @@ dependencies = [
 
 [[package]]
 name = "egui-wgpu"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1287,7 +1266,7 @@ dependencies = [
  "epaint",
  "log",
  "profiling",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "type-map",
  "web-time",
  "wgpu",
@@ -1296,7 +1275,7 @@ dependencies = [
 
 [[package]]
 name = "egui-winit"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "accesskit_winit",
  "arboard",
@@ -1304,9 +1283,9 @@ dependencies = [
  "document-features",
  "egui",
  "log",
- "objc2 0.5.2",
- "objc2-foundation 0.2.2",
- "objc2-ui-kit",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+ "objc2-ui-kit 0.3.2",
  "profiling",
  "raw-window-handle",
  "serde",
@@ -1319,12 +1298,11 @@ dependencies = [
 
 [[package]]
 name = "egui_demo_app"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
  "bytemuck",
- "chrono",
  "eframe",
  "egui",
  "egui_demo_lib",
@@ -1333,6 +1311,7 @@ dependencies = [
  "ehttp",
  "env_logger",
  "image",
+ "jiff",
  "log",
  "mimalloc",
  "poll-promise",
@@ -1344,37 +1323,36 @@ dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "wgpu",
 ]
 
 [[package]]
 name = "egui_demo_lib"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
- "chrono",
  "criterion",
  "document-features",
  "egui",
  "egui_extras",
  "egui_kittest",
  "image",
+ "jiff",
  "mimalloc",
- "rand 0.9.2",
+ "rand 0.9.3",
  "serde",
  "unicode_names2",
 ]
 
 [[package]]
 name = "egui_extras"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "ahash",
- "chrono",
  "document-features",
  "egui",
  "ehttp",
  "enum-map",
  "image",
+ "jiff",
  "log",
  "mime_guess2",
  "profiling",
@@ -1385,7 +1363,7 @@ dependencies = [
 
 [[package]]
 name = "egui_glow"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "bytemuck",
  "document-features",
@@ -1397,14 +1375,12 @@ dependencies = [
  "log",
  "memoffset",
  "profiling",
- "wasm-bindgen",
- "web-sys",
  "winit",
 ]
 
 [[package]]
 name = "egui_kittest"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "dify",
  "document-features",
@@ -1424,7 +1400,7 @@ dependencies = [
 
 [[package]]
 name = "egui_tests"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "egui",
  "egui_extras",
@@ -1434,9 +1410,9 @@ dependencies = [
 
 [[package]]
 name = "ehttp"
-version = "0.6.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04499d3c719edecfad5c9b46031726c8540905d73be6d7e4f9788c4a298da908"
+checksum = "b2f1b93eb2e039aaff63ce07cca59bd1dca02f2ce30075a17b619d2c42f56efc"
 dependencies = [
  "document-features",
  "js-sys",
@@ -1454,7 +1430,7 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "emath"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "bytemuck",
  "document-features",
@@ -1552,7 +1528,7 @@ dependencies = [
 
 [[package]]
 name = "epaint"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "ahash",
  "bytemuck",
@@ -1562,6 +1538,7 @@ dependencies = [
  "emath",
  "epaint_default_fonts",
  "font-types",
+ "harfrust",
  "log",
  "mimalloc",
  "nohash-hasher",
@@ -1573,12 +1550,14 @@ dependencies = [
  "similar-asserts",
  "skrifa",
  "smallvec",
+ "unicode-general-category",
+ "unicode-segmentation",
  "vello_cpu",
 ]
 
 [[package]]
 name = "epaint_default_fonts"
-version = "0.33.3"
+version = "0.34.2"
 
 [[package]]
 name = "equivalent"
@@ -1604,9 +1583,9 @@ checksum = "a5d9305ccc6942a704f4335694ecd3de2ea531b114ac2d51f5f843750787a92f"
 
 [[package]]
 name = "euclid"
-version = "0.22.11"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad9cdb4b747e485a12abb0e6566612956c7a1bafa3bdb8d682c5b6d403589e48"
+checksum = "f1a05365e3b1c6d1650318537c7460c6923f1abdd272ad6842baa2b509957a06"
 dependencies = [
  "num-traits",
 ]
@@ -1658,7 +1637,7 @@ version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "998b056554fbe42e03ae0e152895cd1a7e1002aec800fdc6635d20270260c46f"
 dependencies = [
- "bit-set",
+ "bit-set 0.8.0",
  "regex-automata",
  "regex-syntax",
 ]
@@ -1680,12 +1659,9 @@ dependencies = [
 
 [[package]]
 name = "fearless_simd"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb2907d1f08b2b316b9223ced5b0e89d87028ba8deae9764741dba8ff7f3903"
-dependencies = [
- "bytemuck",
-]
+checksum = "76258897e51fd156ee03b6246ea53f3e0eb395d0b327e9961c4fc4c8b2fa151a"
 
 [[package]]
 name = "file_dialog"
@@ -1697,10 +1673,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "flate2"
-version = "1.1.4"
+name = "find-msvc-tools"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
+[[package]]
+name = "flate2"
+version = "1.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1732,9 +1714,9 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
 [[package]]
 name = "font-types"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1e4d2d0cf79d38430cc9dc9aadec84774bff2e1ba30ae2bf6c16cfce9385a23"
+checksum = "73829a7b5c91198af28a99159b7ae4afbb252fb906159ff7f189f3a2ceaa3df2"
 dependencies = [
  "bytemuck",
  "serde",
@@ -1859,7 +1841,7 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc257fdb4038301ce4b9cd1b3b51704509692bb3ff716a410cbd07925d9dae55"
 dependencies = [
- "rustix 1.0.8",
+ "rustix 1.1.4",
  "windows-targets 0.52.6",
 ]
 
@@ -1874,25 +1856,25 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets 0.52.6",
+ "r-efi",
+ "wasip2",
 ]
 
 [[package]]
@@ -1924,9 +1906,9 @@ dependencies = [
 
 [[package]]
 name = "glow"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
+checksum = "29038e1c483364cc6bb3cf78feee1816002e127c331a1eec55a4d202b9e1adb5"
 dependencies = [
  "js-sys",
  "slotmap",
@@ -1948,7 +1930,7 @@ dependencies = [
  "glutin_glx_sys",
  "glutin_wgl_sys",
  "libloading",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -2010,7 +1992,7 @@ dependencies = [
  "hashbrown 0.16.1",
  "log",
  "presser",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "windows",
 ]
 
@@ -2034,6 +2016,15 @@ dependencies = [
  "bitflags 2.9.4",
 ]
 
+[[package]]
+name = "guillotiere"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b17e70c989c36bad147b27a58d148c0741c51448aa5653436547323e524d0ab"
+dependencies = [
+ "euclid",
+]
+
 [[package]]
 name = "half"
 version = "2.6.0"
@@ -2045,6 +2036,19 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "harfrust"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9"
+dependencies = [
+ "bitflags 2.9.4",
+ "bytemuck",
+ "core_maths",
+ "read-fonts",
+ "smallvec",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
@@ -2131,28 +2135,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "iana-time-zone"
-version = "0.1.63"
+name = "http"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a"
 dependencies = [
- "android_system_properties",
- "core-foundation-sys",
- "iana-time-zone-haiku",
- "js-sys",
- "log",
- "wasm-bindgen",
- "windows-core 0.61.2",
+ "bytes",
+ "itoa",
 ]
 
 [[package]]
-name = "iana-time-zone-haiku"
-version = "0.1.2"
+name = "httparse"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
-dependencies = [
- "cc",
-]
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "icu_collections"
@@ -2360,28 +2356,31 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.11"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jiff"
-version = "0.2.15"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
+checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359"
 dependencies = [
  "jiff-static",
+ "js-sys",
  "log",
  "portable-atomic",
  "portable-atomic-util",
- "serde",
+ "serde_core",
+ "wasm-bindgen",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "jiff-static"
-version = "0.2.15"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2390,25 +2389,61 @@ dependencies = [
 
 [[package]]
 name = "jni"
-version = "0.21.1"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498"
 dependencies = [
- "cesu8",
  "cfg-if",
  "combine",
- "jni-sys",
+ "jni-macros",
+ "jni-sys 0.4.1",
  "log",
- "thiserror 1.0.66",
+ "simd_cesu8",
+ "thiserror 2.0.18",
  "walkdir",
- "windows-sys 0.45.0",
+ "windows-link",
+]
+
+[[package]]
+name = "jni-macros"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "simd_cesu8",
+ "syn",
 ]
 
 [[package]]
 name = "jni-sys"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+checksum = "41a652e1f9b6e0275df1f15b32661cf0d4b78d4d87ddec5e0c3c20f097433258"
+dependencies = [
+ "jni-sys 0.4.1",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2"
+dependencies = [
+ "jni-sys-macros",
+]
+
+[[package]]
+name = "jni-sys-macros"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264"
+dependencies = [
+ "quote",
+ "syn",
+]
 
 [[package]]
 name = "jobserver"
@@ -2427,9 +2462,9 @@ checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07"
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -2462,8 +2497,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
 
 [[package]]
 name = "kittest"
-version = "0.3.0"
-source = "git+https://github.com/rerun-io/kittest?branch=main#ce7a2f3b12c36021889b50bdff671cec8016b0fb"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ceaa75eb0036a32b6b9833962eb18137449e9817e2e586006471925b727fd5"
 dependencies = [
  "accesskit",
  "accesskit_consumer",
@@ -2498,9 +2534,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.176"
+version = "0.2.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d"
 
 [[package]]
 name = "libloading"
@@ -2536,7 +2572,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.9.4",
  "libc",
- "redox_syscall 0.5.7",
+ "redox_syscall 0.5.18",
 ]
 
 [[package]]
@@ -2553,15 +2589,15 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.14"
+version = "0.4.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.9.4"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
@@ -2571,9 +2607,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "litrs"
-version = "0.4.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
 
 [[package]]
 name = "lock_api"
@@ -2592,18 +2628,9 @@ checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
 [[package]]
 name = "lz4_flex"
-version = "0.11.3"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5"
-
-[[package]]
-name = "malloc_buf"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
-dependencies = [
- "libc",
-]
+checksum = "373f5eceeeab7925e0c1098212f2fbc4d416adec9d35051a6ab251e824c1854a"
 
 [[package]]
 name = "memchr"
@@ -2629,21 +2656,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "metal"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
-dependencies = [
- "bitflags 2.9.4",
- "block",
- "core-graphics-types 0.2.0",
- "foreign-types",
- "log",
- "objc",
- "paste",
-]
-
 [[package]]
 name = "mimalloc"
 version = "0.1.48"
@@ -2694,7 +2706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
 dependencies = [
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.52.0",
 ]
 
@@ -2708,12 +2720,12 @@ dependencies = [
 
 [[package]]
 name = "naga"
-version = "28.0.0"
+version = "29.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "618f667225063219ddfc61251087db8a9aec3c3f0950c916b614e403486f1135"
+checksum = "aa2630921705b9b01dcdd0b6864b9562ca3c1951eecd0f0c4f5f04f61e412647"
 dependencies = [
  "arrayvec",
- "bit-set",
+ "bit-set 0.9.1",
  "bitflags 2.9.4",
  "cfg-if",
  "cfg_aliases",
@@ -2728,7 +2740,7 @@ dependencies = [
  "once_cell",
  "rustc-hash 1.1.0",
  "spirv",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "unicode-ident",
 ]
 
@@ -2739,7 +2751,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
 dependencies = [
  "bitflags 2.9.4",
- "jni-sys",
+ "jni-sys 0.3.1",
  "log",
  "ndk-sys",
  "num_enum",
@@ -2759,7 +2771,7 @@ version = "0.6.0+11769913"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee6cda3051665f1fb8d9e08fc35c96d5a244fb1be711a03b71118828afc9a873"
 dependencies = [
- "jni-sys",
+ "jni-sys 0.3.1",
 ]
 
 [[package]]
@@ -2818,15 +2830,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "objc"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
-dependencies = [
- "malloc_buf",
-]
-
 [[package]]
 name = "objc-sys"
 version = "0.3.5"
@@ -2845,9 +2848,9 @@ dependencies = [
 
 [[package]]
 name = "objc2"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c2599ce0ec54857b29ce62166b0ed9b4f6f1a70ccc9a71165b6154caca8c05"
+checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f"
 dependencies = [
  "objc2-encode",
 ]
@@ -2865,7 +2868,7 @@ dependencies = [
  "objc2-core-data",
  "objc2-core-image",
  "objc2-foundation 0.2.2",
- "objc2-quartz-core",
+ "objc2-quartz-core 0.2.2",
 ]
 
 [[package]]
@@ -2876,7 +2879,7 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
 dependencies = [
  "bitflags 2.9.4",
  "block2 0.6.2",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-core-graphics",
  "objc2-foundation 0.3.2",
@@ -2926,7 +2929,7 @@ checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
  "bitflags 2.9.4",
  "dispatch2",
- "objc2 0.6.3",
+ "objc2 0.6.4",
 ]
 
 [[package]]
@@ -2937,7 +2940,7 @@ checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
 dependencies = [
  "bitflags 2.9.4",
  "dispatch2",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-foundation",
  "objc2-io-surface",
 ]
@@ -2951,7 +2954,7 @@ dependencies = [
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
- "objc2-metal",
+ "objc2-metal 0.2.2",
 ]
 
 [[package]]
@@ -2992,7 +2995,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
 dependencies = [
  "bitflags 2.9.4",
- "objc2 0.6.3",
+ "block2 0.6.2",
+ "objc2 0.6.4",
  "objc2-core-foundation",
 ]
 
@@ -3003,7 +3007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
 dependencies = [
  "bitflags 2.9.4",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-core-foundation",
 ]
 
@@ -3031,6 +3035,18 @@ dependencies = [
  "objc2-foundation 0.2.2",
 ]
 
+[[package]]
+name = "objc2-metal"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
+dependencies = [
+ "bitflags 2.9.4",
+ "block2 0.6.2",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.2",
+]
+
 [[package]]
 name = "objc2-quartz-core"
 version = "0.2.2"
@@ -3041,7 +3057,20 @@ dependencies = [
  "block2 0.5.1",
  "objc2 0.5.2",
  "objc2-foundation 0.2.2",
- "objc2-metal",
+ "objc2-metal 0.2.2",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
+dependencies = [
+ "bitflags 2.9.4",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-metal 0.3.2",
 ]
 
 [[package]]
@@ -3069,12 +3098,24 @@ dependencies = [
  "objc2-core-location",
  "objc2-foundation 0.2.2",
  "objc2-link-presentation",
- "objc2-quartz-core",
+ "objc2-quartz-core 0.2.2",
  "objc2-symbols",
  "objc2-uniform-type-identifiers",
  "objc2-user-notifications",
 ]
 
+[[package]]
+name = "objc2-ui-kit"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
+dependencies = [
+ "bitflags 2.9.4",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+]
+
 [[package]]
 name = "objc2-uniform-type-identifiers"
 version = "0.2.2"
@@ -3110,9 +3151,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "once_cell_polyfill"
@@ -3204,17 +3245,11 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.7",
+ "redox_syscall 0.5.18",
  "smallvec",
- "windows-link 0.2.1",
+ "windows-link",
 ]
 
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
 [[package]]
 name = "pathdiff"
 version = "0.2.3"
@@ -3365,9 +3400,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.15"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "piper"
@@ -3432,7 +3467,7 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
- "rustix 0.38.38",
+ "rustix 0.38.44",
  "tracing",
  "windows-sys 0.59.0",
 ]
@@ -3445,7 +3480,7 @@ checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
 
 [[package]]
 name = "popups"
-version = "0.33.3"
+version = "0.34.2"
 dependencies = [
  "eframe",
  "env_logger",
@@ -3498,18 +3533,18 @@ checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.4.0"
+version = "3.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
 dependencies = [
  "toml_edit",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
@@ -3594,13 +3629,19 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.41"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -3614,9 +3655,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "7ec095654a25171c2124e9e3393a930bddbffdc939556c914957a4c3e0a87166"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
@@ -3648,7 +3689,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
 ]
 
 [[package]]
@@ -3657,7 +3698,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.1",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
@@ -3672,6 +3713,18 @@ version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
 
+[[package]]
+name = "raw-window-metal"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40d213455a5f1dc59214213c7330e074ddf8114c9a42411eb890c767357ce135"
+dependencies = [
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-quartz-core 0.3.2",
+]
+
 [[package]]
 name = "rayon"
 version = "1.11.0"
@@ -3699,6 +3752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5"
 dependencies = [
  "bytemuck",
+ "core_maths",
  "font-types",
 ]
 
@@ -3713,9 +3767,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
  "bitflags 2.9.4",
 ]
@@ -3726,9 +3780,9 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libredox",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
@@ -3791,7 +3845,7 @@ dependencies = [
  "js-sys",
  "libc",
  "log",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-app-kit 0.3.2",
  "objc2-core-foundation",
  "objc2-foundation 0.3.2",
@@ -3824,7 +3878,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.2.17",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -3832,14 +3886,15 @@ dependencies = [
 
 [[package]]
 name = "ron"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db09040cc89e461f1a265139777a2bde7f8d8c67c4936f700c63ce3e2904d468"
+checksum = "fd490c5b18261893f14449cbd28cb9c0b637aebf161cd77900bfdedaff21ec32"
 dependencies = [
- "base64",
  "bitflags 2.9.4",
+ "once_cell",
  "serde",
  "serde_derive",
+ "typeid",
  "unicode-ident",
 ]
 
@@ -3868,36 +3923,45 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
-name = "rustix"
-version = "0.38.38"
+name = "rustc_version"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa260229e6538e52293eeb577aabd09945a09d6d9cc0fc550ed7529056c2e32a"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "bitflags 2.9.4",
- "errno",
- "libc",
- "linux-raw-sys 0.4.14",
- "windows-sys 0.52.0",
+ "semver",
 ]
 
 [[package]]
 name = "rustix"
-version = "1.0.8"
+version = "0.38.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
 dependencies = [
  "bitflags 2.9.4",
  "errno",
  "libc",
- "linux-raw-sys 0.9.4",
- "windows-sys 0.60.2",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags 2.9.4",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.12.1",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "rustls"
-version = "0.23.18"
+version = "0.23.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f"
+checksum = "69f9466fb2c14ea04357e91413efb882e2a6d4a406e625449bc0a5d360d53a21"
 dependencies = [
  "log",
  "once_cell",
@@ -3910,15 +3974,18 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.10.0"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"
+checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd"
+dependencies = [
+ "zeroize",
+]
 
 [[package]]
 name = "rustls-webpki"
-version = "0.102.8"
+version = "0.103.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
+checksum = "61c429a8649f110dddef65e2a5ad240f747e85f7758a6bccc7e5777bd33f756e"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3927,9 +3994,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.19"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "rustybuzz"
@@ -3998,6 +4065,12 @@ version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16c2f82143577edb4921b71ede051dac62ca3c16084e918bf7b40c96ae10eb33"
 
+[[package]]
+name = "semver"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -4087,9 +4160,25 @@ dependencies = [
 
 [[package]]
 name = "simd-adler32"
-version = "0.3.7"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2"
+
+[[package]]
+name = "simd_cesu8"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33"
+dependencies = [
+ "rustc_version",
+ "simdutf8",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
 
 [[package]]
 name = "similar"
@@ -4138,12 +4227,9 @@ dependencies = [
 
 [[package]]
 name = "slab"
-version = "0.4.9"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
+checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
 
 [[package]]
 name = "slotmap"
@@ -4176,7 +4262,7 @@ dependencies = [
  "libc",
  "log",
  "memmap2",
- "rustix 0.38.38",
+ "rustix 0.38.44",
  "thiserror 1.0.66",
  "wayland-backend",
  "wayland-client",
@@ -4220,9 +4306,9 @@ dependencies = [
 
 [[package]]
 name = "spirv"
-version = "0.3.0+sdk-1.3.268.0"
+version = "0.4.0+sdk-1.4.341.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
+checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f"
 dependencies = [
  "bitflags 2.9.4",
 ]
@@ -4266,9 +4352,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4302,7 +4388,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "walkdir",
  "yaml-rust",
 ]
@@ -4314,9 +4400,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
  "fastrand",
- "getrandom 0.3.1",
+ "getrandom 0.3.4",
  "once_cell",
- "rustix 1.0.8",
+ "rustix 1.1.4",
  "windows-sys 0.61.2",
 ]
 
@@ -4389,11 +4475,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
- "thiserror-impl 2.0.17",
+ "thiserror-impl 2.0.18",
 ]
 
 [[package]]
@@ -4409,9 +4495,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4536,26 +4622,17 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "1.0.2+spec-1.1.0"
+version = "1.0.6+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1dfefef6a142e93f346b64c160934eb13b5594b84ab378133ac6815cb2bd57f"
+checksum = "399b1124a3c9e16766831c6bba21e50192572cdd98706ea114f9502509686ffc"
 dependencies = [
  "serde_core",
  "serde_spanned",
- "toml_datetime 1.0.0+spec-1.1.0",
+ "toml_datetime",
  "toml_parser",
  "winnow",
 ]
 
-[[package]]
-name = "toml_datetime"
-version = "0.7.5+spec-1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347"
-dependencies = [
- "serde_core",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "1.0.0+spec-1.1.0"
@@ -4567,12 +4644,12 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.23.10+spec-1.0.0"
+version = "0.25.4+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
+checksum = "7193cbd0ce53dc966037f54351dbbcf0d5a642c7f0038c382ef9e677ce8c13f2"
 dependencies = [
  "indexmap",
- "toml_datetime 0.7.5+spec-1.1.0",
+ "toml_datetime",
  "toml_parser",
  "winnow",
 ]
@@ -4636,14 +4713,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "uds_windows"
-version = "1.1.0"
+name = "typeid"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
+checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c"
+
+[[package]]
+name = "uds_windows"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
 dependencies = [
  "memoffset",
  "tempfile",
- "winapi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4671,10 +4754,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e"
 
 [[package]]
-name = "unicode-ident"
-version = "1.0.19"
+name = "unicode-general-category"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+checksum = "0b993bddc193ae5bd0d623b49ec06ac3e9312875fdae725a975c51db1cc1677f"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-properties"
@@ -4734,20 +4823,33 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.10.1"
+version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+checksum = "dea7109cdcd5864d4eeb1b58a1648dc9bf520360d7af16ec26d0a9354bafcfc0"
 dependencies = [
  "base64",
  "flate2",
  "log",
- "once_cell",
+ "percent-encoding",
  "rustls",
  "rustls-pki-types",
- "url",
+ "ureq-proto",
+ "utf8-zero",
  "webpki-roots",
 ]
 
+[[package]]
+name = "ureq-proto"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e994ba84b0bd1b1b0cf92878b7ef898a5c1760108fe7b6010327e274917a808c"
+dependencies = [
+ "base64",
+ "http",
+ "httparse",
+ "log",
+]
+
 [[package]]
 name = "url"
 version = "2.5.4"
@@ -4794,6 +4896,12 @@ dependencies = [
  "xmlwriter",
 ]
 
+[[package]]
+name = "utf8-zero"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e"
+
 [[package]]
 name = "utf8_iter"
 version = "1.0.4"
@@ -4818,28 +4926,41 @@ dependencies = [
 ]
 
 [[package]]
-name = "vello_common"
-version = "0.0.6"
+name = "vello_api"
+version = "0.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bd1a4c633ce09e7d713df1a6e036644a125e15e0c169cfb5180ddf5836ca04b"
+checksum = "a5088cd0113bc5332c753f24503825e3bc93e26c7883c9dc3ad9637bb62c4634"
+dependencies = [
+ "bytemuck",
+ "peniko",
+]
+
+[[package]]
+name = "vello_common"
+version = "0.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "986dc49a501a683477614bf07b8e7b6c79ae4828efce3bf22e51850f4a0a8a4c"
 dependencies = [
  "bytemuck",
  "fearless_simd",
+ "guillotiere",
  "hashbrown 0.16.1",
  "log",
  "peniko",
  "skrifa",
  "smallvec",
+ "thiserror 2.0.18",
 ]
 
 [[package]]
 name = "vello_cpu"
-version = "0.0.6"
+version = "0.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0162bfe48aabf6a9fdcd401b628c7d9f260c2cbabb343c70a65feba6f7849edc"
+checksum = "a678f91c7524a3a9ac9a19df9f83552866ec70b2ca26441b916a6b219b6aa2de"
 dependencies = [
  "bytemuck",
  "hashbrown 0.16.1",
+ "vello_api",
  "vello_common",
 ]
 
@@ -4861,52 +4982,40 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+name = "wasip2"
+version = "1.0.2+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f"
 dependencies = [
  "cfg-if",
+ "futures-util",
  "js-sys",
  "once_cell",
  "wasm-bindgen",
@@ -4915,9 +5024,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4925,22 +5034,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12"
 dependencies = [
  "unicode-ident",
 ]
@@ -4953,7 +5062,7 @@ checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
 dependencies = [
  "cc",
  "downcast-rs",
- "rustix 1.0.8",
+ "rustix 1.1.4",
  "scoped-tls",
  "smallvec",
  "wayland-sys",
@@ -4966,7 +5075,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
 dependencies = [
  "bitflags 2.9.4",
- "rustix 1.0.8",
+ "rustix 1.1.4",
  "wayland-backend",
  "wayland-scanner",
 ]
@@ -4988,7 +5097,7 @@ version = "0.31.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "447ccc440a881271b19e9989f75726d60faa09b95b0200a9b7eb5cc47c3eeb29"
 dependencies = [
- "rustix 1.0.8",
+ "rustix 1.1.4",
  "wayland-client",
  "xcursor",
 ]
@@ -5056,9 +5165,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -5076,15 +5185,15 @@ dependencies = [
 
 [[package]]
 name = "webbrowser"
-version = "1.0.5"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf4f3c0ba838e82b4e5ccc4157003fb8c324ee24c058470ffb82820becbde98"
+checksum = "fe985f41e291eecef5e5c0770a18d28390addb03331c043964d9e916453d6f16"
 dependencies = [
  "core-foundation 0.10.1",
  "jni",
  "log",
  "ndk-context",
- "objc2 0.6.3",
+ "objc2 0.6.4",
  "objc2-foundation 0.3.2",
  "url",
  "web-sys",
@@ -5092,9 +5201,9 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "0.26.6"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958"
+checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -5107,9 +5216,9 @@ checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
 
 [[package]]
 name = "wgpu"
-version = "28.0.0"
+version = "29.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9cb534d5ffd109c7d1135f34cdae29e60eab94855a625dcfe1705f8bc7ad79f"
+checksum = "72c239a9a747bbd379590985bac952c2e53cb19873f7072b3370c6a6a8e06837"
 dependencies = [
  "arrayvec",
  "bitflags 2.9.4",
@@ -5137,13 +5246,13 @@ dependencies = [
 
 [[package]]
 name = "wgpu-core"
-version = "28.0.0"
+version = "29.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bb4c8b5db5f00e56f1f08869d870a0dff7c8bc7ebc01091fec140b0cf0211a9"
+checksum = "1e80ac6cf1895df6342f87d975162108f9d98772a0d74bc404ab7304ac29469e"
 dependencies = [
  "arrayvec",
- "bit-set",
- "bit-vec",
+ "bit-set 0.9.1",
+ "bit-vec 0.9.1",
  "bitflags 2.9.4",
  "bytemuck",
  "cfg_aliases",
@@ -5159,67 +5268,67 @@ dependencies = [
  "raw-window-handle",
  "rustc-hash 1.1.0",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "wgpu-core-deps-apple",
  "wgpu-core-deps-emscripten",
  "wgpu-core-deps-wasm",
  "wgpu-core-deps-windows-linux-android",
  "wgpu-hal",
+ "wgpu-naga-bridge",
  "wgpu-types",
 ]
 
 [[package]]
 name = "wgpu-core-deps-apple"
-version = "28.0.0"
+version = "29.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87b7b696b918f337c486bf93142454080a32a37832ba8a31e4f48221890047da"
+checksum = "43acd053312501689cd92a01a9638d37f3e41a5fd9534875efa8917ee2d11ac0"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-emscripten"
-version = "28.0.0"
+version = "29.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b251c331f84feac147de3c4aa3aa45112622a95dd7ee1b74384fa0458dbd79"
+checksum = "ef043bf135cc68b6f667c55ff4e345ce2b5924d75bad36a47921b0287ca4b24a"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-wasm"
-version = "28.0.0"
+version = "29.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12a2cf578ce8d7d50d0e63ddc2345c7dcb599f6eb90b888813406ea78b9b7010"
+checksum = "2f7b75e72f49035f000dd5262e4126242e92a090a4fd75931ecfe7e60784e6fa"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-core-deps-windows-linux-android"
-version = "28.0.0"
+version = "29.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ca976e72b2c9964eb243e281f6ce7f14a514e409920920dcda12ae40febaae"
+checksum = "725d5c006a8c02967b6d93ef04f6537ec4593313e330cfe86d9d3f946eb90f28"
 dependencies = [
  "wgpu-hal",
 ]
 
 [[package]]
 name = "wgpu-hal"
-version = "28.0.0"
+version = "29.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "293080d77fdd14d6b08a67c5487dfddbf874534bb7921526db56a7b75d7e3bef"
+checksum = "89a47aef47636562f3937285af4c44b4b5b404b46577471411cc5313a921da7e"
 dependencies = [
  "android_system_properties",
  "arrayvec",
  "ash",
- "bit-set",
+ "bit-set 0.9.1",
  "bitflags 2.9.4",
- "block",
+ "block2 0.6.2",
  "bytemuck",
  "cfg-if",
  "cfg_aliases",
- "core-graphics-types 0.2.0",
  "glow",
  "glutin_wgl_sys",
  "gpu-allocator",
@@ -5230,10 +5339,13 @@ dependencies = [
  "libc",
  "libloading",
  "log",
- "metal",
  "naga",
  "ndk-sys",
- "objc",
+ "objc2 0.6.4",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.2",
+ "objc2-metal 0.3.2",
+ "objc2-quartz-core 0.3.2",
  "once_cell",
  "ordered-float",
  "parking_lot",
@@ -5242,45 +5354,43 @@ dependencies = [
  "profiling",
  "range-alloc",
  "raw-window-handle",
+ "raw-window-metal",
  "renderdoc-sys",
  "smallvec",
- "thiserror 2.0.17",
+ "thiserror 2.0.18",
  "wasm-bindgen",
+ "wayland-sys",
  "web-sys",
+ "wgpu-naga-bridge",
  "wgpu-types",
  "windows",
- "windows-core 0.62.2",
+ "windows-core",
+]
+
+[[package]]
+name = "wgpu-naga-bridge"
+version = "29.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4684f4410da0cf95a4cb63bb5edaac022461dedb6adf0b64d0d9b5f6890d51"
+dependencies = [
+ "naga",
+ "wgpu-types",
 ]
 
 [[package]]
 name = "wgpu-types"
-version = "28.0.0"
+version = "29.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e18308757e594ed2cd27dddbb16a139c42a683819d32a2e0b1b0167552f5840c"
+checksum = "ec2675540fb1a5cfa5ef122d3d5f390e2c75711a0b946410f2d6ac3a0f77d1f6"
 dependencies = [
  "bitflags 2.9.4",
  "bytemuck",
  "js-sys",
  "log",
+ "raw-window-handle",
  "web-sys",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
 [[package]]
 name = "winapi-util"
 version = "0.1.9"
@@ -5290,12 +5400,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
 [[package]]
 name = "windows"
 version = "0.62.2"
@@ -5303,7 +5407,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
 dependencies = [
  "windows-collections",
- "windows-core 0.62.2",
+ "windows-core",
  "windows-future",
  "windows-numerics",
 ]
@@ -5314,20 +5418,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
 dependencies = [
- "windows-core 0.62.2",
-]
-
-[[package]]
-name = "windows-core"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
-dependencies = [
- "windows-implement",
- "windows-interface",
- "windows-link 0.1.3",
- "windows-result 0.3.4",
- "windows-strings 0.4.2",
+ "windows-core",
 ]
 
 [[package]]
@@ -5338,9 +5429,9 @@ checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link 0.2.1",
- "windows-result 0.4.1",
- "windows-strings 0.5.1",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
 ]
 
 [[package]]
@@ -5349,8 +5440,8 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
 dependencies = [
- "windows-core 0.62.2",
- "windows-link 0.2.1",
+ "windows-core",
+ "windows-link",
  "windows-threading",
 ]
 
@@ -5376,12 +5467,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "windows-link"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
 [[package]]
 name = "windows-link"
 version = "0.2.1"
@@ -5394,17 +5479,8 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
 dependencies = [
- "windows-core 0.62.2",
- "windows-link 0.2.1",
-]
-
-[[package]]
-name = "windows-result"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
-dependencies = [
- "windows-link 0.1.3",
+ "windows-core",
+ "windows-link",
 ]
 
 [[package]]
@@ -5413,16 +5489,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
- "windows-link 0.2.1",
-]
-
-[[package]]
-name = "windows-strings"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
-dependencies = [
- "windows-link 0.1.3",
+ "windows-link",
 ]
 
 [[package]]
@@ -5431,16 +5498,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
- "windows-link 0.2.1",
-]
-
-[[package]]
-name = "windows-sys"
-version = "0.45.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-dependencies = [
- "windows-targets 0.42.2",
+ "windows-link",
 ]
 
 [[package]]
@@ -5467,7 +5525,7 @@ version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets 0.53.3",
+ "windows-targets 0.53.5",
 ]
 
 [[package]]
@@ -5476,22 +5534,7 @@ version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 dependencies = [
- "windows-link 0.2.1",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
+ "windows-link",
 ]
 
 [[package]]
@@ -5512,11 +5555,11 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.53.3"
+version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows-link 0.1.3",
+ "windows-link",
  "windows_aarch64_gnullvm 0.53.0",
  "windows_aarch64_msvc 0.53.0",
  "windows_i686_gnu 0.53.0",
@@ -5533,15 +5576,9 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
 dependencies = [
- "windows-link 0.2.1",
+ "windows-link",
 ]
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
@@ -5554,12 +5591,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
@@ -5572,12 +5603,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -5602,12 +5627,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
@@ -5620,12 +5639,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
@@ -5638,12 +5651,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
@@ -5656,12 +5663,6 @@ version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -5676,9 +5677,9 @@ checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
 
 [[package]]
 name = "winit"
-version = "0.30.12"
+version = "0.30.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66d4b9ed69c4009f6321f762d6e61ad8a2389cd431b97cb1e146812e9e6c732"
+checksum = "a6755fa58a9f8350bd1e472d4c3fcc25f824ec358933bba33306d0b63df5978d"
 dependencies = [
  "ahash",
  "android-activity",
@@ -5700,13 +5701,13 @@ dependencies = [
  "objc2 0.5.2",
  "objc2-app-kit 0.2.2",
  "objc2-foundation 0.2.2",
- "objc2-ui-kit",
+ "objc2-ui-kit 0.2.2",
  "orbclient",
  "percent-encoding",
  "pin-project",
  "raw-window-handle",
  "redox_syscall 0.4.1",
- "rustix 0.38.38",
+ "rustix 0.38.44",
  "sctk-adwaita",
  "smithay-client-toolkit",
  "smol_str",
@@ -5736,13 +5737,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.33.0"
+name = "wit-bindgen"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
-dependencies = [
- "bitflags 2.9.4",
-]
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
 
 [[package]]
 name = "writeable"
@@ -5772,7 +5770,7 @@ dependencies = [
  "libc",
  "libloading",
  "once_cell",
- "rustix 1.0.8",
+ "rustix 1.1.4",
  "x11rb-protocol",
 ]
 
@@ -5821,7 +5819,7 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
 [[package]]
 name = "xtask"
-version = "0.33.3"
+version = "0.34.2"
 
 [[package]]
 name = "yaml-rust"
@@ -5995,9 +5993,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
diff --git a/Cargo.toml b/Cargo.toml
index d12b040fe..b924a7db3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -24,7 +24,7 @@ members = [
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.92"
-version = "0.33.3"
+version = "0.34.2"
 
 
 [profile.release]
@@ -55,18 +55,18 @@ opt-level = 2
 
 
 [workspace.dependencies]
-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 }
+emath = { version = "0.34.2", path = "crates/emath", default-features = false }
+ecolor = { version = "0.34.2", path = "crates/ecolor", default-features = false }
+epaint = { version = "0.34.2", path = "crates/epaint", default-features = false }
+epaint_default_fonts = { version = "0.34.2", path = "crates/epaint_default_fonts" }
+egui = { version = "0.34.2", path = "crates/egui", default-features = false }
+egui-winit = { version = "0.34.2", path = "crates/egui-winit", default-features = false }
+egui_extras = { version = "0.34.2", path = "crates/egui_extras", default-features = false }
+egui-wgpu = { version = "0.34.2", path = "crates/egui-wgpu", default-features = false }
+egui_demo_lib = { version = "0.34.2", path = "crates/egui_demo_lib", default-features = false }
+egui_glow = { version = "0.34.2", path = "crates/egui_glow", default-features = false }
+egui_kittest = { version = "0.34.2", path = "crates/egui_kittest", default-features = false }
+eframe = { version = "0.34.2", path = "crates/eframe", default-features = false }
 
 accesskit = "0.24.0"
 accesskit_consumer = "0.35.0"
@@ -80,34 +80,35 @@ arboard = { version = "3.6.1", default-features = false }
 backtrace = "0.3.76"
 bitflags = "2.9.4"
 bytemuck = "1.24.0"
-chrono = { version = "0.4.42", default-features = false }
 cint = "0.3.1"
 color-hex = "0.2.0"
 criterion = { version = "0.7.0", default-features = false }
 dify = { version = "0.8", default-features = false }
 directories = "6.0.0"
 document-features = "0.2.11"
-ehttp = { version = "0.6.0", default-features = false }
+ehttp = { version = "0.7.1", default-features = false }
 enum-map = "2.7.3"
 env_logger = { version = "0.11.8", default-features = false }
 font-types = { version = "0.11.0", default-features = false, features = ["std"] }
-glow = "0.16.0"
+glow = "0.17.0"
 glutin = { version = "0.32.3", default-features = false }
 glutin-winit = { version = "0.5.0", default-features = false }
+harfrust = "0.5.2"
 home = "0.5.9"
 image = { version = "0.25.6", default-features = false }
+jiff = { version = "0.2.23", default-features = false }
 js-sys = "0.3.77"
-kittest = { version = "0.3.0" }
+kittest = { version = "0.4.0" }
 log = { version = "0.4.28", features = ["std"] }
 memoffset = "0.9.1"
 mimalloc = "0.1.48"
 mime_guess2 = { version = "2.3.1", default-features = false }
 mint = "0.5.9"
 nohash-hasher = "0.2.0"
-objc2 = "0.5.2"
-objc2-app-kit = { version = "0.2.2", default-features = false }
-objc2-foundation = { version = "0.2.2", default-features = false }
-objc2-ui-kit = { version = "0.2.2", default-features = false }
+objc2 = "0.6.4"
+objc2-app-kit = { version = "0.3.2", default-features = false }
+objc2-foundation = { version = "0.3.2", default-features = false }
+objc2-ui-kit = { version = "0.3.2", default-features = false }
 open = "5.3.2"
 parking_lot = "0.12.5"
 percent-encoding = "2.3.2"
@@ -121,7 +122,7 @@ raw-window-handle = "0.6.2"
 rayon = "1.11.0"
 resvg = { version = "0.45.1", default-features = false }
 rfd = "0.17.2"
-ron = "0.11.0"
+ron = "0.12.0"
 self_cell = "1.2.1"
 serde = { version = "1.0.228", features = ["derive"] }
 similar-asserts = "1.7.0"
@@ -133,23 +134,25 @@ syntect = { version = "5.3.0", default-features = false }
 tempfile = "3.23.0"
 thiserror = "2.0.17"
 tokio = "1.49"
-toml = {version = "1", default-features = false }
+toml = { version = "1.0.0", default-features = false }
 type-map = "0.5.1"
 unicode_names2 = { version = "2.0.0", default-features = false }
+unicode-general-category = "1.1.0"
 unicode-segmentation = "1.12.0"
-vello_cpu = { version = "0.0.6", default-features = false, features = ["std", "u8_pipeline", "f32_pipeline"] }
-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"
+vello_cpu = { version = "0.0.7", default-features = false, features = [
+  "std",
+  "u8_pipeline",
+  "f32_pipeline",
+] }
+wasm-bindgen = "0.2.108" # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml. Don't update this spuriously, because of https://github.com/rerun-io/rerun/issues/8766
+wasm-bindgen-futures = "0.4.58"
 wayland-cursor = { version = "0.31.11", default-features = false }
 web-sys = "0.3.77"
 web-time = "1.1.0" # Timekeeping for native and web
 webbrowser = "1.0.5"
-wgpu = { version = "28.0.0", default-features = false, features = ["std"] }
+wgpu = { version = "29.0.1", default-features = false, features = ["std"] }
 windows-sys = "0.61.2"
-winit = { version = "0.30.12", default-features = false }
-
-[patch.crates-io]
-kittest = { git = "https://github.com/rerun-io/kittest", branch = "main" }
+winit = { version = "0.30.13", default-features = false }
 
 [workspace.lints.rust]
 unsafe_code = "deny"
@@ -221,10 +224,12 @@ flat_map_option = "warn"
 float_cmp_const = "warn"
 fn_params_excessive_bools = "warn"
 fn_to_numeric_cast_any = "warn"
+format_push_string = "warn"
 from_iter_instead_of_collect = "warn"
 get_unwrap = "warn"
 if_let_mutex = "warn"
 ignore_without_reason = "warn"
+ignored_unit_patterns = "warn"
 implicit_clone = "warn"
 implied_bounds_in_impls = "warn"
 imprecise_flops = "warn"
@@ -273,6 +278,7 @@ mismatching_type_param_order = "warn"
 missing_assert_message = "warn"
 missing_enforced_import_renames = "warn"
 missing_errors_doc = "warn"
+missing_fields_in_debug = "warn"
 missing_safety_doc = "warn"
 mixed_attributes_style = "warn"
 mut_mut = "warn"
@@ -282,6 +288,7 @@ needless_continue = "warn"
 needless_for_each = "warn"
 needless_pass_by_ref_mut = "warn"
 needless_pass_by_value = "warn"
+needless_raw_string_hashes = "warn"
 negative_feature_names = "warn"
 non_std_lazy_statics = "warn"
 non_zero_suggestions = "warn"
@@ -302,6 +309,7 @@ rc_mutex = "warn"
 readonly_write_lock = "warn"
 redundant_type_annotations = "warn"
 ref_as_ptr = "warn"
+ref_option = "warn"
 ref_option_ref = "warn"
 ref_patterns = "warn"
 rest_pat_in_fully_bound_structs = "warn"
diff --git a/README.md b/README.md
index f4a094465..7eebd0423 100644
--- a/README.md
+++ b/README.md
@@ -10,16 +10,14 @@
 [![Discord](https://img.shields.io/discord/900275882684477440?label=egui%20discord)](https://discord.gg/JFcEma9bJq)
 
 
+<br/>
 <div align="center">
-<a href="https://www.rerun.io/"><img src="https://github.com/user-attachments/assets/78e79463-4357-461b-bbd1-31aa5ef5e1a2" width="250"></a>
+<a href="https://www.egui.rs/"><img src="https://github.com/user-attachments/assets/cfaf1d43-9338-490f-ae82-99b420baa1b0" width="400"></a>
 
-egui development is sponsored by [Rerun](https://www.rerun.io/), a startup building<br>
-an SDK for visualizing streams of multimodal data.
-</div>
-
----
+<br/>
 
 👉 [Click to run the web demo](https://www.egui.rs/#demo) 👈
+</div>
 
 egui (pronounced "e-gooey") is a simple, fast, and highly portable immediate mode GUI library for Rust. egui runs on the web, natively, and [in your favorite game engine](#integrations).
 
diff --git a/crates/ecolor/CHANGELOG.md b/crates/ecolor/CHANGELOG.md
index a4fe1f3de..1e10de83b 100644
--- a/crates/ecolor/CHANGELOG.md
+++ b/crates/ecolor/CHANGELOG.md
@@ -6,6 +6,18 @@ 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.34.2 - 2026-05-04
+Nothing new
+
+
+## 0.34.1 - 2026-03-27
+Nothing new
+
+
+## 0.34.0 - 2026-03-26
+Nothing new
+
+
 ## 0.33.3 - 2025-12-11
 Nothing new
 
diff --git a/crates/ecolor/Cargo.toml b/crates/ecolor/Cargo.toml
index f37aff109..43543113a 100644
--- a/crates/ecolor/Cargo.toml
+++ b/crates/ecolor/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 repository = "https://github.com/emilk/egui"
 categories = ["mathematics", "encoding"]
 keywords = ["gui", "color", "conversion", "gamedev", "images"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
 
 [lints]
 workspace = true
diff --git a/crates/eframe/CHANGELOG.md b/crates/eframe/CHANGELOG.md
index 74a705251..9071754f2 100644
--- a/crates/eframe/CHANGELOG.md
+++ b/crates/eframe/CHANGELOG.md
@@ -7,6 +7,39 @@ 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.34.2 - 2026-05-04
+* Document glow-only fields in `NativeOptions` [#8104](https://github.com/emilk/egui/pull/8104) by [@emilk](https://github.com/emilk)
+
+
+## 0.34.1 - 2026-03-27
+* `wgpu` backend: Enable WebGL fallback [#8038](https://github.com/emilk/egui/pull/8038) by [@emilk](https://github.com/emilk)
+* Only apply cursor style to the `<canvas>` [#8036](https://github.com/emilk/egui/pull/8036) by [@mkeeter](https://github.com/mkeeter)
+
+
+## 0.34.0 - 2026-03-26
+### ⭐ Added
+* Add feature `wgpu_no_default_features` [#7700](https://github.com/emilk/egui/pull/7700) by [@emilk](https://github.com/emilk)
+* Add `ViewportInfo::occluded` and `visible` [#7948](https://github.com/emilk/egui/pull/7948) by [@emilk](https://github.com/emilk)
+* Add `eframe::WindowChromeMetrics` (macOS only) [#8015](https://github.com/emilk/egui/pull/8015) by [@emilk](https://github.com/emilk)
+
+### 🔧 Changed
+* Replace `App::update` with `fn logic` and `fn ui` [#7775](https://github.com/emilk/egui/pull/7775) by [@emilk](https://github.com/emilk)
+* Make `wgpu` the default renderer for `eframe` and egui.rs [#7615](https://github.com/emilk/egui/pull/7615) by [@emilk](https://github.com/emilk)
+* Roll out new egui icon and logo [#7995](https://github.com/emilk/egui/pull/7995) by [@emilk](https://github.com/emilk)
+* Update wasm-bindgen to 0.2.108, and ehttp to 0.7.1 [#7996](https://github.com/emilk/egui/pull/7996) by [@emilk](https://github.com/emilk)
+* Update to `wgpu` 29 [#7990](https://github.com/emilk/egui/pull/7990) by [@cwfitzgerald](https://github.com/cwfitzgerald)
+* Allow fallback from smithay to arboard when getting clipboard [#7976](https://github.com/emilk/egui/pull/7976) by [@wizzeh](https://github.com/wizzeh)
+
+### 🐛 Fixed
+* Fix: update get_proc_address to use Arc for better ownership management [#7922](https://github.com/emilk/egui/pull/7922) by [@Wybxc](https://github.com/Wybxc)
+* Much improved IME [#7967](https://github.com/emilk/egui/pull/7967) by [@umajho](https://github.com/umajho)
+* Improve behavior of invisible windows [#7905](https://github.com/emilk/egui/pull/7905) by [@gcailly](https://github.com/gcailly)
+
+### 🚀 Performance
+* Avoid repaints on device mouse motion outside window [#7866](https://github.com/emilk/egui/pull/7866) by [@inktomi](https://github.com/inktomi)
+* Only run `App::ui` if the application is visible [#7950](https://github.com/emilk/egui/pull/7950) by [@emilk](https://github.com/emilk)
+
+
 ## 0.33.3 - 2025-12-11
 Nothing new
 
diff --git a/crates/eframe/Cargo.toml b/crates/eframe/Cargo.toml
index 86f63c50e..0530b64a8 100644
--- a/crates/eframe/Cargo.toml
+++ b/crates/eframe/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 repository = "https://github.com/emilk/egui/tree/main/crates/eframe"
 categories = ["gui", "game-development"]
 keywords = ["egui", "gui", "gamedev"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml", "data/icon.png"]
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml", "data/icon.png"]
 
 [package.metadata.docs.rs]
 all-features = true
@@ -89,7 +89,7 @@ web_screen_reader = ["web-sys/SpeechSynthesis", "web-sys/SpeechSynthesisUtteranc
 ## See <https://github.com/emilk/egui/issues/5889> for more details.
 ##
 ## By default, eframe will prefer WebGPU over WebGL, but
-## you can configure this at run-time with [`NativeOptions::wgpu_options`].
+## you can configure this at run-time with `WebOptions::wgpu_options`.
 wgpu = ["wgpu_no_default_features", "egui-wgpu/default"]
 
 ## This is exactly like the `wgpu` feature, but does NOT enable the default features of `wgpu` and `egui-wgpu`.
@@ -155,7 +155,6 @@ glutin-winit = { workspace = true, optional = true, default-features = false, fe
   "wgl",
 ] }
 home = { workspace = true, optional = true }
-wgpu = { workspace = true, optional = true }
 
 # mac:
 [target.'cfg(any(target_os = "macos"))'.dependencies]
@@ -169,10 +168,17 @@ objc2-foundation = { workspace = true, default-features = false, features = [
 objc2-app-kit = { workspace = true, default-features = false, features = [
   "std",
   "NSApplication",
+  "NSBitmapImageRep",
+  "NSButton",
+  "NSControl",
+  "NSGraphics",
   "NSImage",
+  "NSImageRep",
   "NSMenu",
   "NSMenuItem",
   "NSResponder",
+  "NSView",
+  "NSWindow",
 ] }
 
 # windows:
diff --git a/crates/eframe/data/icon.png b/crates/eframe/data/icon.png
index cf1e6c3eb..4ce7cc588 100644
Binary files a/crates/eframe/data/icon.png and b/crates/eframe/data/icon.png differ
diff --git a/crates/eframe/src/epi.rs b/crates/eframe/src/epi.rs
index b9a178a1d..fae4cbc7e 100644
--- a/crates/eframe/src/epi.rs
+++ b/crates/eframe/src/epi.rs
@@ -2,7 +2,7 @@
 //!
 //! `epi` provides interfaces for window management and serialization.
 //!
-//! Start by looking at the [`App`] trait, and implement [`App::update`].
+//! Start by looking at the [`App`] trait, and implement [`App::ui`].
 
 #![warn(missing_docs)] // Let's keep `epi` well-documented.
 
@@ -161,22 +161,6 @@ pub trait App {
     /// (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`].
-    ///
-    /// The [`egui::Context`] 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).
-    #[deprecated = "Use Self::ui instead"]
-    fn update(&mut self, ctx: &egui::Context, frame: &mut Frame) {
-        _ = (ctx, frame);
-    }
-
     /// Get a handle to the app.
     ///
     /// Can be used from web to interact or other external context.
@@ -256,7 +240,7 @@ pub trait App {
         true
     }
 
-    /// A hook for manipulating or filtering raw input before it is processed by [`Self::update`].
+    /// A hook for manipulating or filtering raw input before it is processed by [`Self::ui`].
     ///
     /// This function provides a way to modify or filter input events before they are processed by egui.
     ///
@@ -275,22 +259,6 @@ pub trait App {
     fn raw_input_hook(&mut self, _ctx: &egui::Context, _raw_input: &mut egui::RawInput) {}
 }
 
-/// Selects the level of hardware graphics acceleration.
-#[cfg(not(target_arch = "wasm32"))]
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub enum HardwareAcceleration {
-    /// Require graphics acceleration.
-    Required,
-
-    /// Prefer graphics acceleration, but fall back to software.
-    Preferred,
-
-    /// Do NOT use graphics acceleration.
-    ///
-    /// On some platforms (macOS) this is ignored and treated the same as [`Self::Preferred`].
-    Off,
-}
-
 /// Options controlling the behavior of a native window.
 ///
 /// Additional windows can be opened using (egui viewports)[`egui::viewport`].
@@ -314,11 +282,6 @@ pub struct NativeOptions {
     /// To avoid this, set the icon to [`egui::IconData::default`].
     pub viewport: egui::ViewportBuilder,
 
-    /// Turn on vertical syncing, limiting the FPS to the display refresh rate.
-    ///
-    /// The default is `true`.
-    pub vsync: bool,
-
     /// Set the level of the multisampling anti-aliasing (MSAA).
     ///
     /// Must be a power-of-two. Higher = more smooth 3D.
@@ -340,11 +303,6 @@ pub struct NativeOptions {
     /// `egui` doesn't need the stencil buffer, so the default value is 0.
     pub stencil_buffer: u8,
 
-    /// Specify whether or not hardware acceleration is preferred, required, or not.
-    ///
-    /// Default: [`HardwareAcceleration::Preferred`].
-    pub hardware_acceleration: HardwareAcceleration,
-
     /// What rendering backend to use.
     #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
     pub renderer: Renderer,
@@ -381,13 +339,6 @@ pub struct NativeOptions {
     #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
     pub window_builder: Option<WindowBuilderHook>,
 
-    #[cfg(feature = "glow")]
-    /// Needed for cross compiling for VirtualBox VMSVGA driver with OpenGL ES 2.0 and OpenGL 2.1 which doesn't support SRGB texture.
-    /// See <https://github.com/emilk/egui/pull/1993>.
-    ///
-    /// For OpenGL ES 2.0: set this to [`egui_glow::ShaderVersion::Es100`] to solve blank texture problem (by using the "fallback shader").
-    pub shader_version: Option<egui_glow::ShaderVersion>,
-
     /// On desktop: make the window position to be centered at initialization.
     ///
     /// Platform specific:
@@ -395,6 +346,10 @@ pub struct NativeOptions {
     /// Wayland desktop currently not supported.
     pub centered: bool,
 
+    /// Configures glow instance.
+    #[cfg(feature = "glow")]
+    pub glow_options: egui_glow::GlowConfiguration,
+
     /// Configures wgpu instance/device/adapter/surface creation and renderloop.
     #[cfg(feature = "wgpu_no_default_features")]
     pub wgpu_options: egui_wgpu::WgpuConfiguration,
@@ -439,6 +394,9 @@ impl Clone for NativeOptions {
             #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
             window_builder: None, // Skip any builder callbacks if cloning
 
+            #[cfg(feature = "glow")]
+            glow_options: self.glow_options.clone(),
+
             #[cfg(feature = "wgpu_no_default_features")]
             wgpu_options: self.wgpu_options.clone(),
 
@@ -458,11 +416,9 @@ impl Default for NativeOptions {
         Self {
             viewport: Default::default(),
 
-            vsync: true,
             multisampling: 0,
             depth_buffer: 0,
             stencil_buffer: 0,
-            hardware_acceleration: HardwareAcceleration::Preferred,
 
             #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
             renderer: Renderer::default(),
@@ -475,13 +431,14 @@ impl Default for NativeOptions {
             #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
             window_builder: None,
 
-            #[cfg(feature = "glow")]
-            shader_version: None,
-
             centered: false,
 
+            #[cfg(feature = "glow")]
+            glow_options: egui_glow::GlowConfiguration::default(),
+
             #[cfg(feature = "wgpu_no_default_features")]
-            wgpu_options: egui_wgpu::WgpuConfiguration::default(),
+            wgpu_options: egui_wgpu::WgpuConfiguration::default()
+                .with_surface_config(egui_wgpu::SurfaceConfig::LOW_LATENCY),
 
             persist_window: true,
 
@@ -516,6 +473,10 @@ pub struct WebOptions {
     #[cfg(feature = "glow")]
     pub webgl_context_option: WebGlContextOption,
 
+    /// Configures glow instance.
+    #[cfg(feature = "glow")]
+    pub glow_options: egui_glow::GlowConfiguration,
+
     /// Configures wgpu instance/device/adapter/surface creation and renderloop.
     #[cfg(feature = "wgpu_no_default_features")]
     pub wgpu_options: egui_wgpu::WgpuConfiguration,
@@ -560,6 +521,9 @@ impl Default for WebOptions {
             #[cfg(feature = "glow")]
             webgl_context_option: WebGlContextOption::BestFirst,
 
+            #[cfg(feature = "glow")]
+            glow_options: egui_glow::GlowConfiguration::default(),
+
             #[cfg(feature = "wgpu_no_default_features")]
             wgpu_options: egui_wgpu::WgpuConfiguration::default(),
 
@@ -776,7 +740,7 @@ impl Frame {
     /// * Read the pixel buffer from the previous frame (`glow::Context::read_pixels`).
     /// * Render things behind the egui windows.
     ///
-    /// Note that all egui painting is deferred to after the call to [`App::update`]
+    /// Note that all egui painting is deferred to after the call to [`App::ui`]
     /// ([`egui`] only collects [`egui::Shape`]s and then eframe paints them all in one go later on).
     ///
     /// To get a [`glow`] context you need to compile with the `glow` feature flag,
@@ -805,6 +769,28 @@ impl Frame {
     pub fn wgpu_render_state(&self) -> Option<&egui_wgpu::RenderState> {
         self.wgpu_render_state.as_ref()
     }
+
+    /// The currently-applied runtime surface config (present mode, frame latency)
+    /// used by the `wgpu` renderer, if any.
+    ///
+    /// Returns `None` when not using the `wgpu` backend.
+    #[cfg(feature = "wgpu_no_default_features")]
+    pub fn wgpu_surface_config(&self) -> Option<egui_wgpu::SurfaceConfig> {
+        self.wgpu_render_state
+            .as_ref()
+            .map(|state| state.surface_config)
+    }
+
+    /// Set the runtime surface config (present mode, frame latency) for the `wgpu`
+    /// renderer. The surface is reconfigured on the next paint.
+    ///
+    /// No-op when not using the `wgpu` backend.
+    #[cfg(feature = "wgpu_no_default_features")]
+    pub fn set_wgpu_surface_config(&mut self, config: egui_wgpu::SurfaceConfig) {
+        if let Some(state) = &mut self.wgpu_render_state {
+            state.surface_config = config;
+        }
+    }
 }
 
 /// Information about the web environment (if applicable).
@@ -882,7 +868,7 @@ pub struct IntegrationInfo {
 
     /// Seconds of cpu usage (in seconds) on the previous frame.
     ///
-    /// This includes [`App::update`] as well as rendering (except for vsync waiting).
+    /// This includes [`App::ui`] as well as rendering (except for vsync waiting).
     ///
     /// For a more detailed view of cpu usage, connect your preferred profiler by enabling it's feature in [`profiling`](https://crates.io/crates/profiling).
     ///
diff --git a/crates/eframe/src/lib.rs b/crates/eframe/src/lib.rs
index 151fb79ce..f0d049858 100644
--- a/crates/eframe/src/lib.rs
+++ b/crates/eframe/src/lib.rs
@@ -6,7 +6,7 @@
 //! To get started, see the [examples](https://github.com/emilk/egui/tree/main/examples).
 //! To learn how to set up `eframe` for web and native, go to <https://github.com/emilk/eframe_template/> and follow the instructions there!
 //!
-//! In short, you implement [`App`] (especially [`App::update`]) and then
+//! In short, you implement [`App`] (especially [`App::ui`]) and then
 //! call [`crate::run_native`] from your `main.rs`, and/or use `eframe::WebRunner` from your `lib.rs`.
 //!
 //! ## Compiling for web
@@ -19,7 +19,7 @@
 //!
 //! ## Simplified usage
 //! If your app is only for native, and you don't need advanced features like state persistence,
-//! then you can use the simpler function [`run_simple_native`].
+//! then you can use the simpler function [`run_ui_native`].
 //!
 //! ## Usage, native:
 //! ``` no_run
@@ -159,7 +159,7 @@ pub use {egui, egui::emath, egui::epaint};
 pub use {egui_glow, glow};
 
 #[cfg(feature = "wgpu_no_default_features")]
-pub use {egui_wgpu, wgpu};
+pub use {egui_wgpu, egui_wgpu::SurfaceConfig, egui_wgpu::WgpuConfiguration, egui_wgpu::wgpu};
 
 mod epi;
 
@@ -190,6 +190,9 @@ pub use web::{WebLogger, WebRunner};
 #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
 mod native;
 
+#[cfg(target_os = "macos")]
+pub use native::macos::WindowChromeMetrics;
+
 #[cfg(not(target_arch = "wasm32"))]
 #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
 pub use native::run::EframeWinitApplication;
@@ -254,8 +257,27 @@ pub mod icon_data;
 #[cfg(any(feature = "glow", feature = "wgpu_no_default_features"))]
 #[allow(clippy::allow_attributes, clippy::needless_pass_by_value)]
 pub fn run_native(
+    app_name: &str,
+    native_options: NativeOptions,
+    app_creator: AppCreator<'_>,
+) -> Result {
+    run_native_ext(app_name, native_options, None, app_creator)
+}
+
+/// Like [`run_native`], but lets you supply a pre-existing [`egui::Context`].
+///
+/// If `egui_ctx` is `Some`, that context will be used by eframe instead of creating a fresh one.
+/// If it is `None`, eframe creates a new context (same behavior as [`run_native`]).
+///
+/// # Errors
+/// 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::allow_attributes, clippy::needless_pass_by_value)]
+pub fn run_native_ext(
     app_name: &str,
     mut native_options: NativeOptions,
+    egui_ctx: Option<egui::Context>,
     app_creator: AppCreator<'_>,
 ) -> Result {
     let renderer = init_native(app_name, &mut native_options);
@@ -264,13 +286,13 @@ pub fn run_native(
         #[cfg(feature = "glow")]
         Renderer::Glow => {
             log::debug!("Using the glow renderer");
-            native::run::run_glow(app_name, native_options, app_creator)
+            native::run::run_glow(app_name, native_options, egui_ctx, app_creator)
         }
 
         #[cfg(feature = "wgpu_no_default_features")]
         Renderer::Wgpu => {
             log::debug!("Using the wgpu renderer");
-            native::run::run_wgpu(app_name, native_options, app_creator)
+            native::run::run_wgpu(app_name, native_options, egui_ctx, app_creator)
         }
     }
 }
@@ -443,67 +465,6 @@ pub fn run_ui_native(
     )
 }
 
-/// 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,
-    update_fun: impl FnMut(&egui::Context, &mut Frame) + 'static,
-) -> Result {
-    struct SimpleApp<U> {
-        update_fun: U,
-    }
-
-    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);
-        }
-    }
-
-    run_native(
-        app_name,
-        native_options,
-        Box::new(|_cc| Ok(Box::new(SimpleApp { update_fun }))),
-    )
-}
-
 // ----------------------------------------------------------------------------
 
 /// The different problems that can occur when trying to run `eframe`.
diff --git a/crates/eframe/src/native/app_icon.rs b/crates/eframe/src/native/app_icon.rs
index 3ac61d8e6..85be6754b 100644
--- a/crates/eframe/src/native/app_icon.rs
+++ b/crates/eframe/src/native/app_icon.rs
@@ -204,7 +204,7 @@ fn set_title_and_icon_mac(title: &str, icon_data: Option<&IconData>) -> AppIconS
     use crate::icon_data::IconDataExt as _;
     profiling::function_scope!();
 
-    use objc2::ClassType as _;
+    use objc2::AnyThread as _;
     use objc2_app_kit::{NSApplication, NSImage};
     use objc2_foundation::NSString;
 
diff --git a/crates/eframe/src/native/epi_integration.rs b/crates/eframe/src/native/epi_integration.rs
index 5b22eb08c..be7e3e787 100644
--- a/crates/eframe/src/native/epi_integration.rs
+++ b/crates/eframe/src/native/epi_integration.rs
@@ -214,15 +214,17 @@ impl EpiIntegration {
         Self {
             frame,
             last_auto_save: Instant::now(),
-            egui_ctx,
             pending_full_output: Default::default(),
             close: false,
             can_drag_window: false,
             #[cfg(feature = "persistence")]
             persist_window: native_options.persist_window,
             app_icon_setter,
-            beginning: Instant::now(),
+            beginning: Instant::now()
+                .checked_sub(web_time::Duration::from_secs_f64(egui_ctx.time()))
+                .unwrap_or_else(Instant::now),
             is_first_frame: true,
+            egui_ctx,
         }
     }
 
@@ -259,7 +261,7 @@ impl EpiIntegration {
 
     /// Run user code - this can create immediate viewports, so hold no locks over this!
     ///
-    /// If `viewport_ui_cb` is None, we are in the root viewport and will call [`crate::App::update`].
+    /// If `viewport_ui_cb` is None, we are in the root viewport and will call [`crate::App::ui`].
     pub fn update(
         &mut self,
         app: &mut dyn epi::App,
@@ -287,12 +289,6 @@ impl EpiIntegration {
                 }
 
                 if is_visible {
-                    {
-                        profiling::scope!("App::update");
-                        #[expect(deprecated)]
-                        app.update(ui.ctx(), &mut self.frame);
-                    }
-
                     {
                         profiling::scope!("App::ui");
                         app.ui(ui, &mut self.frame);
diff --git a/crates/eframe/src/native/file_storage.rs b/crates/eframe/src/native/file_storage.rs
index f26a6df74..13e22fa75 100644
--- a/crates/eframe/src/native/file_storage.rs
+++ b/crates/eframe/src/native/file_storage.rs
@@ -207,7 +207,7 @@ fn save_to_disk(file_path: &PathBuf, kv: &HashMap<String, String>) {
             profiling::scope!("ron::serialize");
             if let Err(err) = ron::Options::default()
                 .to_io_writer_pretty(&mut writer, &kv, config)
-                .and_then(|_| writer.flush().map_err(|err| err.into()))
+                .and_then(|()| writer.flush().map_err(|err| err.into()))
             {
                 log::warn!("Failed to serialize app state: {err}");
             } else {
diff --git a/crates/eframe/src/native/glow_integration.rs b/crates/eframe/src/native/glow_integration.rs
index 724ddc6d5..fd61b0cd1 100644
--- a/crates/eframe/src/native/glow_integration.rs
+++ b/crates/eframe/src/native/glow_integration.rs
@@ -34,7 +34,7 @@ use egui_winit::accesskit_winit;
 
 use crate::{
     App, AppCreator, CreationContext, NativeOptions, Result, Storage,
-    native::epi_integration::EpiIntegration,
+    native::{epi_integration::EpiIntegration, winit_integration::is_invisible_or_minimized},
 };
 
 use super::{
@@ -55,6 +55,10 @@ pub struct GlowWinitApp<'app> {
     // re-initializing the `GlowWinitRunning` state on Android if the application
     // suspends and resumes.
     app_creator: Option<AppCreator<'app>>,
+
+    /// An optional pre-existing egui context. If `Some`, it is used instead of
+    /// creating a new one via [`create_egui_context`]. Taken during initialization.
+    egui_ctx: Option<egui::Context>,
 }
 
 /// State that is initialized when the application is first starts running via
@@ -128,6 +132,7 @@ impl<'app> GlowWinitApp<'app> {
         event_loop: &EventLoop<UserEvent>,
         app_name: &str,
         native_options: NativeOptions,
+        egui_ctx: Option<egui::Context>,
         app_creator: AppCreator<'app>,
     ) -> Self {
         profiling::function_scope!();
@@ -137,6 +142,7 @@ impl<'app> GlowWinitApp<'app> {
             native_options,
             running: None,
             app_creator: Some(app_creator),
+            egui_ctx,
         }
     }
 
@@ -184,7 +190,7 @@ impl<'app> GlowWinitApp<'app> {
         let painter = egui_glow::Painter::new(
             gl,
             "",
-            native_options.shader_version,
+            native_options.glow_options.shader_version,
             native_options.dithering,
         )?;
 
@@ -209,7 +215,10 @@ impl<'app> GlowWinitApp<'app> {
             )
         };
 
-        let egui_ctx = create_egui_context(storage.as_deref());
+        let egui_ctx = self
+            .egui_ctx
+            .take()
+            .unwrap_or_else(|| create_egui_context(storage.as_deref()));
 
         let (mut glutin, painter) = Self::create_glutin_windowed_context(
             &egui_ctx,
@@ -761,9 +770,11 @@ impl GlowWinitRunning<'_> {
 
         integration.maybe_autosave(app.as_mut(), Some(&window));
 
-        if window.is_minimized() == Some(true) {
+        if is_invisible_or_minimized(&window) {
             // On Mac, a minimized Window uses up all CPU:
             // https://github.com/emilk/egui/issues/325
+            // On Windows, an invisible window also uses up all CPU:
+            // https://github.com/emilk/egui/issues/7776
             profiling::scope!("minimized_sleep");
             std::thread::sleep(std::time::Duration::from_millis(10));
         }
@@ -950,12 +961,12 @@ impl GlutinWindowContext {
 
         use glutin::prelude::*;
         // convert native options to glutin options
-        let hardware_acceleration = match native_options.hardware_acceleration {
-            crate::HardwareAcceleration::Required => Some(true),
-            crate::HardwareAcceleration::Preferred => None,
-            crate::HardwareAcceleration::Off => Some(false),
+        let hardware_acceleration = match native_options.glow_options.hardware_acceleration {
+            egui_glow::HardwareAcceleration::Required => Some(true),
+            egui_glow::HardwareAcceleration::Preferred => None,
+            egui_glow::HardwareAcceleration::Off => Some(false),
         };
-        let swap_interval = if native_options.vsync {
+        let swap_interval = if native_options.glow_options.vsync {
             glutin::surface::SwapInterval::Wait(NonZeroU32::MIN)
         } else {
             glutin::surface::SwapInterval::DontWait
diff --git a/crates/eframe/src/native/macos.rs b/crates/eframe/src/native/macos.rs
new file mode 100644
index 000000000..b1f2552e5
--- /dev/null
+++ b/crates/eframe/src/native/macos.rs
@@ -0,0 +1,76 @@
+use egui::Vec2;
+use objc2_app_kit::{NSView, NSWindow, NSWindowButton};
+use raw_window_handle::{AppKitWindowHandle, RawWindowHandle};
+
+/// Size of the "traffic lights" (red/yellow/green close/minimize/maximize buttons)
+/// on the native macOS window.
+///
+/// This is very useful together with [`egui::ViewportBuilder::with_fullsize_content_view`].
+#[derive(Debug)]
+pub struct WindowChromeMetrics {
+    /// Size of the "traffic lights" (red/yellow/green close/minimize/maximize buttons),
+    /// including margins.
+    ///
+    /// The unit here is in "native scale", which means it needs to be divided by [`egui::Context::zoom_factor`]
+    /// to get the size in egui points.
+    pub traffic_lights_size: Vec2,
+}
+
+impl WindowChromeMetrics {
+    /// Get the window chrome metrics for a given window handle.
+    pub fn from_window_handle(window_handle: &RawWindowHandle) -> Option<Self> {
+        window_chrome_metrics(window_handle)
+    }
+}
+
+fn window_chrome_metrics(window_handle: &RawWindowHandle) -> Option<WindowChromeMetrics> {
+    let RawWindowHandle::AppKit(appkit_handle) = window_handle else {
+        return None;
+    };
+
+    let ns_view = ns_view_from_handle(appkit_handle)?;
+    let ns_window = ns_view.window()?;
+
+    Some(WindowChromeMetrics {
+        traffic_lights_size: traffic_lights_metrics(&ns_window)?,
+    })
+}
+
+fn traffic_lights_metrics(ns_window: &NSWindow) -> Option<Vec2> {
+    // Button order is CloseButton, MiniaturizeButton, ZoomButton:
+    let close_button = ns_window
+        .standardWindowButton(NSWindowButton::CloseButton)?
+        .frame();
+    let zoom_button = ns_window
+        .standardWindowButton(NSWindowButton::ZoomButton)?
+        .frame();
+
+    let left_margin = close_button.origin.x;
+    let right_margin = left_margin; // for symmetry
+
+    let total_width = zoom_button.origin.x + zoom_button.size.width + right_margin;
+
+    let top_margin = close_button.origin.y;
+    let bottom_margin = top_margin; // Usually symmetric
+    let total_height = top_margin + close_button.size.height + bottom_margin;
+
+    Some(Vec2::new(total_width as f32, total_height as f32))
+}
+
+fn ns_view_from_handle(handle: &AppKitWindowHandle) -> Option<&NSView> {
+    let ns_view_ptr = handle.ns_view.as_ptr().cast::<NSView>();
+
+    // Validate the pointer is non-null
+    if ns_view_ptr.is_null() {
+        None
+    } else {
+        // SAFETY:
+        // - We've verified the pointer is non-null
+        // - The pointer comes from the windowing system, so it should be valid
+        // - NSView pointers from AppKit are expected to remain valid for the window lifetime
+        #[expect(unsafe_code)]
+        unsafe {
+            ns_view_ptr.as_ref()
+        }
+    }
+}
diff --git a/crates/eframe/src/native/mod.rs b/crates/eframe/src/native/mod.rs
index eb9413717..771964ae7 100644
--- a/crates/eframe/src/native/mod.rs
+++ b/crates/eframe/src/native/mod.rs
@@ -3,6 +3,9 @@ mod epi_integration;
 mod event_loop_context;
 pub mod run;
 
+#[cfg(target_os = "macos")]
+pub(crate) mod macos;
+
 /// File storage which can be used by native backends.
 #[cfg(feature = "persistence")]
 pub mod file_storage;
diff --git a/crates/eframe/src/native/run.rs b/crates/eframe/src/native/run.rs
index 0597d318c..b89212aa2 100644
--- a/crates/eframe/src/native/run.rs
+++ b/crates/eframe/src/native/run.rs
@@ -1,4 +1,4 @@
-use std::time::Instant;
+use std::time::{Duration, Instant};
 
 use winit::{
     application::ApplicationHandler,
@@ -11,9 +11,20 @@ use ahash::HashMap;
 use super::winit_integration::{UserEvent, WinitApp};
 use crate::{
     Result, epi,
-    native::{event_loop_context, winit_integration::EventResult},
+    native::{
+        event_loop_context,
+        winit_integration::{EventResult, is_invisible_or_minimized},
+    },
 };
 
+/// Minimum interval between repaints for invisible windows.
+///
+/// On Windows, invisible windows don't receive `RedrawRequested` events,
+/// so we throttle their repaints to avoid busy-looping while still
+/// processing viewport commands like `Visible(true)`.
+/// See <https://github.com/emilk/egui/issues/7776>.
+const INVISIBLE_WINDOW_REPAINT_INTERVAL: Duration = Duration::from_millis(100);
+
 // ----------------------------------------------------------------------------
 fn create_event_loop(native_options: &mut epi::NativeOptions) -> Result<EventLoop<UserEvent>> {
     #[cfg(target_os = "android")]
@@ -177,23 +188,54 @@ impl<T: WinitApp> WinitAppWrapper<T> {
     fn check_redraw_requests(&mut self, event_loop: &ActiveEventLoop) {
         let now = Instant::now();
 
+        let mut invisible_window_ids = Vec::new();
+
         self.windows_next_repaint_times
             .retain(|window_id, repaint_time| {
                 if now < *repaint_time {
                     return true; // not yet ready
                 }
 
-                event_loop.set_control_flow(ControlFlow::Poll);
-
                 if let Some(window) = self.winit_app.window(*window_id) {
-                    log::trace!("request_redraw for {window_id:?}");
-                    window.request_redraw();
+                    // On Windows, invisible windows don't receive RedrawRequested
+                    // events, so pending viewport commands (e.g. Visible(true)) would
+                    // never be processed. We collect these windows to paint them
+                    // directly below.
+                    // See: https://github.com/emilk/egui/issues/5229
+                    if is_invisible_or_minimized(&window) {
+                        invisible_window_ids.push(*window_id);
+                    } else {
+                        log::trace!("request_redraw for {window_id:?}");
+                        event_loop.set_control_flow(ControlFlow::Poll);
+                        window.request_redraw();
+                    }
                 } else {
                     log::trace!("No window found for {window_id:?}");
                 }
                 false
             });
 
+        // Paint invisible windows directly, since they won't receive
+        // RedrawRequested events on Windows. This ensures that viewport
+        // commands like Visible(true) are still processed.
+        for window_id in &invisible_window_ids {
+            let event_result = self.winit_app.run_ui_and_paint(event_loop, *window_id);
+            self.handle_event_result(event_loop, event_result);
+        }
+
+        // Throttle any already-scheduled repaints for invisible windows
+        // to avoid busy-looping. If no repaint was requested by the app,
+        // the window will simply sleep.
+        // See: https://github.com/emilk/egui/issues/7776
+        if !invisible_window_ids.is_empty() {
+            let next_paint = Instant::now() + INVISIBLE_WINDOW_REPAINT_INTERVAL;
+            for window_id in &invisible_window_ids {
+                self.windows_next_repaint_times
+                    .entry(*window_id)
+                    .and_modify(|t| *t = (*t).min(next_paint));
+            }
+        }
+
         let next_repaint_time = self.windows_next_repaint_times.values().min().copied();
         if let Some(next_repaint_time) = next_repaint_time {
             event_loop.set_control_flow(ControlFlow::WaitUntil(next_repaint_time));
@@ -270,6 +312,16 @@ impl<T: WinitApp> ApplicationHandler<UserEvent> for WinitAppWrapper<T> {
                         if let Some(window_id) =
                             self.winit_app.window_id_from_viewport_id(viewport_id)
                         {
+                            // Throttle repaints for invisible windows to prevent
+                            // high CPU usage on Windows.
+                            // See: https://github.com/emilk/egui/issues/7776
+                            let when = if let Some(window) = self.winit_app.window(window_id)
+                                && is_invisible_or_minimized(&window)
+                            {
+                                when.max(Instant::now() + INVISIBLE_WINDOW_REPAINT_INTERVAL)
+                            } else {
+                                when
+                            };
                             Ok(EventResult::RepaintAt(window_id, when))
                         } else {
                             Ok(EventResult::Wait)
@@ -347,6 +399,7 @@ fn run_and_exit(event_loop: EventLoop<UserEvent>, winit_app: impl WinitApp) -> R
 pub fn run_glow(
     app_name: &str,
     mut native_options: epi::NativeOptions,
+    egui_ctx: Option<egui::Context>,
     app_creator: epi::AppCreator<'_>,
 ) -> Result {
     use super::glow_integration::GlowWinitApp;
@@ -354,13 +407,15 @@ pub fn run_glow(
     #[cfg(not(target_os = "ios"))]
     if native_options.run_and_return {
         return with_event_loop(native_options, |event_loop, native_options| {
-            let glow_eframe = GlowWinitApp::new(event_loop, app_name, native_options, app_creator);
+            let glow_eframe =
+                GlowWinitApp::new(event_loop, app_name, native_options, egui_ctx, app_creator);
             run_and_return(event_loop, glow_eframe)
         })?;
     }
 
     let event_loop = create_event_loop(&mut native_options)?;
-    let glow_eframe = GlowWinitApp::new(&event_loop, app_name, native_options, app_creator);
+    let glow_eframe =
+        GlowWinitApp::new(&event_loop, app_name, native_options, egui_ctx, app_creator);
     run_and_exit(event_loop, glow_eframe)
 }
 
@@ -373,7 +428,7 @@ pub fn create_glow<'a>(
 ) -> impl ApplicationHandler<UserEvent> + 'a {
     use super::glow_integration::GlowWinitApp;
 
-    let glow_eframe = GlowWinitApp::new(event_loop, app_name, native_options, app_creator);
+    let glow_eframe = GlowWinitApp::new(event_loop, app_name, native_options, None, app_creator);
     WinitAppWrapper::new(glow_eframe, true)
 }
 
@@ -383,6 +438,7 @@ pub fn create_glow<'a>(
 pub fn run_wgpu(
     app_name: &str,
     mut native_options: epi::NativeOptions,
+    egui_ctx: Option<egui::Context>,
     app_creator: epi::AppCreator<'_>,
 ) -> Result {
     use super::wgpu_integration::WgpuWinitApp;
@@ -390,13 +446,15 @@ pub fn run_wgpu(
     #[cfg(not(target_os = "ios"))]
     if native_options.run_and_return {
         return with_event_loop(native_options, |event_loop, native_options| {
-            let wgpu_eframe = WgpuWinitApp::new(event_loop, app_name, native_options, app_creator);
+            let wgpu_eframe =
+                WgpuWinitApp::new(event_loop, app_name, native_options, egui_ctx, app_creator);
             run_and_return(event_loop, wgpu_eframe)
         })?;
     }
 
     let event_loop = create_event_loop(&mut native_options)?;
-    let wgpu_eframe = WgpuWinitApp::new(&event_loop, app_name, native_options, app_creator);
+    let wgpu_eframe =
+        WgpuWinitApp::new(&event_loop, app_name, native_options, egui_ctx, app_creator);
     run_and_exit(event_loop, wgpu_eframe)
 }
 
@@ -409,7 +467,7 @@ pub fn create_wgpu<'a>(
 ) -> impl ApplicationHandler<UserEvent> + 'a {
     use super::wgpu_integration::WgpuWinitApp;
 
-    let wgpu_eframe = WgpuWinitApp::new(event_loop, app_name, native_options, app_creator);
+    let wgpu_eframe = WgpuWinitApp::new(event_loop, app_name, native_options, None, app_creator);
     WinitAppWrapper::new(wgpu_eframe, true)
 }
 
diff --git a/crates/eframe/src/native/wgpu_integration.rs b/crates/eframe/src/native/wgpu_integration.rs
index 9d6283808..161c3f84b 100644
--- a/crates/eframe/src/native/wgpu_integration.rs
+++ b/crates/eframe/src/native/wgpu_integration.rs
@@ -27,7 +27,10 @@ use winit_integration::UserEvent;
 
 use crate::{
     App, AppCreator, CreationContext, NativeOptions, Result, Storage,
-    native::{epi_integration::EpiIntegration, winit_integration::EventResult},
+    native::{
+        epi_integration::EpiIntegration,
+        winit_integration::{EventResult, is_invisible_or_minimized},
+    },
 };
 
 use super::{epi_integration, event_loop_context, winit_integration, winit_integration::WinitApp};
@@ -45,6 +48,10 @@ pub struct WgpuWinitApp<'app> {
 
     /// Set when we are actually up and running.
     running: Option<WgpuWinitRunning<'app>>,
+
+    /// An optional pre-existing egui context. If `Some`, it is used instead of
+    /// creating a new one via [`winit_integration::create_egui_context`]. Taken during initialization.
+    egui_ctx: Option<egui::Context>,
 }
 
 /// State that is initialized when the application is first starts running via
@@ -102,6 +109,7 @@ impl<'app> WgpuWinitApp<'app> {
         event_loop: &EventLoop<UserEvent>,
         app_name: &str,
         native_options: NativeOptions,
+        egui_ctx: Option<egui::Context>,
         app_creator: AppCreator<'app>,
     ) -> Self {
         profiling::function_scope!();
@@ -118,6 +126,7 @@ impl<'app> WgpuWinitApp<'app> {
             native_options,
             running: None,
             app_creator: Some(app_creator),
+            egui_ctx,
         }
     }
 
@@ -184,9 +193,17 @@ impl<'app> WgpuWinitApp<'app> {
         builder: ViewportBuilder,
     ) -> crate::Result<&mut WgpuWinitRunning<'app>> {
         profiling::function_scope!();
+        // Inject the display handle into the wgpu setup so that wgpu can create
+        // surfaces on platforms that require it (e.g. GLES on Wayland).
+        let mut wgpu_options = self.native_options.wgpu_options.clone();
+        if let egui_wgpu::WgpuSetup::CreateNew(ref mut create_new) = wgpu_options.wgpu_setup
+            && create_new.display_handle.is_none()
+        {
+            create_new.display_handle = Some(Box::new(event_loop.owned_display_handle()));
+        }
         let mut painter = pollster::block_on(egui_wgpu::winit::Painter::new(
             egui_ctx.clone(),
-            self.native_options.wgpu_options.clone(),
+            wgpu_options,
             self.native_options.viewport.transparent.unwrap_or(false),
             egui_wgpu::RendererOptions {
                 msaa_samples: self.native_options.multisampling as _,
@@ -417,7 +434,10 @@ impl WinitApp for WgpuWinitApp<'_> {
                         .unwrap_or(&self.app_name),
                 )
             };
-            let egui_ctx = winit_integration::create_egui_context(storage.as_deref());
+            let egui_ctx = self
+                .egui_ctx
+                .take()
+                .unwrap_or_else(|| winit_integration::create_egui_context(storage.as_deref()));
             let (window, builder) = create_window(
                 &egui_ctx,
                 event_loop,
@@ -711,6 +731,7 @@ impl WgpuWinitRunning<'_> {
                 &clipped_primitives,
                 &textures_delta,
                 screenshot_commands,
+                window,
             );
 
             for action in viewport.actions_requested.drain(..) {
@@ -770,10 +791,12 @@ impl WgpuWinitRunning<'_> {
         integration.maybe_autosave(app.as_mut(), window.map(|w| w.as_ref()));
 
         if let Some(window) = window
-            && window.is_minimized() == Some(true)
+            && is_invisible_or_minimized(window)
         {
             // On Mac, a minimized Window uses up all CPU:
             // https://github.com/emilk/egui/issues/325
+            // On Windows, an invisible window also uses up all CPU:
+            // https://github.com/emilk/egui/issues/7776
             profiling::scope!("minimized_sleep");
             std::thread::sleep(std::time::Duration::from_millis(10));
         }
@@ -1098,6 +1121,7 @@ fn render_immediate_viewport(
         &clipped_primitives,
         &textures_delta,
         vec![],
+        window,
     );
 
     egui_winit.handle_platform_output(window, platform_output);
diff --git a/crates/eframe/src/native/winit_integration.rs b/crates/eframe/src/native/winit_integration.rs
index 012c22f8e..b4ec62c09 100644
--- a/crates/eframe/src/native/winit_integration.rs
+++ b/crates/eframe/src/native/winit_integration.rs
@@ -9,6 +9,14 @@ use egui::ViewportId;
 #[cfg(feature = "accesskit")]
 use egui_winit::accesskit_winit;
 
+/// Returns `true` if the window is invisible or minimized.
+///
+/// These windows don't receive `RedrawRequested` events on Windows,
+/// so they need special handling to keep processing viewport commands.
+pub fn is_invisible_or_minimized(window: &Window) -> bool {
+    window.is_visible() == Some(false) || window.is_minimized() == Some(true)
+}
+
 /// Create an egui context, restoring it from storage if possible.
 pub fn create_egui_context(storage: Option<&dyn crate::Storage>) -> egui::Context {
     profiling::function_scope!();
diff --git a/crates/eframe/src/web/app_runner.rs b/crates/eframe/src/web/app_runner.rs
index b90b8a5e1..c15e78d68 100644
--- a/crates/eframe/src/web/app_runner.rs
+++ b/crates/eframe/src/web/app_runner.rs
@@ -284,9 +284,6 @@ impl AppRunner {
             self.app.logic(ui.ctx(), &mut self.frame);
 
             if is_visible {
-                #[expect(deprecated)]
-                self.app.update(ui.ctx(), &mut self.frame);
-
                 self.app.ui(ui, &mut self.frame);
             }
         });
@@ -393,7 +390,7 @@ impl AppRunner {
             }
         }
 
-        super::set_cursor_icon(cursor_icon);
+        super::set_cursor_icon(self.canvas(), cursor_icon);
 
         if self.has_focus() {
             // The eframe app has focus.
diff --git a/crates/eframe/src/web/events.rs b/crates/eframe/src/web/events.rs
index d77444563..e24e99fee 100644
--- a/crates/eframe/src/web/events.rs
+++ b/crates/eframe/src/web/events.rs
@@ -1114,16 +1114,16 @@ fn get_display_size(resize_observer_entries: &js_sys::Array) -> Result<(u32, u32
     } else if JsValue::from_str("contentBoxSize").js_in(entry.as_ref()) {
         let content_box_size = entry.content_box_size();
         let idx0 = content_box_size.at(0);
-        if !idx0.is_undefined() {
-            let size: web_sys::ResizeObserverSize = idx0.dyn_into()?;
-            width = size.inline_size();
-            height = size.block_size();
-        } else {
+        if idx0.is_undefined() {
             // legacy
             let size = JsValue::clone(content_box_size.as_ref());
             let size: web_sys::ResizeObserverSize = size.dyn_into()?;
             width = size.inline_size();
             height = size.block_size();
+        } else {
+            let size: web_sys::ResizeObserverSize = idx0.dyn_into()?;
+            width = size.inline_size();
+            height = size.block_size();
         }
         if DEBUG_RESIZE {
             log::info!("contentBoxSize {width}x{height}");
diff --git a/crates/eframe/src/web/mod.rs b/crates/eframe/src/web/mod.rs
index 1e54d7a84..dc743ec49 100644
--- a/crates/eframe/src/web/mod.rs
+++ b/crates/eframe/src/web/mod.rs
@@ -38,6 +38,7 @@ mod web_painter_wgpu;
 pub use backend::*;
 
 use egui::Theme;
+use js_sys::Object;
 use wasm_bindgen::prelude::*;
 use web_sys::{Document, MediaQueryList, Node};
 
@@ -177,10 +178,8 @@ fn canvas_size_in_points(canvas: &web_sys::HtmlCanvasElement, ctx: &egui::Contex
 // ----------------------------------------------------------------------------
 
 /// Set the cursor icon.
-fn set_cursor_icon(cursor: egui::CursorIcon) -> Option<()> {
-    let document = web_sys::window()?.document()?;
-    document
-        .body()?
+fn set_cursor_icon(canvas: &web_sys::HtmlCanvasElement, cursor: egui::CursorIcon) -> Option<()> {
+    canvas
         .style()
         .set_property("cursor", cursor_web_name(cursor))
         .ok()
@@ -370,5 +369,5 @@ pub fn percent_decode(s: &str) -> String {
 
 /// Are we running inside the Safari browser?
 pub fn is_safari_browser() -> bool {
-    web_sys::window().is_some_and(|window| window.has_own_property(&JsValue::from("safari")))
+    web_sys::window().is_some_and(|window| Object::has_own(&window, &JsValue::from("safari")))
 }
diff --git a/crates/eframe/src/web/storage.rs b/crates/eframe/src/web/storage.rs
index 170798dc6..baa3ad83b 100644
--- a/crates/eframe/src/web/storage.rs
+++ b/crates/eframe/src/web/storage.rs
@@ -9,7 +9,19 @@ pub fn local_storage_get(key: &str) -> Option<String> {
 
 /// Write data to local storage.
 pub fn local_storage_set(key: &str, value: &str) {
-    local_storage().map(|storage| storage.set_item(key, value));
+    match local_storage() {
+        Some(storage) => {
+            if let Err(err) = storage.set_item(key, value) {
+                log::warn!(
+                    "local_storage_set failed: key={key}, err={}",
+                    crate::web::string_from_js_value(&err)
+                );
+            }
+        }
+        None => {
+            log::warn!("local_storage unavailable");
+        }
+    }
 }
 
 #[cfg(feature = "persistence")]
diff --git a/crates/eframe/src/web/text_agent.rs b/crates/eframe/src/web/text_agent.rs
index ac917329f..20b904244 100644
--- a/crates/eframe/src/web/text_agent.rs
+++ b/crates/eframe/src/web/text_agent.rs
@@ -56,8 +56,13 @@ impl TextAgent {
             let input = input.clone();
             move |event: web_sys::InputEvent, runner: &mut AppRunner| {
                 let text = input.value();
-                // Fix android virtual keyboard Gboard
-                // This removes the virtual keyboard's suggestion.
+                // Workaround for an Android Gboard issue: after typing a word,
+                // the user has to delete invisible characters (whose count
+                // matches the length of the current suggestion) before actual
+                // characters are deleted, unless the focus has been reset.
+                //
+                // this issue appears to have been fixed in Gboard sometime
+                // between versions 14.7.09 and 17.0.12.
                 if !event.is_composing() {
                     input.blur().ok();
                     input.focus().ok();
@@ -75,11 +80,7 @@ impl TextAgent {
         };
 
         let on_composition_start = {
-            let input = input.clone();
             move |_: web_sys::CompositionEvent, runner: &mut AppRunner| {
-                input.set_value("");
-                let event = egui::Event::Ime(egui::ImeEvent::Enabled);
-                runner.input.raw.events.push(event);
                 // Repaint moves the text agent into place,
                 // see `move_to` in `AppRunner::handle_platform_output`.
                 runner.needs_repaint.repaint_asap();
@@ -136,6 +137,12 @@ impl TextAgent {
 
         let Some(ime) = ime else { return Ok(()) };
 
+        if ime.should_interrupt_composition {
+            // no-op for now: currently, the text agent is sizeless, so any
+            // click shifts focus to the canvas, which naturally interrupts the
+            // composition.
+        }
+
         let mut canvas_rect = super::canvas_content_rect(canvas);
         // Fix for safari with virtual keyboard flapping position
         if is_mobile_safari() {
diff --git a/crates/eframe/src/web/web_painter_glow.rs b/crates/eframe/src/web/web_painter_glow.rs
index 470fa40d3..c9b846d50 100644
--- a/crates/eframe/src/web/web_painter_glow.rs
+++ b/crates/eframe/src/web/web_painter_glow.rs
@@ -31,8 +31,13 @@ impl WebPainterGlow {
         #[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)
-            .map_err(|err| format!("Error starting glow painter: {err}"))?;
+        let painter = egui_glow::Painter::new(
+            gl,
+            shader_prefix,
+            options.glow_options.shader_version,
+            options.dithering,
+        )
+        .map_err(|err| format!("Error starting glow painter: {err}"))?;
 
         Ok(Self {
             canvas,
diff --git a/crates/eframe/src/web/web_painter_wgpu.rs b/crates/eframe/src/web/web_painter_wgpu.rs
index f7adb8fbb..8735530aa 100644
--- a/crates/eframe/src/web/web_painter_wgpu.rs
+++ b/crates/eframe/src/web/web_painter_wgpu.rs
@@ -15,13 +15,32 @@ pub(crate) struct WebPainterWgpu {
     surface: wgpu::Surface<'static>,
     surface_configuration: wgpu::SurfaceConfiguration,
     render_state: Option<RenderState>,
-    on_surface_error: Arc<dyn Fn(wgpu::SurfaceError) -> SurfaceErrorAction>,
+    on_surface_status: Arc<dyn Fn(&wgpu::CurrentSurfaceTexture) -> SurfaceErrorAction>,
     depth_stencil_format: Option<wgpu::TextureFormat>,
     depth_texture_view: Option<wgpu::TextureView>,
     screen_capture_state: Option<CaptureState>,
     capture_tx: CaptureSender,
     capture_rx: CaptureReceiver,
     ctx: egui::Context,
+    needs_reconfigure: bool,
+}
+
+/// Owned web display handle that is `Send + Sync`.
+///
+/// `DisplayHandle` from `raw-window-handle` is `!Send`/`!Sync` because the enum
+/// contains platform variants with raw pointers. On web the handle is always empty,
+/// so this wrapper is safe.
+#[cfg(target_arch = "wasm32")]
+#[derive(Clone, Debug)]
+struct WebDisplay;
+
+#[cfg(target_arch = "wasm32")]
+impl egui_wgpu::wgpu::rwh::HasDisplayHandle for WebDisplay {
+    fn display_handle(
+        &self,
+    ) -> Result<egui_wgpu::wgpu::rwh::DisplayHandle<'_>, egui_wgpu::wgpu::rwh::HandleError> {
+        Ok(egui_wgpu::wgpu::rwh::DisplayHandle::web())
+    }
 }
 
 impl WebPainterWgpu {
@@ -63,7 +82,17 @@ impl WebPainterWgpu {
     ) -> Result<Self, String> {
         log::debug!("Creating wgpu painter");
 
-        let instance = options.wgpu_options.wgpu_setup.new_instance().await;
+        // Inject the display handle into the wgpu setup so that wgpu can create surfaces on WebGL.
+        let mut wgpu_options = options.wgpu_options.clone();
+        if let egui_wgpu::WgpuSetup::CreateNew(ref mut create_new) = wgpu_options.wgpu_setup
+            && create_new.display_handle.is_none()
+        {
+            // Force WebGL, useful for quick & dirty testing:
+            //create_new.instance_descriptor.backends = wgpu::Backends::GL;
+            create_new.display_handle = Some(Box::new(WebDisplay));
+        }
+
+        let instance = wgpu_options.wgpu_setup.new_instance().await;
         let surface = instance
             .create_surface(wgpu::SurfaceTarget::Canvas(canvas.clone()))
             .map_err(|err| format!("failed to create wgpu surface: {err}"))?;
@@ -71,7 +100,7 @@ impl WebPainterWgpu {
         let depth_stencil_format = egui_wgpu::depth_format_from_bits(options.depth_buffer, 0);
 
         let render_state = RenderState::create(
-            &options.wgpu_options,
+            &wgpu_options,
             &instance,
             Some(&surface),
             egui_wgpu::RendererOptions {
@@ -89,7 +118,7 @@ impl WebPainterWgpu {
 
         let surface_configuration = wgpu::SurfaceConfiguration {
             format: render_state.target_format,
-            present_mode: options.wgpu_options.present_mode,
+            present_mode: wgpu_options.surface.present_mode,
             view_formats: vec![render_state.target_format],
             ..default_configuration
         };
@@ -105,11 +134,12 @@ impl WebPainterWgpu {
             surface_configuration,
             depth_stencil_format,
             depth_texture_view: None,
-            on_surface_error: Arc::clone(&options.wgpu_options.on_surface_error) as _,
+            on_surface_status: Arc::clone(&wgpu_options.on_surface_status) as _,
             screen_capture_state: None,
             capture_tx,
             capture_rx,
             ctx,
+            needs_reconfigure: false,
         })
     }
 }
@@ -195,18 +225,28 @@ impl WebPainter for WebPainterWgpu {
                 );
             }
 
+            if self.needs_reconfigure {
+                self.surface
+                    .configure(&render_state.device, &self.surface_configuration);
+                self.needs_reconfigure = false;
+            }
+
             let output_frame = match self.surface.get_current_texture() {
-                Ok(frame) => frame,
-                Err(err) => match (*self.on_surface_error)(err) {
-                    SurfaceErrorAction::RecreateSurface => {
-                        self.surface
-                            .configure(&render_state.device, &self.surface_configuration);
-                        return Ok(());
+                wgpu::CurrentSurfaceTexture::Success(frame) => frame,
+                wgpu::CurrentSurfaceTexture::Suboptimal(frame) => {
+                    self.needs_reconfigure = true;
+                    frame
+                }
+                other => {
+                    match (*self.on_surface_status)(&other) {
+                        SurfaceErrorAction::RecreateSurface => {
+                            self.surface
+                                .configure(&render_state.device, &self.surface_configuration);
+                        }
+                        SurfaceErrorAction::SkipFrame => {}
                     }
-                    SurfaceErrorAction::SkipFrame => {
-                        return Ok(());
-                    }
-                },
+                    return Ok(());
+                }
             };
 
             {
diff --git a/crates/egui-wgpu/CHANGELOG.md b/crates/egui-wgpu/CHANGELOG.md
index cef640184..2eda803fc 100644
--- a/crates/egui-wgpu/CHANGELOG.md
+++ b/crates/egui-wgpu/CHANGELOG.md
@@ -6,6 +6,29 @@ 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.34.2 - 2026-05-04
+* Update to wgpu 29.0.1 [#8073](https://github.com/emilk/egui/pull/8073) by [@emilk](https://github.com/emilk)
+* Warn if using a software rasterizer [#8101](https://github.com/emilk/egui/pull/8101) by [@emilk](https://github.com/emilk)
+
+
+## 0.34.1 - 2026-03-27
+* `wgpu` backend: Enable WebGL fallback [#8038](https://github.com/emilk/egui/pull/8038) by [@emilk](https://github.com/emilk)
+
+
+## 0.34.0 - 2026-03-26
+### ⭐ Added
+* Add error message when calling `.render()` without `.update_buffers()` [#8005](https://github.com/emilk/egui/pull/8005) by [@emilk](https://github.com/emilk)
+
+### 🔧 Changed
+* Put the `capture` module behind a feature flag, make the `egui` dependency optional [#7698](https://github.com/emilk/egui/pull/7698) by [@StT191](https://github.com/StT191)
+* Attach stencil buffer [#7702](https://github.com/emilk/egui/pull/7702) by [@jgraef](https://github.com/jgraef)
+* Update wgpu to 28.0.0 [#7853](https://github.com/emilk/egui/pull/7853) by [@SuchAFuriousDeath](https://github.com/SuchAFuriousDeath)
+* Update to wgpu 29 [#7990](https://github.com/emilk/egui/pull/7990) by [@cwfitzgerald](https://github.com/cwfitzgerald)
+
+### 🐛 Fixed
+* Fix wgpu memory leak leading to panic when window is minimized (#7434) [#7928](https://github.com/emilk/egui/pull/7928) by [@landaire](https://github.com/landaire)
+
+
 ## 0.33.3 - 2025-12-11
 Nothing new
 
diff --git a/crates/egui-wgpu/Cargo.toml b/crates/egui-wgpu/Cargo.toml
index c514e0a49..0b081e134 100644
--- a/crates/egui-wgpu/Cargo.toml
+++ b/crates/egui-wgpu/Cargo.toml
@@ -15,7 +15,7 @@ readme = "README.md"
 repository = "https://github.com/emilk/egui/tree/main/crates/egui-wgpu"
 categories = ["gui", "game-development"]
 keywords = ["wgpu", "egui", "gui", "gamedev"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "**/*.wgsl", "Cargo.toml"]
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "**/*.wgsl", "Cargo.toml"]
 
 [lints]
 workspace = true
@@ -25,7 +25,12 @@ all-features = true
 rustdoc-args = ["--generate-link-to-definition"]
 
 [features]
-default = ["fragile-send-sync-non-atomic-wasm", "macos-window-resize-jitter-fix", "wgpu/default"]
+default = [
+  "fragile-send-sync-non-atomic-wasm",
+  "macos-window-resize-jitter-fix",
+  "wgpu/default",
+  "wgpu/webgl", # A very important fallback for web support
+]
 
 ## Enables the `capture` module for capturing screenshots.
 capture = ["dep:egui"]
diff --git a/crates/egui-wgpu/src/lib.rs b/crates/egui-wgpu/src/lib.rs
index 46becf8f7..3e95f7885 100644
--- a/crates/egui-wgpu/src/lib.rs
+++ b/crates/egui-wgpu/src/lib.rs
@@ -24,7 +24,10 @@ mod renderer;
 mod setup;
 
 pub use renderer::*;
-pub use setup::{NativeAdapterSelectorMethod, WgpuSetup, WgpuSetupCreateNew, WgpuSetupExisting};
+pub use setup::{
+    EguiDisplayHandle, NativeAdapterSelectorMethod, WgpuSetup, WgpuSetupCreateNew,
+    WgpuSetupExisting,
+};
 
 /// Helpers for capturing screenshots of the UI.
 #[cfg(feature = "capture")]
@@ -61,6 +64,43 @@ pub enum WgpuError {
     HandleError(#[from] ::winit::raw_window_handle::HandleError),
 }
 
+/// Runtime-mutable subset of [`WgpuConfiguration`].
+///
+/// Edit any field to have the surface reconfigured on the next paint.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub struct SurfaceConfig {
+    /// Present mode used for the primary surface.
+    pub present_mode: wgpu::PresentMode,
+
+    /// Desired maximum number of frames that the presentation engine should queue in advance.
+    ///
+    /// Use `1` for low-latency, and `2` for high-throughput.
+    ///
+    /// See [`wgpu::SurfaceConfiguration::desired_maximum_frame_latency`] for details.
+    ///
+    /// `None` => Let `wgpu` pick a default (currently `2`).
+    pub desired_maximum_frame_latency: Option<u32>,
+}
+
+impl SurfaceConfig {
+    /// Good default for GUIs with very little (or no) extra GPU work.
+    pub const LOW_LATENCY: Self = Self {
+        present_mode: wgpu::PresentMode::AutoVsync,
+        desired_maximum_frame_latency: if cfg!(target_os = "ios") {
+            None // The default is good on iOS, while `Some(1)` cuts FPS in half
+        } else {
+            Some(1) // Low-latency by default.
+        },
+    };
+
+    /// Good default for GUIs with a lot of extra GPU work,
+    /// or that want to prioritize smoothness over latency.
+    pub const HIGH_THROUGHPUT: Self = Self {
+        present_mode: wgpu::PresentMode::AutoVsync,
+        desired_maximum_frame_latency: Some(2), // High-throughput.
+    };
+}
+
 /// Access to the render state for egui.
 #[derive(Clone)]
 pub struct RenderState {
@@ -85,6 +125,11 @@ pub struct RenderState {
 
     /// Egui renderer responsible for drawing the UI.
     pub renderer: Arc<RwLock<Renderer>>,
+
+    /// Runtime-mutable subset of the wgpu configuration.
+    ///
+    /// Update this to have the surface reconfigured on the next paint.
+    pub surface_config: SurfaceConfig,
 }
 
 async fn request_adapter(
@@ -135,29 +180,12 @@ async fn request_adapter(
             }
         })?;
 
-    if cfg!(target_arch = "wasm32") {
-        log::debug!(
-            "Picked wgpu adapter: {}",
-            adapter_info_summary(&adapter.get_info())
+    if 1 < available_adapters.len() {
+        log::info!(
+            "There are {} available wgpu adapters: {}",
+            available_adapters.len(),
+            describe_adapters(available_adapters)
         );
-    } else {
-        // native:
-        if available_adapters.len() == 1 {
-            log::debug!(
-                "Picked the only available wgpu adapter: {}",
-                adapter_info_summary(&adapter.get_info())
-            );
-        } else {
-            log::info!(
-                "There were {} available wgpu adapters: {}",
-                available_adapters.len(),
-                describe_adapters(available_adapters)
-            );
-            log::debug!(
-                "Picked wgpu adapter: {}",
-                adapter_info_summary(&adapter.get_info())
-            );
-        }
     }
 
     Ok(adapter)
@@ -191,6 +219,7 @@ impl RenderState {
         let (adapter, device, queue) = match config.wgpu_setup.clone() {
             WgpuSetup::CreateNew(WgpuSetupCreateNew {
                 instance_descriptor: _,
+                display_handle: _,
                 power_preference,
                 native_adapter_selector: _native_adapter_selector,
                 device_descriptor,
@@ -232,6 +261,8 @@ impl RenderState {
             }) => (adapter, device, queue),
         };
 
+        log_adapter_info(&adapter.get_info());
+
         let surface_formats = {
             profiling::scope!("get_capabilities");
             compatible_surface.map_or_else(
@@ -254,6 +285,7 @@ impl RenderState {
             queue,
             target_format,
             renderer: Arc::new(RwLock::new(renderer)),
+            surface_config: config.surface,
         })
     }
 }
@@ -272,7 +304,7 @@ fn describe_adapters(adapters: &[wgpu::Adapter]) -> String {
     }
 }
 
-/// Specifies which action should be taken as consequence of a [`wgpu::SurfaceError`]
+/// Specifies which action should be taken as consequence of a surface error.
 pub enum SurfaceErrorAction {
     /// Do nothing and skip the current frame.
     SkipFrame,
@@ -284,23 +316,24 @@ pub enum SurfaceErrorAction {
 /// Configuration for using wgpu with eframe or the egui-wgpu winit feature.
 #[derive(Clone)]
 pub struct WgpuConfiguration {
-    /// Present mode used for the primary surface.
-    pub present_mode: wgpu::PresentMode,
-
-    /// Desired maximum number of frames that the presentation engine should queue in advance.
+    /// Runtime-mutable configuration for the surface (present mode, frame latency).
     ///
-    /// Use `1` for low-latency, and `2` for high-throughput.
-    ///
-    /// See [`wgpu::SurfaceConfiguration::desired_maximum_frame_latency`] for details.
-    ///
-    /// `None` = `wgpu` default.
-    pub desired_maximum_frame_latency: Option<u32>,
+    /// These are the fields exposed via [`RenderState::surface_config`] for live
+    /// reconfiguration at runtime.
+    pub surface: SurfaceConfig,
 
     /// How to create the wgpu adapter & device
     pub wgpu_setup: WgpuSetup,
 
-    /// Callback for surface errors.
-    pub on_surface_error: Arc<dyn Fn(wgpu::SurfaceError) -> SurfaceErrorAction + Send + Sync>,
+    /// Callback for surface status changes.
+    ///
+    /// Called with the [`wgpu::CurrentSurfaceTexture`] result whenever acquiring a frame
+    /// does not return [`wgpu::CurrentSurfaceTexture::Success`]. For
+    /// [`wgpu::CurrentSurfaceTexture::Suboptimal`], egui uses the frame as-is and
+    /// defers surface reconfiguration to the next frame — the callback is not invoked
+    /// in that case either.
+    pub on_surface_status:
+        Arc<dyn Fn(&wgpu::CurrentSurfaceTexture) -> SurfaceErrorAction + Send + Sync>,
 }
 
 #[test]
@@ -312,36 +345,49 @@ fn wgpu_config_impl_send_sync() {
 impl std::fmt::Debug for WgpuConfiguration {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let Self {
-            present_mode,
-            desired_maximum_frame_latency,
+            surface,
             wgpu_setup,
-            on_surface_error: _,
+            on_surface_status: _,
         } = self;
         f.debug_struct("WgpuConfiguration")
-            .field("present_mode", &present_mode)
-            .field(
-                "desired_maximum_frame_latency",
-                &desired_maximum_frame_latency,
-            )
+            .field("surface", &surface)
             .field("wgpu_setup", &wgpu_setup)
             .finish_non_exhaustive()
     }
 }
 
+impl WgpuConfiguration {
+    #[inline]
+    pub fn with_surface_config(mut self, surface_config: SurfaceConfig) -> Self {
+        self.surface = surface_config;
+        self
+    }
+}
+
 impl Default for WgpuConfiguration {
     fn default() -> Self {
         Self {
-            present_mode: wgpu::PresentMode::AutoVsync,
-            desired_maximum_frame_latency: None,
-            wgpu_setup: Default::default(),
-            on_surface_error: Arc::new(|err| {
-                if err == wgpu::SurfaceError::Outdated {
-                    // This error occurs when the app is minimized on Windows.
-                    // Silently return here to prevent spamming the console with:
-                    // "The underlying surface has changed, and therefore the swap chain must be updated"
-                } else {
-                    log::warn!("Dropped frame with error: {err}");
+            surface: SurfaceConfig::HIGH_THROUGHPUT,
+
+            // No display handle available at this point — callers should replace this with
+            // `WgpuSetup::from_display_handle(...)` before creating the instance if one is available.
+            wgpu_setup: WgpuSetup::without_display_handle(),
+            on_surface_status: Arc::new(|status| {
+                match status {
+                    wgpu::CurrentSurfaceTexture::Outdated => {
+                        // This error occurs when the app is minimized on Windows.
+                        // Silently return here to prevent spamming the console with:
+                        // "The underlying surface has changed, and therefore the swap chain must be updated"
+                    }
+                    wgpu::CurrentSurfaceTexture::Occluded => {
+                        // This error occurs when the application is occluded (e.g. minimized or behind another window).
+                        log::debug!("Dropped frame with error: {status:?}");
+                    }
+                    _ => {
+                        log::warn!("Dropped frame with error: {status:?}");
+                    }
                 }
+
                 SurfaceErrorAction::SkipFrame
             }),
         }
@@ -385,6 +431,18 @@ pub fn depth_format_from_bits(depth_buffer: u8, stencil_buffer: u8) -> Option<wg
 
 // ---------------------------------------------------------------------------
 
+fn log_adapter_info(info: &wgpu::AdapterInfo) {
+    let summary = adapter_info_summary(info);
+
+    let is_test = cfg!(test); // Software rasterizers are expected (and preferred) during testing!
+
+    if info.device_type == wgpu::DeviceType::Cpu && !is_test {
+        log::warn!("Software rasterizer detected - loss of performance expected. {summary}");
+    } else {
+        log::debug!("wgpu adapter: {summary}");
+    }
+}
+
 /// A human-readable summary about an adapter
 pub fn adapter_info_summary(info: &wgpu::AdapterInfo) -> String {
     let wgpu::AdapterInfo {
@@ -406,37 +464,52 @@ pub fn adapter_info_summary(info: &wgpu::AdapterInfo) -> String {
     // > name: "Apple M1 Pro", device_type: IntegratedGpu, backend: Metal, driver: "", driver_info: ""
     // > name: "ANGLE (Apple, Apple M1 Pro, OpenGL 4.1)", device_type: IntegratedGpu, backend: Gl, driver: "", driver_info: ""
 
+    use std::fmt::Write as _;
+
     let mut summary = format!("backend: {backend:?}, device_type: {device_type:?}");
 
     if !name.is_empty() {
-        summary += &format!(", name: {name:?}");
+        write!(summary, ", name: {name:?}").ok();
     }
     if !driver.is_empty() {
-        summary += &format!(", driver: {driver:?}");
+        write!(summary, ", driver: {driver:?}").ok();
     }
     if !driver_info.is_empty() {
-        summary += &format!(", driver_info: {driver_info:?}");
+        write!(summary, ", driver_info: {driver_info:?}").ok();
     }
     if *vendor != 0 {
         #[cfg(not(target_arch = "wasm32"))]
         {
-            summary += &format!(", vendor: {} (0x{vendor:04X})", parse_vendor_id(*vendor));
+            write!(
+                summary,
+                ", vendor: {} (0x{vendor:04X})",
+                parse_vendor_id(*vendor)
+            )
+            .ok();
         }
         #[cfg(target_arch = "wasm32")]
         {
-            summary += &format!(", vendor: 0x{vendor:04X}");
+            write!(summary, ", vendor: 0x{vendor:04X}").ok();
         }
     }
     if *device != 0 {
-        summary += &format!(", device: 0x{device:02X}");
+        write!(summary, ", device: 0x{device:02X}").ok();
     }
     if !device_pci_bus_id.is_empty() {
-        summary += &format!(", pci_bus_id: {device_pci_bus_id:?}");
+        write!(summary, ", pci_bus_id: {device_pci_bus_id:?}").ok();
     }
     if *subgroup_min_size != 0 || *subgroup_max_size != 0 {
-        summary += &format!(", subgroup_size: {subgroup_min_size}..={subgroup_max_size}");
+        write!(
+            summary,
+            ", subgroup_size: {subgroup_min_size}..={subgroup_max_size}"
+        )
+        .ok();
     }
-    summary += &format!(", transient_saves_memory: {transient_saves_memory}");
+    write!(
+        summary,
+        ", transient_saves_memory: {transient_saves_memory}"
+    )
+    .ok();
 
     summary
 }
diff --git a/crates/egui-wgpu/src/renderer.rs b/crates/egui-wgpu/src/renderer.rs
index c37802448..e55f7581a 100644
--- a/crates/egui-wgpu/src/renderer.rs
+++ b/crates/egui-wgpu/src/renderer.rs
@@ -1,5 +1,3 @@
-#![expect(clippy::unwrap_used)] // TODO(emilk): avoid unwraps
-
 use std::{borrow::Cow, num::NonZeroU64, ops::Range};
 
 use ahash::HashMap;
@@ -352,7 +350,10 @@ impl Renderer {
 
         let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: Some("egui_pipeline_layout"),
-            bind_group_layouts: &[&uniform_bind_group_layout, &texture_bind_group_layout],
+            bind_group_layouts: &[
+                Some(&uniform_bind_group_layout),
+                Some(&texture_bind_group_layout),
+            ],
             immediate_size: 0,
         });
 
@@ -360,8 +361,8 @@ impl Renderer {
             .depth_stencil_format
             .map(|format| wgpu::DepthStencilState {
                 format,
-                depth_write_enabled: false,
-                depth_compare: wgpu::CompareFunction::Always,
+                depth_write_enabled: Some(false),
+                depth_compare: Some(wgpu::CompareFunction::Always),
                 stencil: wgpu::StencilState::default(),
                 bias: wgpu::DepthBiasState::default(),
             });
@@ -469,6 +470,9 @@ impl Renderer {
     /// The render pass internally keeps all referenced resources alive as long as necessary.
     /// The only consequence of `forget_lifetime` is that any operation on the parent encoder will cause a runtime error
     /// instead of a compile time error.
+    ///
+    /// # Panic
+    /// Always ensure that [`Renderer::update_buffers`] has been called otherwise calling [`Renderer::render`] will panic!
     pub fn render(
         &self,
         render_pass: &mut wgpu::RenderPass<'static>,
@@ -513,8 +517,12 @@ impl Renderer {
                     // Skip rendering zero-sized clip areas.
                     if let Primitive::Mesh(_) = primitive {
                         // If this is a mesh, we need to advance the index and vertex buffer iterators:
-                        index_buffer_slices.next().unwrap();
-                        vertex_buffer_slices.next().unwrap();
+                        index_buffer_slices
+                            .next()
+                            .expect("You must call .update_buffers() before .render()");
+                        vertex_buffer_slices
+                            .next()
+                            .expect("You must call .update_buffers() before .render()");
                     }
                     continue;
                 }
@@ -524,8 +532,12 @@ impl Renderer {
 
             match primitive {
                 Primitive::Mesh(mesh) => {
-                    let index_buffer_slice = index_buffer_slices.next().unwrap();
-                    let vertex_buffer_slice = vertex_buffer_slices.next().unwrap();
+                    let index_buffer_slice = index_buffer_slices
+                        .next()
+                        .expect("You must call .update_buffers() before .render()");
+                    let vertex_buffer_slice = vertex_buffer_slices
+                        .next()
+                        .expect("You must call .update_buffers() before .render()");
 
                     if let Some(Texture { bind_group, .. }) = self.textures.get(&mesh.texture_id) {
                         render_pass.set_bind_group(1, bind_group, &[]);
@@ -951,6 +963,7 @@ impl Renderer {
             let index_buffer_staging = queue.write_buffer_with(
                 &self.index_buffer.buffer,
                 0,
+                #[expect(clippy::unwrap_used)] // Checked above
                 NonZeroU64::new(required_index_buffer_size).unwrap(),
             );
 
@@ -968,7 +981,8 @@ impl Renderer {
                     Primitive::Mesh(mesh) => {
                         let size = mesh.indices.len() * std::mem::size_of::<u32>();
                         let slice = index_offset..(size + index_offset);
-                        index_buffer_staging[slice.clone()]
+                        index_buffer_staging
+                            .slice(slice.clone())
                             .copy_from_slice(bytemuck::cast_slice(&mesh.indices));
                         self.index_buffer.slices.push(slice);
                         index_offset += size;
@@ -994,6 +1008,7 @@ impl Renderer {
             let vertex_buffer_staging = queue.write_buffer_with(
                 &self.vertex_buffer.buffer,
                 0,
+                #[expect(clippy::unwrap_used)] // Checked above
                 NonZeroU64::new(required_vertex_buffer_size).unwrap(),
             );
 
@@ -1011,7 +1026,8 @@ impl Renderer {
                     Primitive::Mesh(mesh) => {
                         let size = mesh.vertices.len() * std::mem::size_of::<Vertex>();
                         let slice = vertex_offset..(size + vertex_offset);
-                        vertex_buffer_staging[slice.clone()]
+                        vertex_buffer_staging
+                            .slice(slice.clone())
                             .copy_from_slice(bytemuck::cast_slice(&mesh.vertices));
                         self.vertex_buffer.slices.push(slice);
                         vertex_offset += size;
diff --git a/crates/egui-wgpu/src/setup.rs b/crates/egui-wgpu/src/setup.rs
index 0c3cb8c39..cf8b652c2 100644
--- a/crates/egui-wgpu/src/setup.rs
+++ b/crates/egui-wgpu/src/setup.rs
@@ -1,5 +1,43 @@
 use std::sync::Arc;
 
+/// A cloneable display handle for use with [`wgpu::InstanceDescriptor`].
+///
+/// [`wgpu::InstanceDescriptor`] stores its display handle as a non-cloneable
+/// `Box<dyn WgpuHasDisplayHandle>`. This trait wraps it so it can be cloned
+/// alongside the rest of the egui wgpu configuration.
+///
+/// Automatically implemented for all types that satisfy the bounds
+/// (including [`winit::event_loop::OwnedDisplayHandle`]).
+pub trait EguiDisplayHandle:
+    wgpu::rwh::HasDisplayHandle + std::fmt::Debug + Send + Sync + 'static
+{
+    /// Clone into a `Box<dyn WgpuHasDisplayHandle>` for [`wgpu::InstanceDescriptor::display`].
+    fn clone_for_wgpu(&self) -> Box<dyn wgpu::wgt::WgpuHasDisplayHandle>;
+
+    /// Clone into a new `Box<dyn EguiDisplayHandle>`.
+    fn clone_display_handle(&self) -> Box<dyn EguiDisplayHandle>;
+}
+
+impl Clone for Box<dyn EguiDisplayHandle> {
+    fn clone(&self) -> Self {
+        // We need to deref here, otherwise this causes infinite recursion stack overflow.
+        (**self).clone_display_handle()
+    }
+}
+
+impl<T> EguiDisplayHandle for T
+where
+    T: wgpu::rwh::HasDisplayHandle + Clone + std::fmt::Debug + Send + Sync + 'static,
+{
+    fn clone_for_wgpu(&self) -> Box<dyn wgpu::wgt::WgpuHasDisplayHandle> {
+        Box::new(self.clone())
+    }
+
+    fn clone_display_handle(&self) -> Box<dyn EguiDisplayHandle> {
+        Box::new(self.clone())
+    }
+}
+
 #[derive(Clone)]
 pub enum WgpuSetup {
     /// Construct a wgpu setup using some predefined settings & heuristics.
@@ -22,9 +60,19 @@ pub enum WgpuSetup {
     Existing(WgpuSetupExisting),
 }
 
-impl Default for WgpuSetup {
-    fn default() -> Self {
-        Self::CreateNew(WgpuSetupCreateNew::default())
+impl WgpuSetup {
+    /// Creates a new [`WgpuSetup::CreateNew`] with the given display handle.
+    ///
+    /// See [`WgpuSetupCreateNew::from_display_handle`] for details.
+    pub fn from_display_handle(display_handle: impl EguiDisplayHandle) -> Self {
+        Self::CreateNew(WgpuSetupCreateNew::from_display_handle(display_handle))
+    }
+
+    /// Creates a new [`WgpuSetup::CreateNew`] without a display handle.
+    ///
+    /// See [`WgpuSetupCreateNew::without_display_handle`] for details.
+    pub fn without_display_handle() -> Self {
+        Self::CreateNew(WgpuSetupCreateNew::without_display_handle())
     }
 }
 
@@ -65,8 +113,18 @@ impl WgpuSetup {
                 }
 
                 log::debug!("Creating wgpu instance with backends {backends:?}");
-                wgpu::util::new_instance_with_webgpu_detection(&create_new.instance_descriptor)
-                    .await
+                let desc = &create_new.instance_descriptor;
+                let descriptor = wgpu::InstanceDescriptor {
+                    backends: desc.backends,
+                    flags: desc.flags,
+                    backend_options: desc.backend_options.clone(),
+                    memory_budget_thresholds: desc.memory_budget_thresholds,
+                    display: create_new
+                        .display_handle
+                        .as_ref()
+                        .map(|handle| handle.clone_for_wgpu()),
+                };
+                wgpu::util::new_instance_with_webgpu_detection(descriptor).await
             }
             Self::Existing(existing) => existing.instance.clone(),
         }
@@ -98,18 +156,35 @@ pub type NativeAdapterSelectorMethod = Arc<
 /// Configuration for creating a new wgpu setup.
 ///
 /// Used for [`WgpuSetup::CreateNew`].
+///
+/// Prefer [`Self::from_display_handle`] when you have a display handle available.
+/// Most platforms work without one, but some (e.g. Wayland with GLES, or WebGL)
+/// require it, so providing one ensures maximum compatibility.
+/// With winit, pass [`EventLoop::owned_display_handle`](winit::event_loop::EventLoop::owned_display_handle).
+///
+/// Note: The display handle is stored in [`Self::display_handle`] rather than in
+/// [`Self::instance_descriptor`] so the config can be cloned
+/// ([`wgpu::InstanceDescriptor`] is not `Clone`). It is injected at instance creation time.
 pub struct WgpuSetupCreateNew {
-    /// Instance descriptor for creating a wgpu instance.
+    /// Descriptor for the wgpu instance.
     ///
-    /// The most important field is [`wgpu::InstanceDescriptor::backends`], which
-    /// controls which backends are supported (wgpu will pick one of these).
-    /// If you only want to support WebGL (and not WebGPU),
-    /// you can set this to [`wgpu::Backends::GL`].
-    /// By default on web, WebGPU will be used if available.
-    /// WebGL will only be used as a fallback,
-    /// and only if you have enabled the `webgl` feature of crate `wgpu`.
+    /// Leave [`wgpu::InstanceDescriptor::display`] as `None` — use [`Self::display_handle`]
+    /// instead (injected at instance creation time).
+    ///
+    /// The most important field is [`wgpu::InstanceDescriptor::backends`], which controls
+    /// which backends are supported (wgpu will pick one of these). For example, set it to
+    /// [`wgpu::Backends::GL`] to use only WebGL. By default on web, WebGPU is preferred
+    /// with WebGL as a fallback (requires the `webgl` feature of crate `wgpu`).
     pub instance_descriptor: wgpu::InstanceDescriptor,
 
+    /// Display handle passed to wgpu at instance creation time.
+    ///
+    /// Required on some platforms (e.g. Wayland with GLES, WebGL); optional elsewhere.
+    /// With winit, use [`winit::event_loop::OwnedDisplayHandle`].
+    ///
+    /// `eframe` 's winit & web integrations will attempt to fill the display handle automatically if it is left empty.
+    pub display_handle: Option<Box<dyn EguiDisplayHandle>>,
+
     /// Power preference for the adapter if [`Self::native_adapter_selector`] is not set or targeting web.
     pub power_preference: wgpu::PowerPreference,
 
@@ -128,32 +203,37 @@ pub struct WgpuSetupCreateNew {
         Arc<dyn Fn(&wgpu::Adapter) -> wgpu::DeviceDescriptor<'static> + Send + Sync>,
 }
 
-impl Clone for WgpuSetupCreateNew {
-    fn clone(&self) -> Self {
+impl WgpuSetupCreateNew {
+    /// Creates a new configuration with the given display handle.
+    ///
+    /// This is the recommended constructor. Most platforms (Windows, macOS/iOS, Android, web)
+    /// work fine without a display handle, but some (e.g. Wayland on Linux with GLES) require
+    /// one. Providing it unconditionally ensures your app works everywhere.
+    ///
+    /// If you don't have a display handle available, use [`Self::without_display_handle`]
+    /// instead — it will still work on the majority of platforms.
+    ///
+    /// With winit, pass [`EventLoop::owned_display_handle`](winit::event_loop::EventLoop::owned_display_handle).
+    pub fn from_display_handle(display_handle: impl EguiDisplayHandle) -> Self {
         Self {
-            instance_descriptor: self.instance_descriptor.clone(),
-            power_preference: self.power_preference,
-            native_adapter_selector: self.native_adapter_selector.clone(),
-            device_descriptor: Arc::clone(&self.device_descriptor),
+            display_handle: Some(Box::new(display_handle)),
+            ..Self::without_display_handle()
         }
     }
-}
 
-impl std::fmt::Debug for WgpuSetupCreateNew {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("WgpuSetupCreateNew")
-            .field("instance_descriptor", &self.instance_descriptor)
-            .field("power_preference", &self.power_preference)
-            .field(
-                "native_adapter_selector",
-                &self.native_adapter_selector.is_some(),
-            )
-            .finish()
-    }
-}
-
-impl Default for WgpuSetupCreateNew {
-    fn default() -> Self {
+    /// Creates a new configuration without a display handle.
+    ///
+    /// A display handle is not required for headless operation (offscreen rendering, tests,
+    /// compute-only workloads). It also isn't needed on most platforms even when presenting
+    /// to a window — only some configurations (e.g. Wayland on Linux with GLES) require one.
+    ///
+    /// If you do have a display handle available, prefer [`Self::from_display_handle`] for
+    /// maximum compatibility.
+    ///
+    /// With winit you can obtain one via [`EventLoop::owned_display_handle`](winit::event_loop::EventLoop::owned_display_handle).
+    ///
+    /// `eframe` 's winit & web integrations will attempt to fill the display handle automatically if it is left empty.
+    pub fn without_display_handle() -> Self {
         Self {
             instance_descriptor: wgpu::InstanceDescriptor {
                 // Add GL backend, primarily because WebGPU is not stable enough yet.
@@ -163,8 +243,11 @@ impl Default for WgpuSetupCreateNew {
                 flags: wgpu::InstanceFlags::from_build_config().with_env(),
                 backend_options: wgpu::BackendOptions::from_env_or_default(),
                 memory_budget_thresholds: wgpu::MemoryBudgetThresholds::default(),
+                display: None,
             },
 
+            display_handle: None,
+
             power_preference: wgpu::PowerPreference::from_env()
                 .unwrap_or(wgpu::PowerPreference::HighPerformance),
 
@@ -192,6 +275,46 @@ impl Default for WgpuSetupCreateNew {
     }
 }
 
+impl Clone for WgpuSetupCreateNew {
+    fn clone(&self) -> Self {
+        let desc = &self.instance_descriptor;
+        Self {
+            instance_descriptor: wgpu::InstanceDescriptor {
+                backends: desc.backends,
+                flags: desc.flags,
+                backend_options: desc.backend_options.clone(),
+                memory_budget_thresholds: desc.memory_budget_thresholds,
+                display: None,
+            },
+            display_handle: self.display_handle.clone(),
+            power_preference: self.power_preference,
+            native_adapter_selector: self.native_adapter_selector.clone(),
+            device_descriptor: Arc::clone(&self.device_descriptor),
+        }
+    }
+}
+
+impl std::fmt::Debug for WgpuSetupCreateNew {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let Self {
+            instance_descriptor,
+            display_handle,
+            power_preference,
+            native_adapter_selector,
+            device_descriptor: _,
+        } = self;
+        f.debug_struct("WgpuSetupCreateNew")
+            .field("instance_descriptor", instance_descriptor)
+            .field("display_handle", display_handle)
+            .field("power_preference", power_preference)
+            .field(
+                "native_adapter_selector",
+                &native_adapter_selector.is_some(),
+            )
+            .finish_non_exhaustive()
+    }
+}
+
 /// Configuration for using an existing wgpu setup.
 ///
 /// Used for [`WgpuSetup::Existing`].
diff --git a/crates/egui-wgpu/src/winit.rs b/crates/egui-wgpu/src/winit.rs
index 5fb8d123a..8b5a91904 100644
--- a/crates/egui-wgpu/src/winit.rs
+++ b/crates/egui-wgpu/src/winit.rs
@@ -3,7 +3,7 @@
 #![expect(clippy::unwrap_used)] // TODO(emilk): avoid unwraps
 #![expect(unsafe_code)]
 
-use crate::{RenderState, SurfaceErrorAction, WgpuConfiguration, renderer};
+use crate::{RenderState, SurfaceConfig, SurfaceErrorAction, WgpuConfiguration, renderer};
 use crate::{
     RendererOptions,
     capture::{CaptureReceiver, CaptureSender, CaptureState, capture_channel},
@@ -17,6 +17,7 @@ struct SurfaceState {
     width: u32,
     height: u32,
     resizing: bool,
+    needs_reconfigure: bool,
 }
 
 /// Everything you need to paint egui with [`wgpu`] on [`winit`].
@@ -26,7 +27,7 @@ struct SurfaceState {
 /// NOTE: all egui viewports share the same painter.
 pub struct Painter {
     context: Context,
-    configuration: WgpuConfiguration,
+    config: WgpuConfiguration,
     options: RendererOptions,
     support_transparent_backbuffer: bool,
     screen_capture_state: Option<CaptureState>,
@@ -57,16 +58,16 @@ impl Painter {
     /// associated.
     pub async fn new(
         context: Context,
-        configuration: WgpuConfiguration,
+        config: WgpuConfiguration,
         support_transparent_backbuffer: bool,
         options: RendererOptions,
     ) -> Self {
         let (capture_tx, capture_rx) = capture_channel();
-        let instance = configuration.wgpu_setup.new_instance().await;
+        let instance = config.wgpu_setup.new_instance().await;
 
         Self {
             context,
-            configuration,
+            config,
             options,
             support_transparent_backbuffer,
             screen_capture_state: None,
@@ -93,17 +94,22 @@ impl Painter {
     fn configure_surface(
         surface_state: &SurfaceState,
         render_state: &RenderState,
-        config: &WgpuConfiguration,
+        config: &SurfaceConfig,
     ) {
         profiling::function_scope!();
 
+        let SurfaceConfig {
+            present_mode,
+            desired_maximum_frame_latency,
+        } = *config;
+
         let width = surface_state.width;
         let height = surface_state.height;
 
         let mut surf_config = wgpu::SurfaceConfiguration {
             usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
             format: render_state.target_format,
-            present_mode: config.present_mode,
+            present_mode,
             alpha_mode: surface_state.alpha_mode,
             view_formats: vec![render_state.target_format],
             ..surface_state
@@ -112,7 +118,7 @@ impl Painter {
                 .expect("The surface isn't supported by this adapter")
         };
 
-        if let Some(desired_maximum_frame_latency) = config.desired_maximum_frame_latency {
+        if let Some(desired_maximum_frame_latency) = desired_maximum_frame_latency {
             surf_config.desired_maximum_frame_latency = desired_maximum_frame_latency;
         }
 
@@ -200,13 +206,9 @@ impl Painter {
         let render_state = if let Some(render_state) = &self.render_state {
             render_state
         } else {
-            let render_state = RenderState::create(
-                &self.configuration,
-                &self.instance,
-                Some(&surface),
-                self.options,
-            )
-            .await?;
+            let render_state =
+                RenderState::create(&self.config, &self.instance, Some(&surface), self.options)
+                    .await?;
             self.render_state.get_or_insert(render_state)
         };
         let alpha_mode = if self.support_transparent_backbuffer {
@@ -234,6 +236,7 @@ impl Painter {
                 height: size.height,
                 alpha_mode,
                 resizing: false,
+                needs_reconfigure: false,
             },
         );
         let Some(width) = NonZeroU32::new(size.width) else {
@@ -276,7 +279,7 @@ impl Painter {
         surface_state.width = width;
         surface_state.height = height;
 
-        Self::configure_surface(surface_state, render_state, &self.configuration);
+        Self::configure_surface(surface_state, render_state, &self.config.surface);
 
         if let Some(depth_format) = self.options.depth_stencil_format {
             self.depth_texture_view.insert(
@@ -368,12 +371,12 @@ impl Painter {
                     hal_surface
                         .render_layer()
                         .lock()
-                        .set_presents_with_transaction(resizing);
+                        .setPresentsWithTransaction(resizing);
 
                     Self::configure_surface(
                         state,
                         self.render_state.as_ref().unwrap(),
-                        &self.configuration,
+                        &self.config.surface,
                     );
                 }
             }
@@ -409,6 +412,7 @@ impl Painter {
     /// and the captures captured screenshot if it was requested.
     ///
     /// If `capture_data` isn't empty, a screenshot will be captured.
+    #[expect(clippy::too_many_arguments)]
     pub fn paint_and_update_textures(
         &mut self,
         viewport_id: ViewportId,
@@ -417,6 +421,7 @@ impl Painter {
         clipped_primitives: &[epaint::ClippedPrimitive],
         textures_delta: &epaint::textures::TexturesDelta,
         capture_data: Vec<UserData>,
+        window: &winit::window::Window,
     ) -> f32 {
         profiling::function_scope!();
 
@@ -445,6 +450,20 @@ impl Painter {
         let capture = !capture_data.is_empty();
         let mut vsync_sec = 0.0;
 
+        // Apply any runtime changes requested via `RenderState::surface_config`.
+        // We diff against the already-applied values in `self.config.surface`
+        // and, if anything differs, mark every surface as needing reconfiguration so
+        // the existing `needs_reconfigure` pathway below picks them up.
+        if let Some(render_state) = self.render_state.as_ref()
+            && render_state.surface_config != self.config.surface
+        {
+            self.config.surface = render_state.surface_config;
+            #[expect(clippy::iter_over_hash_type)]
+            for surface in self.surfaces.values_mut() {
+                surface.needs_reconfigure = true;
+            }
+        }
+
         let Some(render_state) = self.render_state.as_mut() else {
             return vsync_sec;
         };
@@ -454,7 +473,7 @@ impl Painter {
             commands_submitted: false,
         };
 
-        let Some(surface_state) = self.surfaces.get(&viewport_id) else {
+        let Some(surface_state) = self.surfaces.get_mut(&viewport_id) else {
             return vsync_sec;
         };
 
@@ -491,6 +510,11 @@ impl Painter {
             )
         };
 
+        if surface_state.needs_reconfigure {
+            Self::configure_surface(surface_state, render_state, &self.config.surface);
+            surface_state.needs_reconfigure = false;
+        }
+
         let output_frame = {
             profiling::scope!("get_current_texture");
             // This is what vsync-waiting happens on my Mac.
@@ -501,16 +525,20 @@ impl Painter {
         };
 
         let output_frame = match output_frame {
-            Ok(frame) => frame,
-            Err(err) => match (*self.configuration.on_surface_error)(err) {
-                SurfaceErrorAction::RecreateSurface => {
-                    Self::configure_surface(surface_state, render_state, &self.configuration);
-                    return vsync_sec;
+            wgpu::CurrentSurfaceTexture::Success(frame) => frame,
+            wgpu::CurrentSurfaceTexture::Suboptimal(frame) => {
+                surface_state.needs_reconfigure = true;
+                frame
+            }
+            other => {
+                match (*self.config.on_surface_status)(&other) {
+                    SurfaceErrorAction::RecreateSurface => {
+                        Self::configure_surface(surface_state, render_state, &self.config.surface);
+                    }
+                    SurfaceErrorAction::SkipFrame => {}
                 }
-                SurfaceErrorAction::SkipFrame => {
-                    return vsync_sec;
-                }
-            },
+                return vsync_sec;
+            }
         };
 
         let mut capture_buffer = None;
@@ -643,6 +671,8 @@ impl Painter {
             );
         }
 
+        window.pre_present_notify();
+
         {
             profiling::scope!("present");
             // wgpu doesn't document where vsync can happen. Maybe here?
diff --git a/crates/egui-winit/CHANGELOG.md b/crates/egui-winit/CHANGELOG.md
index f88a8c84a..15c7c2d52 100644
--- a/crates/egui-winit/CHANGELOG.md
+++ b/crates/egui-winit/CHANGELOG.md
@@ -5,6 +5,21 @@ 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.34.2 - 2026-05-04
+Nothing new
+
+
+## 0.34.1 - 2026-03-27
+Nothing new
+
+
+## 0.34.0 - 2026-03-26
+* Add `is_scrolling`/`is_smooth_scrolling` util, checking for active scroll action [#7669](https://github.com/emilk/egui/pull/7669) by [@IsseW](https://github.com/IsseW)
+* Fix backspacing leaving last character in IME prediction not removed on macOS native and Safari [#7810](https://github.com/emilk/egui/pull/7810) by [@umajho](https://github.com/umajho)
+* Much improved IME [#7967](https://github.com/emilk/egui/pull/7967) by [@umajho](https://github.com/umajho)
+* Allow fallback from smithay to arboard when getting clipboard [#7976](https://github.com/emilk/egui/pull/7976) by [@wizzeh](https://github.com/wizzeh)
+
+
 ## 0.33.3 - 2025-12-11
 Nothing new
 
diff --git a/crates/egui-winit/Cargo.toml b/crates/egui-winit/Cargo.toml
index d1b2ab220..7fea2341b 100644
--- a/crates/egui-winit/Cargo.toml
+++ b/crates/egui-winit/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 repository = "https://github.com/emilk/egui/tree/main/crates/egui-winit"
 categories = ["gui", "game-development"]
 keywords = ["winit", "egui", "gui", "gamedev"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
 
 [lints]
 workspace = true
@@ -20,6 +20,9 @@ workspace = true
 all-features = true
 rustdoc-args = ["--generate-link-to-definition"]
 
+[package.metadata.cargo-shear]
+ignored = ["wayland-cursor"] # TODO(emilk): remove when we update winit
+
 [features]
 default = ["clipboard", "links", "wayland", "winit/default", "x11"]
 
@@ -81,6 +84,7 @@ objc2.workspace = true
 objc2-foundation = { workspace = true, features = ["std", "NSThread"] }
 objc2-ui-kit = { workspace = true, features = [
   "std",
+  "objc2-core-foundation",
   "UIApplication",
   "UIGeometry",
   "UIResponder",
diff --git a/crates/egui-winit/src/clipboard.rs b/crates/egui-winit/src/clipboard.rs
index 75d0469ec..2410c3ee6 100644
--- a/crates/egui-winit/src/clipboard.rs
+++ b/crates/egui-winit/src/clipboard.rs
@@ -65,13 +65,12 @@ impl Clipboard {
             feature = "smithay-clipboard"
         ))]
         if let Some(clipboard) = &mut self.smithay {
-            return match clipboard.load() {
-                Ok(text) => Some(text),
+            match clipboard.load() {
+                Ok(text) => return Some(text),
                 Err(err) => {
                     log::error!("smithay paste error: {err}");
-                    None
                 }
-            };
+            }
         }
 
         #[cfg(all(
diff --git a/crates/egui-winit/src/lib.rs b/crates/egui-winit/src/lib.rs
index 234a9989b..bbb22f0ab 100644
--- a/crates/egui-winit/src/lib.rs
+++ b/crates/egui-winit/src/lib.rs
@@ -9,6 +9,9 @@
 
 #![expect(clippy::manual_range_contains)]
 
+#[cfg(target_os = "windows")]
+use std::collections::HashSet;
+
 #[cfg(feature = "accesskit")]
 pub use accesskit_winit;
 pub use egui;
@@ -98,14 +101,17 @@ pub struct State {
     /// Only one touch will be interpreted as pointer at any time.
     pointer_touch_id: Option<u64>,
 
-    /// track ime state
-    has_sent_ime_enabled: bool,
-
     #[cfg(feature = "accesskit")]
     pub accesskit: Option<accesskit_winit::Adapter>,
 
     allow_ime: bool,
     ime_rect_px: Option<egui::Rect>,
+
+    /// Used by [`State::try_on_ime_processed_keyboard_input`] to track key
+    /// release events that should be filtered out. See comments in that method
+    /// for details.
+    #[cfg(target_os = "windows")]
+    pressed_processed_physical_keys: HashSet<winit::keyboard::PhysicalKey>,
 }
 
 impl State {
@@ -126,9 +132,11 @@ impl State {
         };
 
         let mut slf = Self {
-            egui_ctx,
             viewport_id,
-            start_time: web_time::Instant::now(),
+            start_time: web_time::Instant::now()
+                .checked_sub(web_time::Duration::from_secs_f64(egui_ctx.time()))
+                .unwrap_or_else(web_time::Instant::now),
+            egui_ctx,
             egui_input,
             pointer_pos_in_points: None,
             any_pointer_button_down: false,
@@ -141,13 +149,13 @@ impl State {
             simulate_touch_screen: false,
             pointer_touch_id: None,
 
-            has_sent_ime_enabled: false,
-
             #[cfg(feature = "accesskit")]
             accesskit: None,
 
             allow_ime: false,
             ime_rect_px: None,
+            #[cfg(target_os = "windows")]
+            pressed_processed_physical_keys: HashSet::new(),
         };
 
         slf.egui_input
@@ -364,25 +372,33 @@ impl State {
                 is_synthetic,
                 ..
             } => {
-                // Winit generates fake "synthetic" KeyboardInput events when the focus
-                // is changed to the window, or away from it. Synthetic key presses
-                // represent no real key presses and should be ignored.
-                // See https://github.com/rust-windowing/winit/issues/3543
                 if *is_synthetic && event.state == ElementState::Pressed {
+                    // Winit generates fake "synthetic" KeyboardInput events when the focus
+                    // is changed to the window, or away from it. Synthetic key presses
+                    // represent no real key presses and should be ignored.
+                    // See https://github.com/rust-windowing/winit/issues/3543
                     EventResponse {
                         repaint: true,
                         consumed: false,
                     }
                 } else {
-                    self.on_keyboard_input(event);
+                    let egui_wants_keyboard_input = self.egui_ctx.egui_wants_keyboard_input();
 
-                    // When pressing the Tab key, egui focuses the first focusable element, hence Tab always consumes.
-                    let consumed = self.egui_ctx.egui_wants_keyboard_input()
-                        || event.logical_key
-                            == winit::keyboard::Key::Named(winit::keyboard::NamedKey::Tab);
-                    EventResponse {
-                        repaint: true,
-                        consumed,
+                    if let Some(response) =
+                        self.try_on_ime_processed_keyboard_input(event, egui_wants_keyboard_input)
+                    {
+                        response
+                    } else {
+                        self.on_keyboard_input(event);
+
+                        // When pressing the Tab key, egui focuses the first focusable element, hence Tab always consumes.
+                        let consumed = egui_wants_keyboard_input
+                            || event.logical_key
+                                == winit::keyboard::Key::Named(winit::keyboard::NamedKey::Tab);
+                        EventResponse {
+                            repaint: true,
+                            consumed,
+                        }
                     }
                 }
             }
@@ -526,6 +542,91 @@ impl State {
         }
     }
 
+    #[cfg(not(target_os = "windows"))]
+    #[expect(clippy::unused_self, clippy::needless_pass_by_ref_mut)]
+    #[inline(always)]
+    fn try_on_ime_processed_keyboard_input(
+        &mut self,
+        _event: &winit::event::KeyEvent,
+        _egui_wants_keyboard_input: bool,
+    ) -> Option<EventResponse> {
+        // `KeyboardInput` events processed by the IME are not emitted by
+        // `winit` on non-Windows platforms, so we don't need to do anything
+        // here.
+
+        None
+    }
+
+    #[cfg(target_os = "windows")]
+    #[inline(always)]
+    fn try_on_ime_processed_keyboard_input(
+        &mut self,
+        event: &winit::event::KeyEvent,
+        egui_wants_keyboard_input: bool,
+    ) -> Option<EventResponse> {
+        if !self.allow_ime {
+            None
+        } else if event.logical_key == winit::keyboard::NamedKey::Process {
+            // On Windows, the current version of `winit` (0.30.12) has a bug
+            // where `KeyboardInput` events processed by the IME are still
+            // emitted. [^1]
+            //
+            // As a workaround, we detect these events by checking whether their
+            // `logical_key` is `winit::keyboard::NamedKey::Process`, and filter
+            // them out to keep behavior consistent with other platforms.
+            //
+            // `winit::keyboard::NamedKey::Process` is not documented in
+            // `winit`. Reading through its source code, we find that it is
+            // mapped from `VK_PROCESSKEY` on Windows [^2]. (On an unrelated
+            // note, Web is the only other platform that also uses it [^3].)
+            // According to Microsoft, “the IME sets the virtual key value
+            // to `VK_PROCESSKEY` after processing a key input message” [^4].
+            // See also [^5].
+            // (I can't find a documentation page dedicated to this value.)
+            //
+            // TODO(umajho): Remove this workaround once the `winit` bug is fixed
+            // and we've updated to a version that includes the fix. NOTE: Don't
+            // forget to also remove the `pressed_processed_physical_keys` field
+            // and its related code.
+            //
+            // [^1]: https://github.com/rust-windowing/winit/issues/4508
+            // [^2]: https://github.com/rust-windowing/winit/blob/e9809ef54b18499bb4f2cac945719ecc2a61061b/src/platform_impl/windows/keyboard_layout.rs#L946
+            // [^3]: https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_key_values
+            // [^4]: https://learn.microsoft.com/en-us/windows/win32/api/imm/nf-imm-immgetvirtualkey#remarks
+            // [^5]: https://learn.microsoft.com/en-us/windows/win32/learnwin32/keyboard-input#character-messages
+
+            self.pressed_processed_physical_keys
+                .insert(event.physical_key);
+
+            Some(EventResponse {
+                repaint: false,
+                consumed: egui_wants_keyboard_input,
+            })
+        } else if event.state == ElementState::Released
+            && self
+                .pressed_processed_physical_keys
+                .remove(&event.physical_key)
+        {
+            // Unlike key-presses, we can not tell whether a key-release event
+            // is processed by the IME or not by looking at its `logical_key`,
+            // because their `logical_key` is the original value (e.g.
+            // `winit::keyboard::Key::Character(…)`) rather than
+            // `winit::keyboard::Key::Named(winit::keyboard::NamedKey::Process)`.
+            // (See the screencast for Windows in [^1].)
+            // So we track the physical keys of processed key-presses and
+            // filter out the corresponding key-releases.
+            //
+            // [^1]: https://github.com/rust-windowing/winit/issues/4508
+
+            Some(EventResponse {
+                repaint: false,
+                consumed: egui_wants_keyboard_input,
+            })
+        } else {
+            None
+        }
+    }
+
     /// ## NOTE
     ///
     /// on Mac even Cmd-C is pressed during ime, a `c` is pushed to Preedit.
@@ -585,17 +686,11 @@ impl State {
         // }
 
         match ime {
-            winit::event::Ime::Enabled => {
-                if cfg!(target_os = "linux") {
-                    // This event means different things in X11 and Wayland, but we can just
-                    // ignore it and enable IME on the preedit event.
-                    // See <https://github.com/rust-windowing/winit/issues/2498>
-                } else {
-                    self.ime_event_enable();
-                }
-            }
-            winit::event::Ime::Preedit(text, Some(_cursor)) => {
-                self.ime_event_enable();
+            // [`winit::event::Ime::Enabled`] means different things in X11 and
+            // Wayland, but it doesn't matter to us.
+            // See <https://github.com/rust-windowing/winit/issues/2498>
+            winit::event::Ime::Enabled | winit::event::Ime::Disabled => {}
+            winit::event::Ime::Preedit(text, _) => {
                 self.egui_input
                     .events
                     .push(egui::Event::Ime(egui::ImeEvent::Preedit(text.clone())));
@@ -604,53 +699,10 @@ impl State {
                 self.egui_input
                     .events
                     .push(egui::Event::Ime(egui::ImeEvent::Commit(text.clone())));
-                self.ime_event_disable();
-            }
-            winit::event::Ime::Disabled => {
-                self.ime_event_disable();
-            }
-            winit::event::Ime::Preedit(_, None) => {
-                if cfg!(target_os = "macos") {
-                    // On macOS, when the user presses backspace to delete the
-                    // last character in an IME composition, `winit` only emits
-                    // `winit::event::Ime::Preedit("", None)` without a
-                    // preceding `winit::event::Ime::Preedit("", Some(0, 0))`.
-                    //
-                    // The current implementation of `egui::TextEdit` relies on
-                    // receiving an `egui::ImeEvent::Preedit("")` to remove the
-                    // last character in the composition in this case, so we
-                    // emit it here.
-                    //
-                    // This is guarded to macOS-only, as applying it on other
-                    // platforms is unnecessary and can cause undesired
-                    // behavior.
-                    // See: https://github.com/emilk/egui/pull/7973
-                    self.egui_input
-                        .events
-                        .push(egui::Event::Ime(egui::ImeEvent::Preedit(String::new())));
-                }
-
-                self.ime_event_disable();
             }
         }
     }
 
-    pub fn ime_event_enable(&mut self) {
-        if !self.has_sent_ime_enabled {
-            self.egui_input
-                .events
-                .push(egui::Event::Ime(egui::ImeEvent::Enabled));
-            self.has_sent_ime_enabled = true;
-        }
-    }
-
-    pub fn ime_event_disable(&mut self) {
-        self.egui_input
-            .events
-            .push(egui::Event::Ime(egui::ImeEvent::Disabled));
-        self.has_sent_ime_enabled = false;
-    }
-
     /// Returns `true` if the event was sent to egui.
     pub fn on_mouse_motion(&mut self, delta: (f64, f64)) -> bool {
         if !self.is_pointer_in_window() && !self.any_pointer_button_down {
@@ -999,13 +1051,32 @@ impl State {
         self.set_cursor_icon(window, cursor_icon);
 
         let allow_ime = ime.is_some();
-        if self.allow_ime != allow_ime {
+        let is_toggling_ime = self.allow_ime != allow_ime;
+        if is_toggling_ime {
             self.allow_ime = allow_ime;
+            #[cfg(target_os = "windows")]
+            if !self.allow_ime {
+                // Defensively clear the set to avoid unexpected behavior.
+                //
+                // We don't do the same in `ime_event_disable` because the key
+                // release events for IME confirmation keys arrive after
+                // `winit::event::Ime::Disabled`.
+                self.pressed_processed_physical_keys.clear();
+            }
+
             profiling::scope!("set_ime_allowed");
             window.set_ime_allowed(allow_ime);
         }
 
         if let Some(ime) = ime {
+            if !is_toggling_ime && ime.should_interrupt_composition {
+                // TODO(umajho): use a more proper way to interrupt composition
+                // if `winit` provides one in the future.
+
+                window.set_ime_allowed(false);
+                window.set_ime_allowed(true);
+            }
+
             let pixels_per_point = pixels_per_point(&self.egui_ctx, window);
             let ime_rect_px = pixels_per_point * ime.rect;
             if self.ime_rect_px != Some(ime_rect_px)
diff --git a/crates/egui-winit/src/safe_area.rs b/crates/egui-winit/src/safe_area.rs
index 5f4a9f9cf..378f44a94 100644
--- a/crates/egui-winit/src/safe_area.rs
+++ b/crates/egui-winit/src/safe_area.rs
@@ -36,8 +36,8 @@ mod ios {
                             | UISceneActivationState::ForegroundInactive
                     )
                 {
-                    // Safe to cast, the class kind was checked above
-                    let window_scene = Retained::cast::<UIWindowScene>(scene.clone());
+                    // SAFETY: class kind was checked above with `isKindOfClass`
+                    let window_scene = Retained::cast_unchecked::<UIWindowScene>(scene.clone());
                     if let Some(window) = window_scene.keyWindow() {
                         let insets = window.safeAreaInsets();
                         return SafeAreaInsets(MarginF32 {
diff --git a/crates/egui/Cargo.toml b/crates/egui/Cargo.toml
index 764d2401e..3a22bf529 100644
--- a/crates/egui/Cargo.toml
+++ b/crates/egui/Cargo.toml
@@ -11,7 +11,7 @@ readme = "../../README.md"
 repository = "https://github.com/emilk/egui"
 categories = ["gui", "game-development"]
 keywords = ["gui", "imgui", "immediate", "portable", "gamedev"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
 
 [lints]
 workspace = true
diff --git a/crates/egui/src/atomics/atom.rs b/crates/egui/src/atomics/atom.rs
index 4db7f12a9..6f289fcfb 100644
--- a/crates/egui/src/atomics/atom.rs
+++ b/crates/egui/src/atomics/atom.rs
@@ -4,7 +4,21 @@ use epaint::text::TextWrapMode;
 
 /// A low-level ui building block.
 ///
-/// Implements [`From`] for [`String`], [`str`], [`crate::Image`] and much more for convenience.
+/// This can be a piece of text, an image, or even a custom widget.
+/// It can be decorated with various layout hints, such as `grow`, `shrink`, `align`, and more.
+///
+/// `Atom` implements [`From`] for [`String`], [`str`], [`crate::Image`] and much more for convenience.
+///
+/// Many widgets take an `impl` [`crate::IntoAtoms`] parameter,
+/// which allows you to easily create atoms from tuples of text, images, and other atoms:
+/// ```
+/// # use egui::{Vec2, AtomExt, AtomKind, Atom, Image, Id};
+/// # egui::__run_test_ui(|ui| {
+/// let image = egui::include_image!("../../../eframe/data/icon.png");
+/// ui.button((image, "Click me!"));
+/// # });
+/// ```
+///
 /// You can directly call the `atom_*` methods on anything that implements `Into<Atom>`.
 /// ```
 /// # use egui::{Image, emath::Vec2};
diff --git a/crates/egui/src/atomics/atom_layout.rs b/crates/egui/src/atomics/atom_layout.rs
index b78f23536..7894273f3 100644
--- a/crates/egui/src/atomics/atom_layout.rs
+++ b/crates/egui/src/atomics/atom_layout.rs
@@ -203,7 +203,7 @@ impl<'a> AtomLayout<'a> {
         // 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`.
         if wrap_mode != TextWrapMode::Extend {
-            let any_shrink = atoms.iter().any(|a| a.shrink);
+            let any_shrink = atoms.any_shrink();
             if !any_shrink {
                 let first_text = atoms
                     .iter_mut()
@@ -318,8 +318,9 @@ impl<'a> AtomLayout<'a> {
         let (_, rect) = ui.allocate_space(frame_size);
         let mut response = ui.interact(rect, id, sense);
 
-        response.intrinsic_size =
-            Some((Vec2::new(intrinsic_width, intrinsic_height) + margin.sum()).at_least(min_size));
+        response.set_intrinsic_size(
+            (Vec2::new(intrinsic_width, intrinsic_height) + margin.sum()).at_least(min_size),
+        );
 
         AllocatedAtomLayout {
             sized_atoms: sized_items,
@@ -520,6 +521,20 @@ impl AtomLayoutResponse {
     }
 }
 
+impl Deref for AtomLayoutResponse {
+    type Target = Response;
+
+    fn deref(&self) -> &Self::Target {
+        &self.response
+    }
+}
+
+impl DerefMut for AtomLayoutResponse {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.response
+    }
+}
+
 impl Widget for AtomLayout<'_> {
     fn ui(self, ui: &mut Ui) -> Response {
         self.show(ui).response
diff --git a/crates/egui/src/atomics/atoms.rs b/crates/egui/src/atomics/atoms.rs
index fb04ee2dd..761db8eb6 100644
--- a/crates/egui/src/atomics/atoms.rs
+++ b/crates/egui/src/atomics/atoms.rs
@@ -8,6 +8,15 @@ use std::ops::{Deref, DerefMut};
 pub(crate) const ATOMS_SMALL_VEC_SIZE: usize = 2;
 
 /// A list of [`Atom`]s.
+///
+/// Many widgets take an `impl` [`IntoAtoms`] parameter,
+/// which allows you to easily create atoms from tuples of text, images, and other atoms:
+/// ```
+/// # use egui::{AtomExt, AtomKind, Atom, Image, Id, Vec2};
+/// # egui::__run_test_ui(|ui| {
+/// let image = egui::include_image!("../../../eframe/data/icon.png");
+/// ui.button((image, "Click me!"));
+/// # });
 #[derive(Clone, Debug, Default)]
 pub struct Atoms<'a>(SmallVec<[Atom<'a>; ATOMS_SMALL_VEC_SIZE]>);
 
@@ -69,6 +78,11 @@ impl<'a> Atoms<'a> {
         string
     }
 
+    /// Do any of the atoms have shrink set to `true`?
+    pub fn any_shrink(&self) -> bool {
+        self.iter().any(|a| a.shrink)
+    }
+
     pub fn iter_kinds(&self) -> impl Iterator<Item = &AtomKind<'a>> {
         self.0.iter().map(|atom| &atom.kind)
     }
@@ -187,6 +201,16 @@ where
 }
 
 /// Trait for turning a tuple of [`Atom`]s into [`Atoms`].
+///
+/// Many widgets take an `impl` [`IntoAtoms`] parameter,
+/// which allows you to easily create atoms from tuples of text, images, and other atoms:
+/// ```
+/// # use egui::{AtomExt, AtomKind, Atom, Image, Id, Vec2};
+/// # egui::__run_test_ui(|ui| {
+/// let image = egui::include_image!("../../../eframe/data/icon.png");
+/// ui.button((image, "Click me!"));
+/// # });
+/// ```
 pub trait IntoAtoms<'a> {
     fn collect(self, atoms: &mut Atoms<'a>);
 
diff --git a/crates/egui/src/callstack.rs b/crates/egui/src/callstack.rs
index fef9b2166..b1239db01 100644
--- a/crates/egui/src/callstack.rs
+++ b/crates/egui/src/callstack.rs
@@ -1,3 +1,5 @@
+use std::fmt::Write as _;
+
 #[derive(Clone)]
 struct Frame {
     /// `_main` is usually as the deepest depth.
@@ -23,7 +25,7 @@ pub fn capture() -> String {
             if let Some(file_and_line) = &mut file_and_line
                 && let Some(line_nr) = symbol.lineno()
             {
-                file_and_line.push_str(&format!(":{line_nr}"));
+                write!(file_and_line, ":{line_nr}").ok();
             }
             let file_and_line = file_and_line.unwrap_or_default();
 
@@ -130,12 +132,14 @@ pub fn capture() -> String {
 
             if frame.depth + 1 < last_depth || last_depth + 1 < frame.depth {
                 // Show that some frames were elided
-                formatted.push_str(&format!("{:widest_depth$}  …\n", ""));
+                writeln!(formatted, "{:widest_depth$}  …", "").ok();
             }
 
-            formatted.push_str(&format!(
-                "{depth:widest_depth$}: {file_and_line:widest_file_line$}  {name}\n"
-            ));
+            writeln!(
+                formatted,
+                "{depth:widest_depth$}: {file_and_line:widest_file_line$}  {name}"
+            )
+            .ok();
 
             last_depth = frame.depth;
         }
diff --git a/crates/egui/src/containers/area.rs b/crates/egui/src/containers/area.rs
index 4333cf73a..09488058d 100644
--- a/crates/egui/src/containers/area.rs
+++ b/crates/egui/src/containers/area.rs
@@ -280,7 +280,7 @@ impl Area {
         self
     }
 
-    /// Constrains this area to [`Context::screen_rect`]?
+    /// Constrains this area to [`Context::content_rect`]?
     ///
     /// Default: `true`.
     #[inline]
@@ -291,7 +291,7 @@ impl Area {
 
     /// Constrain the movement of the window to the given rectangle.
     ///
-    /// For instance: `.constrain_to(ctx.screen_rect())`.
+    /// For instance: `.constrain_to(ctx.content_rect())`.
     #[inline]
     pub fn constrain_to(mut self, constrain_rect: Rect) -> Self {
         self.constrain = true;
@@ -516,6 +516,7 @@ impl Area {
             let move_response = ctx.create_widget(
                 WidgetRect {
                     id: interact_id,
+                    parent_id: id,
                     layer_id,
                     rect: state.rect(),
                     interact_rect: state.rect().intersect(constrain_rect),
diff --git a/crates/egui/src/containers/collapsing_header.rs b/crates/egui/src/containers/collapsing_header.rs
index aca8ab138..de3581288 100644
--- a/crates/egui/src/containers/collapsing_header.rs
+++ b/crates/egui/src/containers/collapsing_header.rs
@@ -451,15 +451,6 @@ impl CollapsingHeader {
         self
     }
 
-    /// Explicitly set the source of the [`Id`] of this widget, instead of using title label.
-    /// This is useful if the title label is dynamic or not unique.
-    #[deprecated = "Renamed id_salt"]
-    #[inline]
-    pub fn id_source(mut self, id_salt: impl Hash) -> Self {
-        self.id_salt = Id::new(id_salt);
-        self
-    }
-
     /// If you set this to `false`, the [`CollapsingHeader`] will be grayed out and un-clickable.
     ///
     /// This is a convenience for [`Ui::disable`].
diff --git a/crates/egui/src/containers/combo_box.rs b/crates/egui/src/containers/combo_box.rs
index c4097f803..adbda583c 100644
--- a/crates/egui/src/containers/combo_box.rs
+++ b/crates/egui/src/containers/combo_box.rs
@@ -94,12 +94,6 @@ impl ComboBox {
         }
     }
 
-    /// Without label.
-    #[deprecated = "Renamed from_id_salt"]
-    pub fn from_id_source(id_salt: impl std::hash::Hash) -> Self {
-        Self::from_id_salt(id_salt)
-    }
-
     /// Set the outer width of the button and menu.
     ///
     /// Default is [`Spacing::combo_width`].
diff --git a/crates/egui/src/containers/frame.rs b/crates/egui/src/containers/frame.rs
index d556f827e..5bbce626d 100644
--- a/crates/egui/src/containers/frame.rs
+++ b/crates/egui/src/containers/frame.rs
@@ -174,11 +174,6 @@ impl Frame {
         Self::NONE
     }
 
-    #[deprecated = "Use `Frame::NONE` or `Frame::new()` instead."]
-    pub const fn none() -> Self {
-        Self::NONE
-    }
-
     /// For when you want to group a few widgets together within a frame.
     pub fn group(style: &Style) -> Self {
         Self::new()
@@ -283,16 +278,6 @@ impl Frame {
         self
     }
 
-    /// The rounding of the _outer_ corner of the [`Self::stroke`]
-    /// (or, if there is no stroke, the outer corner of [`Self::fill`]).
-    ///
-    /// In other words, this is the corner radius of the _widget rect_.
-    #[inline]
-    #[deprecated = "Renamed to `corner_radius`"]
-    pub fn rounding(self, corner_radius: impl Into<CornerRadius>) -> Self {
-        self.corner_radius(corner_radius)
-    }
-
     /// Margin outside the painted frame.
     ///
     /// Similar to what is called `margin` in CSS.
diff --git a/crates/egui/src/containers/menu.rs b/crates/egui/src/containers/menu.rs
index 1bd5954c8..d4c95b298 100644
--- a/crates/egui/src/containers/menu.rs
+++ b/crates/egui/src/containers/menu.rs
@@ -10,7 +10,7 @@
 
 use crate::style::StyleModifier;
 use crate::{
-    Button, Color32, Context, Frame, Id, InnerResponse, IntoAtoms, Layout, Popup,
+    Button, Color32, Context, Frame, Id, InnerResponse, IntoAtoms, Layout, PointerButton, Popup,
     PopupCloseBehavior, Response, Style, Ui, UiBuilder, UiKind, UiStack, UiStackInfo, Widget as _,
 };
 use emath::{Align, RectAlign, Vec2, vec2};
@@ -197,7 +197,7 @@ impl MenuState {
 
 /// Horizontal menu bar where you can add [`MenuButton`]s.
 ///
-/// The menu bar goes well in a [`crate::TopBottomPanel::top`],
+/// The menu bar goes well in a [`crate::Panel::top`],
 /// but can also be placed in a [`crate::Window`].
 /// In the latter case you may want to wrap it in [`Frame`].
 ///
@@ -219,9 +219,6 @@ pub struct MenuBar {
     style: StyleModifier,
 }
 
-#[deprecated = "Renamed to `egui::MenuBar`"]
-pub type Bar = MenuBar;
-
 impl Default for MenuBar {
     fn default() -> Self {
         Self {
@@ -458,6 +455,7 @@ impl SubMenu {
 
         let is_any_open = open_item.is_some();
         let mut is_open = open_item == Some(id);
+        let was_open = is_open;
         let mut set_open = None;
 
         // We expand the button rect so there is no empty space where no menu is shown
@@ -470,9 +468,21 @@ impl SubMenu {
         // But since we check if no other menu is open, nothing should be able to cover the button
         let is_hovered = hover_pos.is_some_and(|pos| button_rect.contains(pos));
 
+        // `clicked` includes keyboard and accessibility click actions.
+        // We want Enter/Space to toggle an already open submenu, while pointer clicks should keep
+        // the submenu open (for touch and pointer interactions).
+        let clicked = button_response.clicked();
+        let clicked_by_pointer = button_response.clicked_by(PointerButton::Primary);
+        let clicked_by_keyboard_or_access = clicked && !clicked_by_pointer;
+
+        if ui.is_enabled() && is_open && clicked_by_keyboard_or_access {
+            set_open = Some(false);
+            is_open = false;
+        }
+
         // The clicked handler is there for accessibility (keyboard navigation)
         let should_open =
-            ui.is_enabled() && (button_response.clicked() || (is_hovered && !is_any_open));
+            ui.is_enabled() && ((!was_open && clicked) || (is_hovered && !is_any_open));
         if should_open {
             set_open = Some(true);
             is_open = true;
diff --git a/crates/egui/src/containers/mod.rs b/crates/egui/src/containers/mod.rs
index a8f3306e9..d828ce0f8 100644
--- a/crates/egui/src/containers/mod.rs
+++ b/crates/egui/src/containers/mod.rs
@@ -9,7 +9,6 @@ mod combo_box;
 pub mod frame;
 pub mod menu;
 pub mod modal;
-pub mod old_popup;
 pub mod panel;
 mod popup;
 pub(crate) mod resize;
@@ -26,7 +25,6 @@ pub use {
     combo_box::*,
     frame::Frame,
     modal::{Modal, ModalResponse},
-    old_popup::*,
     panel::*,
     popup::*,
     resize::Resize,
diff --git a/crates/egui/src/containers/old_popup.rs b/crates/egui/src/containers/old_popup.rs
deleted file mode 100644
index f8e7cc900..000000000
--- a/crates/egui/src/containers/old_popup.rs
+++ /dev/null
@@ -1,212 +0,0 @@
-//! Old and deprecated API for popups. Use [`Popup`] instead.
-#![expect(deprecated)]
-
-use crate::containers::tooltip::Tooltip;
-use crate::{
-    Align, Context, Id, LayerId, Layout, Popup, PopupAnchor, PopupCloseBehavior, Pos2, Rect,
-    Response, Ui, Widget as _, WidgetText,
-};
-use emath::RectAlign;
-// ----------------------------------------------------------------------------
-
-/// Show a tooltip at the current pointer position (if any).
-///
-/// Most of the time it is easier to use [`Response::on_hover_ui`].
-///
-/// See also [`show_tooltip_text`].
-///
-/// Returns `None` if the tooltip could not be placed.
-///
-/// ```
-/// # egui::__run_test_ui(|ui| {
-/// # #[expect(deprecated)]
-/// if ui.ui_contains_pointer() {
-///     egui::show_tooltip(ui.ctx(), ui.layer_id(), egui::Id::new("my_tooltip"), |ui| {
-///         ui.label("Helpful text");
-///     });
-/// }
-/// # });
-/// ```
-#[deprecated = "Use `egui::Tooltip` instead"]
-pub fn show_tooltip<R>(
-    ctx: &Context,
-    parent_layer: LayerId,
-    widget_id: Id,
-    add_contents: impl FnOnce(&mut Ui) -> R,
-) -> Option<R> {
-    show_tooltip_at_pointer(ctx, parent_layer, widget_id, add_contents)
-}
-
-/// Show a tooltip at the current pointer position (if any).
-///
-/// Most of the time it is easier to use [`Response::on_hover_ui`].
-///
-/// See also [`show_tooltip_text`].
-///
-/// Returns `None` if the tooltip could not be placed.
-///
-/// ```
-/// # egui::__run_test_ui(|ui| {
-/// if ui.ui_contains_pointer() {
-///     egui::show_tooltip_at_pointer(ui.ctx(), ui.layer_id(), egui::Id::new("my_tooltip"), |ui| {
-///         ui.label("Helpful text");
-///     });
-/// }
-/// # });
-/// ```
-#[deprecated = "Use `egui::Tooltip` instead"]
-pub fn show_tooltip_at_pointer<R>(
-    ctx: &Context,
-    parent_layer: LayerId,
-    widget_id: Id,
-    add_contents: impl FnOnce(&mut Ui) -> R,
-) -> Option<R> {
-    Tooltip::always_open(ctx.clone(), parent_layer, widget_id, PopupAnchor::Pointer)
-        .gap(12.0)
-        .show(add_contents)
-        .map(|response| response.inner)
-}
-
-/// Show a tooltip under the given area.
-///
-/// If the tooltip does not fit under the area, it tries to place it above it instead.
-#[deprecated = "Use `egui::Tooltip` instead"]
-pub fn show_tooltip_for<R>(
-    ctx: &Context,
-    parent_layer: LayerId,
-    widget_id: Id,
-    widget_rect: &Rect,
-    add_contents: impl FnOnce(&mut Ui) -> R,
-) -> Option<R> {
-    Tooltip::always_open(ctx.clone(), parent_layer, widget_id, *widget_rect)
-        .show(add_contents)
-        .map(|response| response.inner)
-}
-
-/// Show a tooltip at the given position.
-///
-/// Returns `None` if the tooltip could not be placed.
-#[deprecated = "Use `egui::Tooltip` instead"]
-pub fn show_tooltip_at<R>(
-    ctx: &Context,
-    parent_layer: LayerId,
-    widget_id: Id,
-    suggested_position: Pos2,
-    add_contents: impl FnOnce(&mut Ui) -> R,
-) -> Option<R> {
-    Tooltip::always_open(ctx.clone(), parent_layer, widget_id, suggested_position)
-        .show(add_contents)
-        .map(|response| response.inner)
-}
-
-/// Show some text at the current pointer position (if any).
-///
-/// Most of the time it is easier to use [`Response::on_hover_text`].
-///
-/// See also [`show_tooltip`].
-///
-/// Returns `None` if the tooltip could not be placed.
-///
-/// ```
-/// # egui::__run_test_ui(|ui| {
-/// if ui.ui_contains_pointer() {
-///     egui::show_tooltip_text(ui.ctx(), ui.layer_id(), egui::Id::new("my_tooltip"), "Helpful text");
-/// }
-/// # });
-/// ```
-#[deprecated = "Use `egui::Tooltip` instead"]
-pub fn show_tooltip_text(
-    ctx: &Context,
-    parent_layer: LayerId,
-    widget_id: Id,
-    text: impl Into<WidgetText>,
-) -> Option<()> {
-    show_tooltip(ctx, parent_layer, widget_id, |ui| {
-        crate::widgets::Label::new(text).ui(ui);
-    })
-}
-
-/// Was this tooltip visible last frame?
-#[deprecated = "Use `Tooltip::was_tooltip_open_last_frame` instead"]
-pub fn was_tooltip_open_last_frame(ctx: &Context, widget_id: Id) -> bool {
-    Tooltip::was_tooltip_open_last_frame(ctx, widget_id)
-}
-
-/// Indicate whether a popup will be shown above or below the box.
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
-pub enum AboveOrBelow {
-    Above,
-    Below,
-}
-
-/// Helper for [`popup_above_or_below_widget`].
-#[deprecated = "Use `egui::Popup` instead"]
-pub fn popup_below_widget<R>(
-    ui: &Ui,
-    popup_id: Id,
-    widget_response: &Response,
-    close_behavior: PopupCloseBehavior,
-    add_contents: impl FnOnce(&mut Ui) -> R,
-) -> Option<R> {
-    popup_above_or_below_widget(
-        ui,
-        popup_id,
-        widget_response,
-        AboveOrBelow::Below,
-        close_behavior,
-        add_contents,
-    )
-}
-
-/// Shows a popup above or below another widget.
-///
-/// Useful for drop-down menus (combo boxes) or suggestion menus under text fields.
-///
-/// The opened popup will have a minimum width matching its parent.
-///
-/// You must open the popup with [`crate::Memory::open_popup`] or  [`crate::Memory::toggle_popup`].
-///
-/// Returns `None` if the popup is not open.
-///
-/// ```
-/// # egui::__run_test_ui(|ui| {
-/// let response = ui.button("Open popup");
-/// let popup_id = ui.make_persistent_id("my_unique_id");
-/// if response.clicked() {
-///     ui.memory_mut(|mem| mem.toggle_popup(popup_id));
-/// }
-/// let below = egui::AboveOrBelow::Below;
-/// let close_on_click_outside = egui::PopupCloseBehavior::CloseOnClickOutside;
-/// # #[expect(deprecated)]
-/// egui::popup_above_or_below_widget(ui, popup_id, &response, below, close_on_click_outside, |ui| {
-///     ui.set_min_width(200.0); // if you want to control the size
-///     ui.label("Some more info, or things you can select:");
-///     ui.label("…");
-/// });
-/// # });
-/// ```
-#[deprecated = "Use `egui::Popup` instead"]
-pub fn popup_above_or_below_widget<R>(
-    _parent_ui: &Ui,
-    popup_id: Id,
-    widget_response: &Response,
-    above_or_below: AboveOrBelow,
-    close_behavior: PopupCloseBehavior,
-    add_contents: impl FnOnce(&mut Ui) -> R,
-) -> Option<R> {
-    let response = Popup::from_response(widget_response)
-        .layout(Layout::top_down_justified(Align::LEFT))
-        .open_memory(None)
-        .close_behavior(close_behavior)
-        .id(popup_id)
-        .align(match above_or_below {
-            AboveOrBelow::Above => RectAlign::TOP_START,
-            AboveOrBelow::Below => RectAlign::BOTTOM_START,
-        })
-        .width(widget_response.rect.width())
-        .show(|ui| {
-            ui.set_min_width(ui.available_width());
-            add_contents(ui)
-        })?;
-    Some(response.inner)
-}
diff --git a/crates/egui/src/containers/panel.rs b/crates/egui/src/containers/panel.rs
index f2a4c3b67..d75a90bf4 100644
--- a/crates/egui/src/containers/panel.rs
+++ b/crates/egui/src/containers/panel.rs
@@ -18,9 +18,8 @@
 use emath::{GuiRounding as _, Pos2};
 
 use crate::{
-    Align, Context, CursorIcon, Frame, Id, InnerResponse, LayerId, Layout, NumExt as _, Rangef,
-    Rect, Sense, Stroke, Ui, UiBuilder, UiKind, UiStackInfo, Vec2, WidgetInfo, WidgetType, lerp,
-    vec2,
+    Align, Context, CursorIcon, Frame, Id, InnerResponse, Layout, NumExt as _, Rangef, Rect, Sense,
+    Stroke, Ui, UiBuilder, UiKind, UiStackInfo, Vec2, lerp, vec2,
 };
 
 fn animate_expansion(ctx: &Context, id: Id, is_expanded: bool) -> f32 {
@@ -451,59 +450,6 @@ impl Panel {
     }
 }
 
-// Deprecated
-impl Panel {
-    #[deprecated = "Renamed default_size"]
-    pub fn default_width(self, default_size: f32) -> Self {
-        self.default_size(default_size)
-    }
-
-    #[deprecated = "Renamed min_size"]
-    pub fn min_width(self, min_size: f32) -> Self {
-        self.min_size(min_size)
-    }
-
-    #[deprecated = "Renamed max_size"]
-    pub fn max_width(self, max_size: f32) -> Self {
-        self.max_size(max_size)
-    }
-
-    #[deprecated = "Renamed size_range"]
-    pub fn width_range(self, size_range: impl Into<Rangef>) -> Self {
-        self.size_range(size_range)
-    }
-
-    #[deprecated = "Renamed exact_size"]
-    pub fn exact_width(self, size: f32) -> Self {
-        self.exact_size(size)
-    }
-
-    #[deprecated = "Renamed default_size"]
-    pub fn default_height(self, default_size: f32) -> Self {
-        self.default_size(default_size)
-    }
-
-    #[deprecated = "Renamed min_size"]
-    pub fn min_height(self, min_size: f32) -> Self {
-        self.min_size(min_size)
-    }
-
-    #[deprecated = "Renamed max_size"]
-    pub fn max_height(self, max_size: f32) -> Self {
-        self.max_size(max_size)
-    }
-
-    #[deprecated = "Renamed size_range"]
-    pub fn height_range(self, size_range: impl Into<Rangef>) -> Self {
-        self.size_range(size_range)
-    }
-
-    #[deprecated = "Renamed exact_size"]
-    pub fn exact_height(self, size: f32) -> Self {
-        self.exact_size(size)
-    }
-}
-
 // Public showing methods
 impl Panel {
     /// Show the panel inside a [`Ui`].
@@ -515,41 +461,6 @@ impl Panel {
         self.show_inside_dyn(ui, Box::new(add_contents))
     }
 
-    /// Show the panel at the top level.
-    #[deprecated = "Use show_inside() instead"]
-    pub fn show<R>(
-        self,
-        ctx: &Context,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> InnerResponse<R> {
-        self.show_dyn(ctx, Box::new(add_contents))
-    }
-
-    /// 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)?;
-
-        if how_expanded < 1.0 {
-            // Show a fake panel in this in-between animation state:
-            animated_panel.show(ctx, |_ui| {});
-            None
-        } else {
-            // Show the real panel:
-            Some(animated_panel.show(ctx, add_contents))
-        }
-    }
-
     /// Show the panel if `is_expanded` is `true`,
     /// otherwise don't show it, but with a nice animation between collapsed and expanded.
     pub fn show_animated_inside<R>(
@@ -561,7 +472,11 @@ impl Panel {
         let how_expanded = animate_expansion(ui.ctx(), self.id.with("animation"), is_expanded);
 
         // Get either the fake or the real panel to animate
-        let animated_panel = self.get_animated_panel(ui.ctx(), is_expanded)?;
+        let Some(animated_panel) = self.get_animated_panel(ui.ctx(), is_expanded) else {
+            // Make sure the ids of the next widgets are the same whether we show the panel or not:
+            ui.skip_ahead_auto_ids(1);
+            return None;
+        };
 
         if how_expanded < 1.0 {
             // Show a fake panel in this in-between animation state:
@@ -573,34 +488,6 @@ 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,
-        collapsed_panel: Self,
-        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
-        let animated_between_panel =
-            Self::get_animated_between_panel(ctx, is_expanded, collapsed_panel, expanded_panel);
-
-        if 0.0 == how_expanded {
-            Some(animated_between_panel.show(ctx, |ui| add_contents(ui, how_expanded)))
-        } else if how_expanded < 1.0 {
-            // Show animation:
-            animated_between_panel.show(ctx, |ui| add_contents(ui, how_expanded));
-            None
-        } else {
-            Some(animated_between_panel.show(ctx, |ui| add_contents(ui, how_expanded)))
-        }
-    }
-
     /// Show either a collapsed or a expanded panel, with a nice animation between.
     pub fn show_animated_between_inside<R>(
         ui: &mut Ui,
@@ -752,59 +639,6 @@ impl Panel {
         inner_response
     }
 
-    /// Show the panel at the top level.
-    fn show_dyn<'c, R>(
-        self,
-        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(
-            ctx.clone(),
-            self.id,
-            UiBuilder::new()
-                .layer_id(LayerId::background())
-                .max_rect(available_rect),
-        );
-        panel_ui.set_clip_rect(ctx.content_rect());
-        panel_ui
-            .response()
-            .widget_info(|| WidgetInfo::new(WidgetType::Panel));
-
-        let inner_response = self.show_inside_dyn(&mut panel_ui, add_contents);
-        let rect = inner_response.response.rect;
-
-        match side {
-            PanelSide::Vertical(side) => match side {
-                VerticalSide::Left => ctx.pass_state_mut(|state| {
-                    state.allocate_left_panel(Rect::from_min_max(available_rect.min, rect.max));
-                }),
-                VerticalSide::Right => ctx.pass_state_mut(|state| {
-                    state.allocate_right_panel(Rect::from_min_max(rect.min, available_rect.max));
-                }),
-            },
-            PanelSide::Horizontal(side) => match side {
-                HorizontalSide::Top => {
-                    ctx.pass_state_mut(|state| {
-                        state.allocate_top_panel(Rect::from_min_max(available_rect.min, rect.max));
-                    });
-                }
-                HorizontalSide::Bottom => {
-                    ctx.pass_state_mut(|state| {
-                        state.allocate_bottom_panel(Rect::from_min_max(
-                            rect.min,
-                            available_rect.max,
-                        ));
-                    });
-                }
-            },
-        }
-        inner_response
-    }
-
     fn prepare_resizable_panel(&self, panel_sizer: &mut PanelSizer<'_>, ui: &Ui) {
         let resize_id = self.id.with("__resize");
         let resize_response = ui.ctx().read_response(resize_id);
@@ -1040,61 +874,9 @@ impl CentralPanel {
 
         response
     }
-
-    /// Show the panel at the top level.
-    #[deprecated = "Use show_inside() instead"]
-    pub fn show<R>(
-        self,
-        ctx: &Context,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> InnerResponse<R> {
-        self.show_dyn(ctx, Box::new(add_contents))
-    }
-
-    /// Show the panel at the top level.
-    fn show_dyn<'c, R>(
-        self,
-        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(
-            ctx.clone(),
-            id,
-            UiBuilder::new()
-                .layer_id(LayerId::background())
-                .max_rect(ctx.available_rect()),
-        );
-        panel_ui.set_clip_rect(ctx.content_rect());
-
-        if false {
-            // TODO(emilk): @lucasmerlin shouldn't we enable this?
-            panel_ui
-                .response()
-                .widget_info(|| WidgetInfo::new(WidgetType::Panel));
-        }
-
-        let inner_response = self.show_inside_dyn(&mut panel_ui, add_contents);
-
-        // Only inform ctx about what we actually used, so we can shrink the native window to fit.
-        ctx.pass_state_mut(|state| state.allocate_central_panel(inner_response.response.rect));
-
-        inner_response
-    }
 }
 
 fn clamp_to_range(x: f32, range: Rangef) -> f32 {
     let range = range.as_positive();
     x.clamp(range.min, range.max)
 }
-
-// ----------------------------------------------------------------------------
-
-#[deprecated = "Use Panel::left or Panel::right instead"]
-pub type SidePanel = super::Panel;
-
-#[deprecated = "Use Panel::top or Panel::bottom instead"]
-pub type TopBottomPanel = super::Panel;
diff --git a/crates/egui/src/containers/popup.rs b/crates/egui/src/containers/popup.rs
index 0fb2a9f2a..cf78a6650 100644
--- a/crates/egui/src/containers/popup.rs
+++ b/crates/egui/src/containers/popup.rs
@@ -1,5 +1,3 @@
-#![expect(deprecated)] // This is a new, safe wrapper around the old `Memory::popup` API.
-
 use std::iter::once;
 
 use emath::{Align, Pos2, Rect, RectAlign, Vec2, vec2};
@@ -87,7 +85,7 @@ pub enum PopupCloseBehavior {
     /// but in the popup's body
     CloseOnClickOutside,
 
-    /// Clicks will be ignored. Popup might be closed manually by calling [`crate::Memory::close_all_popups`]
+    /// Clicks will be ignored. Popup might be closed manually by calling [`Popup::close_all`]
     /// or by pressing the escape button
     IgnoreClicks,
 }
@@ -666,10 +664,6 @@ impl Popup<'_> {
     }
 
     /// Open the given popup and close all others.
-    ///
-    /// If you are NOT using [`Popup::show`], you must
-    /// also call [`crate::Memory::keep_popup_open`] as long as
-    /// you're showing the popup.
     pub fn open_id(ctx: &Context, popup_id: Id) {
         ctx.memory_mut(|mem| mem.open_popup(popup_id));
     }
diff --git a/crates/egui/src/containers/resize.rs b/crates/egui/src/containers/resize.rs
index 7ff943b3f..8dcce6b20 100644
--- a/crates/egui/src/containers/resize.rs
+++ b/crates/egui/src/containers/resize.rs
@@ -69,13 +69,6 @@ impl Resize {
         self
     }
 
-    /// A source for the unique [`Id`], e.g. `.id_source("second_resize_area")` or `.id_source(loop_index)`.
-    #[inline]
-    #[deprecated = "Renamed id_salt"]
-    pub fn id_source(self, id_salt: impl std::hash::Hash) -> Self {
-        self.id_salt(id_salt)
-    }
-
     /// A source for the unique [`Id`], e.g. `.id_salt("second_resize_area")` or `.id_salt(loop_index)`.
     #[inline]
     pub fn id_salt(mut self, id_salt: impl std::hash::Hash) -> Self {
diff --git a/crates/egui/src/containers/scroll_area.rs b/crates/egui/src/containers/scroll_area.rs
index 2616fb414..c0c29a9ab 100644
--- a/crates/egui/src/containers/scroll_area.rs
+++ b/crates/egui/src/containers/scroll_area.rs
@@ -5,7 +5,7 @@
 use std::ops::{Add, AddAssign, BitOr, BitOrAssign};
 
 use emath::GuiRounding as _;
-use epaint::Margin;
+use epaint::{Color32, Direction, Margin, Shape};
 
 use crate::{
     Context, CursorIcon, Id, NumExt as _, Pos2, Rangef, Rect, Response, Sense, Ui, UiBuilder,
@@ -423,13 +423,6 @@ impl ScrollArea {
         self
     }
 
-    /// A source for the unique [`Id`], e.g. `.id_source("second_scroll_area")` or `.id_source(loop_index)`.
-    #[inline]
-    #[deprecated = "Renamed id_salt"]
-    pub fn id_source(self, id_salt: impl std::hash::Hash) -> Self {
-        self.id_salt(id_salt)
-    }
-
     /// A source for the unique [`Id`], e.g. `.id_salt("second_scroll_area")` or `.id_salt(loop_index)`.
     #[inline]
     pub fn id_salt(mut self, id_salt: impl std::hash::Hash) -> Self {
@@ -530,32 +523,6 @@ impl ScrollArea {
     /// This can be used, for example, to optionally freeze scrolling while the user
     /// is typing text in a [`crate::TextEdit`] widget contained within the scroll area.
     ///
-    /// This controls both scrolling directions.
-    #[deprecated = "Use `ScrollArea::scroll_source()"]
-    #[inline]
-    pub fn enable_scrolling(mut self, enable: bool) -> Self {
-        self.scroll_source = if enable {
-            ScrollSource::ALL
-        } else {
-            ScrollSource::NONE
-        };
-        self
-    }
-
-    /// Can the user drag the scroll area to scroll?
-    ///
-    /// This is useful for touch screens.
-    ///
-    /// If `true`, the [`ScrollArea`] will sense drags.
-    ///
-    /// Default: `true`.
-    #[deprecated = "Use `ScrollArea::scroll_source()"]
-    #[inline]
-    pub fn drag_to_scroll(mut self, drag_to_scroll: bool) -> Self {
-        self.scroll_source.drag = drag_to_scroll;
-        self
-    }
-
     /// What sources does the [`ScrollArea`] use for scrolling the contents.
     #[inline]
     pub fn scroll_source(mut self, scroll_source: ScrollSource) -> Self {
@@ -1019,13 +986,17 @@ impl ScrollArea {
             .inner;
 
         let (content_size, state) = prepared.end(ui);
-        ScrollAreaOutput {
+        let output = ScrollAreaOutput {
             inner,
             id,
             state,
             content_size,
             inner_rect,
-        }
+        };
+
+        paint_fade_areas(ui, &output);
+
+        output
     }
 }
 
@@ -1504,3 +1475,88 @@ impl Prepared {
         (content_size, state)
     }
 }
+
+/// Paint fade-out gradients at the top and/or bottom of a scroll area to
+/// indicate that more content is available beyond the visible region.
+fn paint_fade_areas<R>(ui: &Ui, scroll_output: &ScrollAreaOutput<R>) {
+    let crate::style::ScrollFadeStyle {
+        strength,
+        size: fade_size,
+    } = ui.spacing().scroll.fade;
+
+    if strength <= 0.0 {
+        return;
+    }
+
+    let bg = ui.stack().bg_color();
+
+    let offset = scroll_output.state.offset;
+    let overflow = scroll_output.content_size - scroll_output.inner_rect.size();
+
+    let paint_rect = scroll_output
+        .inner_rect
+        .intersect(ui.min_rect())
+        .expand(ui.visuals().clip_rect_margin);
+
+    // Top fade: animate opacity based on how far we've scrolled down.
+    if 0.0 < offset.y {
+        let t = (offset.y / fade_size).clamp(0.0, 1.0) * strength;
+        let bg_faded = bg.gamma_multiply(t);
+        let rect = Rect::from_min_max(
+            paint_rect.left_top(),
+            pos2(paint_rect.right(), paint_rect.top() + fade_size),
+        );
+        ui.painter().add(Shape::gradient_rect(
+            rect,
+            Direction::TopDown,
+            [bg_faded, Color32::TRANSPARENT],
+        ));
+    }
+
+    // Bottom fade: animate opacity based on distance from the bottom.
+    let distance_from_bottom = overflow.y - offset.y;
+    if 0.0 < distance_from_bottom {
+        let t = (distance_from_bottom / fade_size).clamp(0.0, 1.0) * strength;
+        let bg_faded = bg.gamma_multiply(t);
+        let rect = Rect::from_min_max(
+            pos2(paint_rect.left(), paint_rect.bottom() - fade_size),
+            paint_rect.right_bottom(),
+        );
+        ui.painter().add(Shape::gradient_rect(
+            rect,
+            Direction::BottomUp,
+            [bg_faded, Color32::TRANSPARENT],
+        ));
+    }
+
+    // Left fade: animate opacity based on how far we've scrolled right.
+    if 0.0 < offset.x {
+        let t = (offset.x / fade_size).clamp(0.0, 1.0) * strength;
+        let bg_faded = bg.gamma_multiply(t);
+        let rect = Rect::from_min_max(
+            paint_rect.left_top(),
+            pos2(paint_rect.left() + fade_size, paint_rect.bottom()),
+        );
+        ui.painter().add(Shape::gradient_rect(
+            rect,
+            Direction::LeftToRight,
+            [bg_faded, Color32::TRANSPARENT],
+        ));
+    }
+
+    // Right fade: animate opacity based on distance from the right edge.
+    let distance_from_right = overflow.x - offset.x;
+    if 0.0 < distance_from_right {
+        let t = (distance_from_right / fade_size).clamp(0.0, 1.0) * strength;
+        let bg_faded = bg.gamma_multiply(t);
+        let rect = Rect::from_min_max(
+            pos2(paint_rect.right() - fade_size, paint_rect.top()),
+            paint_rect.right_bottom(),
+        );
+        ui.painter().add(Shape::gradient_rect(
+            rect,
+            Direction::RightToLeft,
+            [bg_faded, Color32::TRANSPARENT],
+        ));
+    }
+}
diff --git a/crates/egui/src/containers/tooltip.rs b/crates/egui/src/containers/tooltip.rs
index 78c5a726b..22c319569 100644
--- a/crates/egui/src/containers/tooltip.rs
+++ b/crates/egui/src/containers/tooltip.rs
@@ -16,24 +16,6 @@ pub struct Tooltip<'a> {
 }
 
 impl Tooltip<'_> {
-    /// Show a tooltip that is always open.
-    #[deprecated = "Use `Tooltip::always_open` instead."]
-    pub fn new(
-        parent_widget: Id,
-        ctx: Context,
-        anchor: impl Into<PopupAnchor>,
-        parent_layer: LayerId,
-    ) -> Self {
-        Self {
-            popup: Popup::new(parent_widget, ctx, anchor.into(), parent_layer)
-                .kind(PopupKind::Tooltip)
-                .gap(4.0)
-                .sense(Sense::hover()),
-            parent_layer,
-            parent_widget,
-        }
-    }
-
     /// Show a tooltip that is always open.
     pub fn always_open(
         ctx: Context,
diff --git a/crates/egui/src/containers/window.rs b/crates/egui/src/containers/window.rs
index c6b739589..9f25d6131 100644
--- a/crates/egui/src/containers/window.rs
+++ b/crates/egui/src/containers/window.rs
@@ -262,7 +262,7 @@ impl<'open> Window<'open> {
         self
     }
 
-    /// Constrains this window to [`Context::screen_rect`].
+    /// Constrains this window to [`Context::content_rect`].
     ///
     /// To change the area to constrain to, use [`Self::constrain_to`].
     ///
@@ -275,7 +275,7 @@ impl<'open> Window<'open> {
 
     /// Constrain the movement of the window to the given rectangle.
     ///
-    /// For instance: `.constrain_to(ctx.screen_rect())`.
+    /// For instance: `.constrain_to(ctx.content_rect())`.
     #[inline]
     pub fn constrain_to(mut self, constrain_rect: Rect) -> Self {
         self.area = self.area.constrain_to(constrain_rect);
@@ -427,7 +427,7 @@ impl<'open> Window<'open> {
 
     /// Enable/disable scrolling on the window by dragging with the pointer. `true` by default.
     ///
-    /// See [`ScrollArea::drag_to_scroll`] for more.
+    /// See [`ScrollArea::scroll_source`] for more.
     #[inline]
     pub fn drag_to_scroll(mut self, drag_to_scroll: bool) -> Self {
         self.scroll = self.scroll.scroll_source(ScrollSource {
@@ -673,7 +673,7 @@ impl Window<'_> {
 
                 title_bar.ui(
                     &mut area_content_ui,
-                    &content_response,
+                    content_response.as_ref(),
                     open.as_deref_mut(),
                     &mut collapsing,
                     collapsible,
@@ -962,6 +962,7 @@ fn do_resize_interaction(
             WidgetRect {
                 layer_id,
                 id,
+                parent_id: layer_id.id,
                 rect,
                 interact_rect: rect,
                 sense: Sense::DRAG, // Don't use Sense::drag() since we don't want these to be focusable
@@ -1255,7 +1256,7 @@ impl TitleBar {
     fn ui(
         self,
         ui: &mut Ui,
-        content_response: &Option<Response>,
+        content_response: Option<&Response>,
         open: Option<&mut bool>,
         collapsing: &mut CollapsingState,
         collapsible: bool,
@@ -1299,7 +1300,7 @@ impl TitleBar {
             ui.visuals().text_color(),
         );
 
-        if let Some(content_response) = &content_response {
+        if let Some(content_response) = content_response {
             // Paint separator between title and content:
             let content_rect = content_response.rect;
             if false {
diff --git a/crates/egui/src/context.rs b/crates/egui/src/context.rs
index 3b36150e4..d348517ef 100644
--- a/crates/egui/src/context.rs
+++ b/crates/egui/src/context.rs
@@ -300,7 +300,7 @@ impl RepaintCause {
 struct ViewportRepaintInfo {
     /// Monotonically increasing counter.
     ///
-    /// Incremented at the end of [`Context::run`].
+    /// Incremented at the end of [`Context::run_ui`].
     /// This can be smaller than [`Self::cumulative_pass_nr`],
     /// but never larger.
     cumulative_frame_nr: u64,
@@ -463,7 +463,7 @@ impl ContextImpl {
 
         let content_rect = viewport.input.content_rect();
 
-        viewport.this_pass.begin_pass(content_rect);
+        viewport.this_pass.begin_pass();
 
         {
             let mut layers: Vec<LayerId> = viewport.prev_pass.widgets.layer_ids().collect();
@@ -697,8 +697,8 @@ impl ContextImpl {
 /// // Game loop:
 /// loop {
 ///     let raw_input = egui::RawInput::default();
-///     let full_output = ctx.run(raw_input, |ctx| {
-///         egui::CentralPanel::default().show(&ctx, |ui| {
+///     let full_output = ctx.run_ui(raw_input, |ui| {
+///         egui::CentralPanel::default().show_inside(ui, |ui| {
 ///             ui.label("Hello world!");
 ///             if ui.button("Click me").clicked() {
 ///                 // take some action here
@@ -780,9 +780,6 @@ impl Context {
     /// });
     /// // 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)
@@ -791,60 +788,28 @@ impl Context {
     #[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(
+        self.run_dyn(new_input, &mut |ctx| {
+            let mut root_ui = Ui::new(
                 ctx.clone(),
                 Id::new((ctx.viewport_id(), "__top_ui")),
                 UiBuilder::new()
                     .layer_id(LayerId::background())
-                    .max_rect(ctx.available_rect()),
+                    .max_rect(ctx.viewport_rect()),
             );
 
             {
-                plugins.on_begin_pass(&mut top_ui);
-                run_ui(&mut top_ui);
-                plugins.on_end_pass(&mut top_ui);
+                plugins.on_begin_pass(&mut root_ui);
+                run_ui(&mut root_ui);
+                plugins.on_end_pass(&mut root_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()));
+            ctx.pass_state_mut(|state| {
+                state.root_ui_available_rect = Some(root_ui.available_rect_before_wrap());
+                state.root_ui_min_rect = Some(root_ui.min_rect());
+            });
         })
     }
 
-    /// 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.
-    ///
-    /// Put your widgets into a [`crate::Panel`], [`crate::CentralPanel`], [`crate::Window`] or [`crate::Area`].
-    ///
-    /// Instead of calling `run`, 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(input, |ctx| {
-    ///     egui::CentralPanel::default().show(&ctx, |ui| {
-    ///         ui.label("Hello egui!");
-    ///     });
-    /// });
-    /// // handle full_output
-    /// ```
-    ///
-    /// ## See also
-    /// * [`Self::run_ui`]
-    #[must_use]
-    #[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!();
@@ -914,10 +879,10 @@ impl Context {
         output
     }
 
-    /// An alternative to calling [`Self::run`].
+    /// An alternative to calling [`Self::run_ui`].
     ///
-    /// It is usually better to use [`Self::run`], because
-    /// `run` supports multi-pass layout using [`Self::request_discard`].
+    /// It is usually better to use [`Self::run_ui`], because
+    /// `run_ui` supports multi-pass layout using [`Self::request_discard`].
     ///
     /// ```
     /// // One egui context that you keep reusing:
@@ -927,9 +892,7 @@ impl Context {
     /// let input = egui::RawInput::default();
     /// ctx.begin_pass(input);
     ///
-    /// egui::CentralPanel::default().show(&ctx, |ui| {
-    ///     ui.label("Hello egui!");
-    /// });
+    /// // … add panels and windows here …
     ///
     /// let full_output = ctx.end_pass();
     /// // handle full_output
@@ -942,12 +905,6 @@ impl Context {
 
         self.write(|ctx| ctx.begin_pass(new_input));
     }
-
-    /// See [`Self::begin_pass`].
-    #[deprecated = "Renamed begin_pass"]
-    pub fn begin_frame(&self, new_input: RawInput) {
-        self.begin_pass(new_input);
-    }
 }
 
 /// ## Borrows parts of [`Context`]
@@ -1048,7 +1005,7 @@ impl Context {
 
     /// Read-only access to [`PassState`].
     ///
-    /// This is only valid during the call to [`Self::run`] (between [`Self::begin_pass`] and [`Self::end_pass`]).
+    /// This is only valid during the call to [`Self::run_ui`] (between [`Self::begin_pass`] and [`Self::end_pass`]).
     #[inline]
     pub(crate) fn pass_state<R>(&self, reader: impl FnOnce(&PassState) -> R) -> R {
         self.write(move |ctx| reader(&ctx.viewport().this_pass))
@@ -1056,7 +1013,7 @@ impl Context {
 
     /// Read-write access to [`PassState`].
     ///
-    /// This is only valid during the call to [`Self::run`] (between [`Self::begin_pass`] and [`Self::end_pass`]).
+    /// This is only valid during the call to [`Self::run_ui`] (between [`Self::begin_pass`] and [`Self::end_pass`]).
     #[inline]
     pub(crate) fn pass_state_mut<R>(&self, writer: impl FnOnce(&mut PassState) -> R) -> R {
         self.write(move |ctx| writer(&mut ctx.viewport().this_pass))
@@ -1072,7 +1029,7 @@ impl Context {
 
     /// Read-only access to [`Fonts`].
     ///
-    /// Not valid until first call to [`Context::run()`].
+    /// Not valid until first call to [`Context::run_ui()`].
     /// That's because since we don't know the proper `pixels_per_point` until then.
     #[inline]
     pub fn fonts<R>(&self, reader: impl FnOnce(&FontsView<'_>) -> R) -> R {
@@ -1089,7 +1046,7 @@ impl Context {
 
     /// Read-write access to [`Fonts`].
     ///
-    /// Not valid until first call to [`Context::run()`].
+    /// Not valid until first call to [`Context::run_ui()`].
     /// That's because since we don't know the proper `pixels_per_point` until then.
     #[inline]
     pub fn fonts_mut<R>(&self, reader: impl FnOnce(&mut FontsView<'_>) -> R) -> R {
@@ -1360,6 +1317,7 @@ impl Context {
 
         let WidgetRect {
             id,
+            parent_id: _,
             layer_id,
             rect,
             interact_rect,
@@ -1378,8 +1336,8 @@ impl Context {
             interact_rect,
             sense,
             flags: Flags::empty(),
-            interact_pointer_pos: None,
-            intrinsic_size: None,
+            interact_pointer_pos_or_nan: Pos2::NAN,
+            intrinsic_size_or_nan: Vec2::NAN,
         };
 
         res.flags.set(Flags::ENABLED, enabled);
@@ -1470,14 +1428,11 @@ impl Context {
                 || res.long_touched()
                 || clicked
                 || res.drag_stopped();
-            if is_interacted_with {
-                res.interact_pointer_pos = input.pointer.interact_pos();
-                if let (Some(to_global), Some(pos)) = (
-                    memory.to_global.get(&res.layer_id),
-                    &mut res.interact_pointer_pos,
-                ) {
-                    *pos = to_global.inverse() * *pos;
+            if is_interacted_with && let Some(mut pos) = input.pointer.interact_pos() {
+                if let Some(to_global) = memory.to_global.get(&res.layer_id) {
+                    pos = to_global.inverse() * pos;
                 }
+                res.interact_pointer_pos_or_nan = pos;
             }
 
             if input.pointer.any_down() && !is_interacted_with {
@@ -1547,6 +1502,11 @@ impl Context {
         crate::debug_text::print(self, text);
     }
 
+    /// Current time in seconds, relative to some unknown epoch.
+    pub fn time(&self) -> f64 {
+        self.input(|i| i.time)
+    }
+
     /// What operating system are we running on?
     ///
     /// When compiling natively, this is
@@ -1662,7 +1622,7 @@ impl Context {
 
     /// The total number of completed frames.
     ///
-    /// Starts at zero, and is incremented once at the end of each call to [`Self::run`].
+    /// Starts at zero, and is incremented once at the end of each call to [`Self::run_ui`].
     ///
     /// This is always smaller or equal to [`Self::cumulative_pass_nr`].
     pub fn cumulative_frame_nr(&self) -> u64 {
@@ -1671,7 +1631,7 @@ impl Context {
 
     /// The total number of completed frames.
     ///
-    /// Starts at zero, and is incremented once at the end of each call to [`Self::run`].
+    /// Starts at zero, and is incremented once at the end of each call to [`Self::run_ui`].
     ///
     /// This is always smaller or equal to [`Self::cumulative_pass_nr_for`].
     pub fn cumulative_frame_nr_for(&self, id: ViewportId) -> u64 {
@@ -1691,7 +1651,7 @@ impl Context {
 
     /// The total number of completed passes (usually there is one pass per rendered frame).
     ///
-    /// Starts at zero, and is incremented for each completed pass inside of [`Self::run`] (usually once).
+    /// Starts at zero, and is incremented for each completed pass inside of [`Self::run_ui`] (usually once).
     ///
     /// If you instead want to know which pass index this is within the current frame,
     /// use [`Self::current_pass_index`].
@@ -1701,7 +1661,7 @@ impl Context {
 
     /// The total number of completed passes (usually there is one pass per rendered frame).
     ///
-    /// Starts at zero, and is incremented for each completed pass inside of [`Self::run`] (usually once).
+    /// Starts at zero, and is incremented for each completed pass inside of [`Self::run_ui`] (usually once).
     pub fn cumulative_pass_nr_for(&self, id: ViewportId) -> u64 {
         self.read(|ctx| {
             ctx.viewports
@@ -1935,7 +1895,7 @@ impl Context {
     }
 }
 
-/// Callbacks
+/// Plugins
 impl Context {
     /// Call the given callback at the start of each pass of each viewport.
     ///
@@ -2076,7 +2036,7 @@ impl Context {
         self.options(|opt| opt.theme())
     }
 
-    /// The [`Theme`] used to select between dark and light [`Self::style`]
+    /// The [`Theme`] used to select between dark and light [`Self::global_style`]
     /// as the active style used by all subsequent popups, menus, etc.
     ///
     /// Example:
@@ -2093,12 +2053,6 @@ impl Context {
         self.options(|opt| Arc::clone(opt.style()))
     }
 
-    /// 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.
     ///
@@ -2113,21 +2067,6 @@ impl Context {
         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 popups, menus, etc.
     ///
     /// Use [`Self::all_styles_mut`] to mutate both dark and light mode styles.
@@ -2139,18 +2078,6 @@ impl Context {
         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 popups, menus, etc. in both dark and light mode.
     ///
     /// Example:
@@ -2397,6 +2324,12 @@ impl Context {
             crate::gui_zoom::zoom_with_keyboard(self);
         }
 
+        for shortcut in self.options(|o| o.quit_shortcuts.clone()) {
+            if self.input_mut(|i| i.consume_shortcut(&shortcut)) {
+                self.send_viewport_cmd(ViewportCommand::Close);
+            }
+        }
+
         #[cfg(debug_assertions)]
         self.debug_painting();
 
@@ -2408,17 +2341,11 @@ impl Context {
         output
     }
 
-    /// Call at the end of each frame if you called [`Context::begin_pass`].
-    #[must_use]
-    #[deprecated = "Renamed end_pass"]
-    pub fn end_frame(&self) -> FullOutput {
-        self.end_pass()
-    }
-
     /// Called at the end of the pass.
     #[cfg(debug_assertions)]
     fn debug_painting(&self) {
         #![expect(clippy::iter_over_hash_type)] // ok to be sloppy in debug painting
+        use std::fmt::Write as _;
 
         let paint_widget = |widget: &WidgetRect, text: &str, color: Color32| {
             let rect = widget.interact_rect;
@@ -2491,13 +2418,17 @@ impl Context {
                     for id in contains_pointer {
                         let mut widget_text = format!("{id:?}");
                         if let Some(rect) = widget_rects.get(id) {
-                            widget_text +=
-                                &format!(" {:?} {:?} {:?}", rect.layer_id, rect.rect, rect.sense);
+                            write!(
+                                widget_text,
+                                " {:?} {:?} {:?}",
+                                rect.layer_id, rect.rect, rect.sense
+                            )
+                            .ok();
                         }
                         if let Some(info) = widget_rects.info(id) {
-                            widget_text += &format!(" {info:?}");
+                            write!(widget_text, " {info:?}").ok();
                         }
-                        debug_text += &format!("{widget_text}\n");
+                        writeln!(debug_text, "{widget_text}").ok();
                     }
                     self.debug_text(debug_text);
                 }
@@ -2562,7 +2493,7 @@ impl Context {
             );
             self.viewport(|vp| {
                 for reason in &vp.output.request_discard_reasons {
-                    warning += &format!("\n  {reason}");
+                    write!(warning, "\n  {reason}").ok();
                 }
             });
 
@@ -2597,6 +2528,12 @@ impl ContextImpl {
 
         let mut platform_output: PlatformOutput = std::mem::take(&mut viewport.output);
 
+        if self.memory.should_interrupt_ime()
+            && let Some(ime) = &mut platform_output.ime
+        {
+            ime.should_interrupt_composition = true;
+        }
+
         {
             profiling::scope!("accesskit");
             let state = viewport.this_pass.accesskit_state.take();
@@ -2636,6 +2573,19 @@ impl ContextImpl {
             }
         }
 
+        #[cfg(debug_assertions)]
+        let shapes = if self.memory.options.style().debug.warn_if_rect_changes_id {
+            let mut shapes = shapes;
+            warn_if_rect_changes_id(
+                &mut shapes,
+                &viewport.prev_pass.widgets,
+                &viewport.this_pass.widgets,
+            );
+            shapes
+        } else {
+            shapes
+        };
+
         std::mem::swap(&mut viewport.prev_pass, &mut viewport.this_pass);
 
         if repaint_needed {
@@ -2815,24 +2765,14 @@ impl Context {
         self.input(|i| i.viewport_rect()).round_ui()
     }
 
-    /// Position and size of the egui area.
-    #[deprecated(
-        note = "screen_rect has been split into viewport_rect() and content_rect(). You likely should use content_rect()"
-    )]
-    pub fn screen_rect(&self) -> Rect {
-        self.input(|i| i.content_rect()).round_ui()
-    }
-
-    /// 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 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;
+            let viewport = ctx.viewport();
+            let root_ui_min_rect =
+                (viewport.this_pass.root_ui_min_rect).or(viewport.prev_pass.root_ui_min_rect);
+
+            let mut used = root_ui_min_rect.unwrap_or(Rect::NOTHING);
             for (_id, window) in ctx.memory.areas().visible_windows() {
                 used |= window.rect();
             }
@@ -2840,46 +2780,33 @@ impl Context {
         })
     }
 
-    /// 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.globally_used_rect().max - Pos2::ZERO).round_ui()
-    }
-
     // ---------------------------------------------------------------------
 
     /// Is the pointer (mouse/touch) over any egui area?
     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) {
-                if layer.order == Order::Background {
-                    !self.pass_state(|state| state.unused_rect.contains(pointer_pos))
-                } else {
-                    true
-                }
+        let Some(pointer_pos) = pointer_pos else {
+            return false;
+        };
+        let Some(layer) = self.layer_id_at(pointer_pos) else {
+            return false;
+        };
+        if layer.order == Order::Background {
+            let root_ui_available_rect = self
+                .pass_state(|state| state.root_ui_available_rect)
+                .or_else(|| self.prev_pass_state(|state| state.root_ui_available_rect));
+
+            if let Some(root_ui_available_rect) = root_ui_available_rect {
+                // Modern `run_ui` code
+                !root_ui_available_rect.contains(pointer_pos)
             } else {
-                false
+                true // We shouldn't get here, but who knows
             }
         } else {
-            false
+            true
         }
     }
 
-    /// 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.
@@ -2891,17 +2818,6 @@ impl Context {
             || (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.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.
@@ -2909,23 +2825,18 @@ impl Context {
         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 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()
+    /// Is the currently focused widget a text edit?
+    pub fn text_edit_focused(&self) -> bool {
+        if let Some(id) = self.memory(|mem| mem.focused()) {
+            crate::text_edit::TextEditState::load(self, id).is_some()
+        } else {
+            false
+        }
     }
 
     /// Highlight this widget, to make it look like it is hovered, even if it isn't.
@@ -2938,18 +2849,6 @@ impl Context {
         self.pass_state_mut(|fs| fs.highlight_next_pass.insert(id));
     }
 
-    /// Is an egui context menu open?
-    ///
-    /// This only works with the old, deprecated [`crate::menu`] API.
-    #[expect(deprecated)]
-    #[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())
-                .is_some_and(|state| state.has_root())
-        })
-    }
-
     /// Is a popup or (context) menu open?
     ///
     /// Will return false for [`crate::Tooltip`]s (which are technically popups as well).
@@ -2960,18 +2859,6 @@ impl Context {
                 .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
-                .values()
-                .any(|layer| !layer.open_popups.is_empty())
-        })
-    }
 }
 
 // Ergonomic methods to forward some calls often used in 'if let' without holding the borrow
@@ -3586,17 +3473,6 @@ impl Context {
             }
         });
 
-        #[expect(deprecated)]
-        ui.horizontal(|ui| {
-            ui.label(format!(
-                "{} menu bars",
-                self.data(|d| d.count::<crate::menu::BarState>())
-            ));
-            if ui.button("Reset").clicked() {
-                self.data_mut(|d| d.remove_by_type::<crate::menu::BarState>());
-            }
-        });
-
         ui.horizontal(|ui| {
             ui.label(format!(
                 "{} scroll areas",
@@ -3949,8 +3825,8 @@ impl Context {
     /// When called, the integration needs to:
     /// * Check if there already is a window for this viewport id, and if not open one
     /// * Set the window attributes (position, size, …) based on [`ImmediateViewport::builder`].
-    /// * Call [`Context::run`] with [`ImmediateViewport::viewport_ui_cb`].
-    /// * Handle the output from [`Context::run`], including rendering
+    /// * Call [`Context::run_ui`] with [`ImmediateViewport::viewport_ui_cb`].
+    /// * Handle the output from [`Context::run_ui`], including rendering
     pub fn set_immediate_viewport_renderer(
         callback: impl for<'a> Fn(&Self, ImmediateViewport<'a>) + 'static,
     ) {
@@ -4237,6 +4113,112 @@ fn context_impl_send_sync() {
     assert_send_sync::<Context>();
 }
 
+/// Check if any [`Rect`] appears with different [`Id`]s between two passes.
+///
+/// This helps detect cases where the same screen area is claimed by different widget ids
+/// across passes, which is often a sign of id instability.
+#[cfg(debug_assertions)]
+fn warn_if_rect_changes_id(
+    out_shapes: &mut Vec<ClippedShape>,
+    prev_widgets: &crate::WidgetRects,
+    new_widgets: &crate::WidgetRects,
+) {
+    profiling::function_scope!();
+
+    use std::collections::BTreeMap;
+
+    /// A wrapper around [`Rect`] that implements [`Ord`] using the bit representation of its floats.
+    #[derive(Clone, Copy, PartialEq, Eq)]
+    struct OrderedRect(Rect);
+
+    impl PartialOrd for OrderedRect {
+        fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+            Some(self.cmp(other))
+        }
+    }
+
+    impl Ord for OrderedRect {
+        fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+            let lhs = self.0;
+            let rhs = other.0;
+            lhs.min
+                .x
+                .to_bits()
+                .cmp(&rhs.min.x.to_bits())
+                .then(lhs.min.y.to_bits().cmp(&rhs.min.y.to_bits()))
+                .then(lhs.max.x.to_bits().cmp(&rhs.max.x.to_bits()))
+                .then(lhs.max.y.to_bits().cmp(&rhs.max.y.to_bits()))
+        }
+    }
+
+    fn create_lookup<'a>(
+        widgets: impl Iterator<Item = &'a WidgetRect>,
+    ) -> BTreeMap<OrderedRect, Vec<&'a WidgetRect>> {
+        let mut lookup: BTreeMap<OrderedRect, Vec<&'a WidgetRect>> = BTreeMap::default();
+        for w in widgets {
+            lookup.entry(OrderedRect(w.rect)).or_default().push(w);
+        }
+        lookup
+    }
+
+    for (layer_id, new_layer_widgets) in new_widgets.layers() {
+        let prev = create_lookup(prev_widgets.get_layer(*layer_id));
+        let new = create_lookup(new_layer_widgets.iter());
+
+        for (hashable_rect, new_at_rect) in new {
+            let Some(prev_at_rect) = prev.get(&hashable_rect) else {
+                continue; // this rect did not exist in the previous pass
+            };
+
+            if prev_at_rect
+                .iter()
+                .any(|w| new_at_rect.iter().any(|nw| nw.id == w.id))
+            {
+                continue; // at least one id stayed the same, so this is not an id change
+            }
+
+            // Only warn if at least one of the previous ids is gone from this layer entirely.
+            // If they all still exist (just at a different rect), then the rect match
+            // is just a coincidence caused by widgets shifting (e.g. a window being dragged).
+            if prev_at_rect.iter().all(|w| new_widgets.contains(w.id)) {
+                continue;
+            }
+
+            // Only warn if at least one widget has the same parent_id in both frames.
+            // If all parent_ids changed too, this is a cascading id shift, not a widget bug.
+            if !prev_at_rect
+                .iter()
+                .any(|pw| new_at_rect.iter().any(|nw| nw.parent_id == pw.parent_id))
+            {
+                continue;
+            }
+
+            let rect = new_at_rect[0].rect;
+
+            log::warn!(
+                "Widget rect {rect:?} changed id between passes: prev ids: {:?}, new ids: {:?}",
+                prev_at_rect
+                    .iter()
+                    .map(|w| w.id.short_debug_format())
+                    .collect::<Vec<_>>(),
+                new_at_rect
+                    .iter()
+                    .map(|w| w.id.short_debug_format())
+                    .collect::<Vec<_>>(),
+            );
+            out_shapes.push(ClippedShape {
+                clip_rect: Rect::EVERYTHING,
+                shape: epaint::Shape::rect_stroke(
+                    rect,
+                    0,
+                    (2.0, Color32::RED),
+                    StrokeKind::Outside,
+                ),
+            });
+        }
+    }
+}
+
 #[cfg(test)]
 mod test {
     use super::Context;
diff --git a/crates/egui/src/data/input.rs b/crates/egui/src/data/input.rs
index a52d40233..2a6e4411e 100644
--- a/crates/egui/src/data/input.rs
+++ b/crates/egui/src/data/input.rs
@@ -12,7 +12,7 @@ use crate::{
 /// Set the values that make sense, leave the rest at their `Default::default()`.
 ///
 /// You can check if `egui` is using the inputs using
-/// [`crate::Context::wants_pointer_input`] and [`crate::Context::wants_keyboard_input`].
+/// [`crate::Context::egui_wants_pointer_input`] and [`crate::Context::egui_wants_keyboard_input`].
 ///
 /// All coordinates are in points (logical pixels) with origin (0, 0) in the top left .corner.
 ///
@@ -64,8 +64,8 @@ pub struct RawInput {
     /// In-order events received this frame.
     ///
     /// There is currently no way to know if egui handles a particular event,
-    /// but you can check if egui is using the keyboard with [`crate::Context::wants_keyboard_input`]
-    /// and/or the pointer (mouse/touch) with [`crate::Context::is_using_pointer`].
+    /// but you can check if egui is using the keyboard with [`crate::Context::egui_wants_keyboard_input`]
+    /// and/or the pointer (mouse/touch) with [`crate::Context::egui_is_using_pointer`].
     pub events: Vec<Event>,
 
     /// Dragged files hovering over egui.
@@ -376,12 +376,14 @@ impl ViewportInfo {
             ui.label(opt_as_str(&visible));
             ui.end_row();
 
+            #[expect(clippy::ref_option)]
             fn opt_rect_as_string(v: &Option<Rect>) -> String {
                 v.as_ref().map_or(String::new(), |r| {
                     format!("Pos: {:?}, size: {:?}", r.min, r.size())
                 })
             }
 
+            #[expect(clippy::ref_option)]
             fn opt_as_str<T: std::fmt::Debug>(v: &Option<T>) -> String {
                 v.as_ref().map_or(String::new(), |v| format!("{v:?}"))
             }
@@ -441,6 +443,10 @@ pub enum Event {
     Text(String),
 
     /// A key was pressed or released.
+    ///
+    /// ## Note for integration authors
+    ///
+    /// Key events that has been processed by IMEs should not be sent to `egui`.
     Key {
         /// Most of the time, it's the logical key, heeding the active keymap -- for instance, if the user has Dvorak
         /// keyboard layout, it will be taken into account.
@@ -599,15 +605,22 @@ pub enum Event {
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub enum ImeEvent {
     /// Notifies when the IME was enabled.
+    #[deprecated = "No longer used by egui"]
     Enabled,
 
     /// A new IME candidate is being suggested.
+    ///
+    /// An empty preedit string indicates that the IME has been dismissed, while
+    /// a non-empty preedit string indicates that the IME is active.
     Preedit(String),
 
     /// IME composition ended with this final result.
+    ///
+    /// The IME is considered dismissed after this event.
     Commit(String),
 
     /// Notifies when the IME was disabled.
+    #[deprecated = "No longer used by egui"]
     Disabled,
 }
 
diff --git a/crates/egui/src/data/output.rs b/crates/egui/src/data/output.rs
index 2d2c74430..c3a4cf382 100644
--- a/crates/egui/src/data/output.rs
+++ b/crates/egui/src/data/output.rs
@@ -2,7 +2,7 @@
 
 use crate::{OrderedViewportIdMap, RepaintCause, ViewportOutput, WidgetType};
 
-/// What egui emits each frame from [`crate::Context::run`].
+/// What egui emits each frame from [`crate::Context::run_ui`].
 ///
 /// The backend should use this.
 #[derive(Clone, Default)]
@@ -79,6 +79,9 @@ pub struct IMEOutput {
     ///
     /// This is a very thin rectangle.
     pub cursor_rect: crate::Rect,
+
+    /// Whether any ongoing IME composition should be interrupted.
+    pub should_interrupt_composition: bool,
 }
 
 /// Commands that the egui integration should execute at the end of a frame.
@@ -123,6 +126,9 @@ pub struct PlatformOutput {
     /// This is set if, and only if, the user is currently editing text.
     ///
     /// Useful for IME.
+    ///
+    /// This field should only be set by the widget that currently owns IME
+    /// events (see [`crate::Memory::owns_ime_events`]).
     pub ime: Option<IMEOutput>,
 
     /// The difference in the widget tree since last frame.
diff --git a/crates/egui/src/hit_test.rs b/crates/egui/src/hit_test.rs
index 8fe962b36..077baa183 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, Sense, WidgetRect, WidgetRects, ahash, emath, id::IdSet};
+use crate::{LayerId, Pos2, Sense, WidgetRect, WidgetRects, emath, id::IdSet};
 
 /// Result of a hit-test against [`WidgetRects`].
 ///
@@ -450,6 +450,7 @@ mod tests {
     fn wr(id: Id, sense: Sense, rect: Rect) -> WidgetRect {
         WidgetRect {
             id,
+            parent_id: Id::NULL,
             layer_id: LayerId::background(),
             rect,
             interact_rect: rect,
diff --git a/crates/egui/src/input_state/mod.rs b/crates/egui/src/input_state/mod.rs
index b32a75c57..dc07ffeb7 100644
--- a/crates/egui/src/input_state/mod.rs
+++ b/crates/egui/src/input_state/mod.rs
@@ -209,7 +209,7 @@ impl InputOptions {
 /// You can access this with [`crate::Context::input`].
 ///
 /// You can check if `egui` is using the inputs using
-/// [`crate::Context::wants_pointer_input`] and [`crate::Context::wants_keyboard_input`].
+/// [`crate::Context::egui_wants_pointer_input`] and [`crate::Context::egui_wants_keyboard_input`].
 #[derive(Clone, Debug)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct InputState {
@@ -522,14 +522,6 @@ impl InputState {
         self.viewport_rect
     }
 
-    /// Position and size of the egui area.
-    #[deprecated(
-        note = "screen_rect has been split into viewport_rect() and content_rect(). You likely should use content_rect()"
-    )]
-    pub fn screen_rect(&self) -> Rect {
-        self.content_rect()
-    }
-
     /// Get the safe area insets.
     ///
     /// This represents the area of the screen covered by status bars, navigation controls, notches,
diff --git a/crates/egui/src/layers.rs b/crates/egui/src/layers.rs
index 96ce46489..6fa9274ee 100644
--- a/crates/egui/src/layers.rs
+++ b/crates/egui/src/layers.rs
@@ -1,7 +1,7 @@
 //! Handles paint layers, i.e. how things
 //! are sometimes painted behind or in front of other things.
 
-use crate::{Id, IdMap, Rect, ahash, epaint};
+use crate::{Id, IdMap, Rect, epaint};
 use epaint::{ClippedShape, Shape, emath::TSTransform};
 
 /// Different layer categories
@@ -86,12 +86,6 @@ impl LayerId {
         }
     }
 
-    #[inline(always)]
-    #[deprecated = "Use `Memory::allows_interaction` instead"]
-    pub fn allow_interaction(&self) -> bool {
-        self.order.allow_interaction()
-    }
-
     /// Short and readable summary
     pub fn short_debug_format(&self) -> String {
         format!(
diff --git a/crates/egui/src/layout.rs b/crates/egui/src/layout.rs
index c44c928bb..c97652e8d 100644
--- a/crates/egui/src/layout.rs
+++ b/crates/egui/src/layout.rs
@@ -1,7 +1,7 @@
 use emath::GuiRounding as _;
 
 use crate::{
-    Align,
+    Align, Direction,
     emath::{Align2, NumExt as _, Pos2, Rect, Vec2, pos2, vec2},
 };
 const INFINITY: f32 = f32::INFINITY;
@@ -87,36 +87,6 @@ impl Region {
 
 // ----------------------------------------------------------------------------
 
-/// Layout direction, one of [`LeftToRight`](Direction::LeftToRight), [`RightToLeft`](Direction::RightToLeft), [`TopDown`](Direction::TopDown), [`BottomUp`](Direction::BottomUp).
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
-pub enum Direction {
-    LeftToRight,
-    RightToLeft,
-    TopDown,
-    BottomUp,
-}
-
-impl Direction {
-    #[inline(always)]
-    pub fn is_horizontal(self) -> bool {
-        match self {
-            Self::LeftToRight | Self::RightToLeft => true,
-            Self::TopDown | Self::BottomUp => false,
-        }
-    }
-
-    #[inline(always)]
-    pub fn is_vertical(self) -> bool {
-        match self {
-            Self::LeftToRight | Self::RightToLeft => false,
-            Self::TopDown | Self::BottomUp => true,
-        }
-    }
-}
-
-// ----------------------------------------------------------------------------
-
 /// The layout of a [`Ui`][`crate::Ui`], e.g. "vertical & centered".
 ///
 /// ```
@@ -623,12 +593,24 @@ impl Layout {
         if (self.is_vertical() && self.horizontal_align() == Align::Center)
             || self.horizontal_justify()
         {
-            frame_size.x = frame_size.x.max(available_rect.width()); // fill full width
+            // For wrapping layouts, fill the current column width, not the entire layout width.
+            let width = if self.main_wrap {
+                region.cursor.width()
+            } else {
+                available_rect.width()
+            };
+            frame_size.x = frame_size.x.max(width); // fill full width
         }
         if (self.is_horizontal() && self.vertical_align() == Align::Center)
             || self.vertical_justify()
         {
-            frame_size.y = frame_size.y.max(available_rect.height()); // fill full height
+            // For wrapping layouts, fill the current row height, not the entire layout height.
+            let height = if self.main_wrap {
+                region.cursor.height()
+            } else {
+                available_rect.height()
+            };
+            frame_size.y = frame_size.y.max(height); // fill full height
         }
 
         let align2 = match self.main_dir {
@@ -791,14 +773,14 @@ impl Layout {
                     let new_top = region.cursor.bottom() + spacing.y;
                     region.cursor = Rect::from_min_max(
                         pos2(region.max_rect.left(), new_top),
-                        pos2(INFINITY, new_top + region.cursor.height()),
+                        pos2(INFINITY, new_top),
                     );
                 }
                 Direction::RightToLeft => {
                     let new_top = region.cursor.bottom() + spacing.y;
                     region.cursor = Rect::from_min_max(
                         pos2(-INFINITY, new_top),
-                        pos2(region.max_rect.right(), new_top + region.cursor.height()),
+                        pos2(region.max_rect.right(), new_top),
                     );
                 }
                 Direction::TopDown | Direction::BottomUp => {}
diff --git a/crates/egui/src/lib.rs b/crates/egui/src/lib.rs
index d86851a1d..f88372efd 100644
--- a/crates/egui/src/lib.rs
+++ b/crates/egui/src/lib.rs
@@ -112,8 +112,8 @@
 //! loop {
 //!     let raw_input: egui::RawInput = gather_input();
 //!
-//!     let full_output = ctx.run(raw_input, |ctx| {
-//!         egui::CentralPanel::default().show(&ctx, |ui| {
+//!     let full_output = ctx.run_ui(raw_input, |ui| {
+//!         egui::CentralPanel::default().show_inside(ui, |ui| {
 //!             ui.label("Hello world!");
 //!             if ui.button("Click me").clicked() {
 //!                 // take some action here
@@ -407,8 +407,6 @@ pub mod layers;
 mod layout;
 pub mod load;
 mod memory;
-#[deprecated = "Use `egui::containers::menu` instead"]
-pub mod menu;
 pub mod os;
 mod painter;
 mod pass_state;
@@ -434,9 +432,6 @@ mod callstack;
 
 pub use accesskit;
 
-#[deprecated = "Use the ahash crate directly."]
-pub use ahash;
-
 pub use epaint;
 pub use epaint::ecolor;
 pub use epaint::emath;
@@ -449,7 +444,7 @@ pub use emath::{
     remap_clamp, vec2,
 };
 pub use epaint::{
-    ClippedPrimitive, ColorImage, CornerRadius, ImageData, Margin, Mesh, PaintCallback,
+    ClippedPrimitive, ColorImage, CornerRadius, Direction, ImageData, Margin, Mesh, PaintCallback,
     PaintCallbackInfo, Shadow, Shape, Stroke, StrokeKind, TextureHandle, TextureId, mutex,
     text::{FontData, FontDefinitions, FontFamily, FontId, FontTweak},
     textures::{TextureFilter, TextureOptions, TextureWrapMode, TexturesDelta},
@@ -458,8 +453,8 @@ pub use epaint::{
 pub mod text {
     pub use crate::text_selection::CCursorRange;
     pub use epaint::text::{
-        FontData, FontDefinitions, FontFamily, Fonts, Galley, LayoutJob, LayoutSection, TAB_SIZE,
-        TextFormat, TextWrapping, cursor::CCursor,
+        FontData, FontDefinitions, FontFamily, Fonts, Galley, LayoutJob, LayoutSection, TextFormat,
+        TextWrapping, cursor::CCursor,
     };
 }
 
@@ -478,7 +473,7 @@ pub use self::{
     drag_and_drop::DragAndDrop,
     epaint::text::TextWrapMode,
     grid::Grid,
-    id::{Id, IdMap},
+    id::{Id, IdMap, IdSet},
     input_state::{InputOptions, InputState, MultiTouchInfo, PointerState, SurrenderFocusOn},
     layers::{LayerId, Order},
     layout::*,
@@ -499,9 +494,6 @@ pub use self::{
     widgets::*,
 };
 
-#[deprecated = "Renamed to CornerRadius"]
-pub type Rounding = CornerRadius;
-
 // ----------------------------------------------------------------------------
 
 /// Helper function that adds a label when compiling with debug assertions enabled.
diff --git a/crates/egui/src/memory/mod.rs b/crates/egui/src/memory/mod.rs
index 51ab2cde4..674f18f56 100644
--- a/crates/egui/src/memory/mod.rs
+++ b/crates/egui/src/memory/mod.rs
@@ -116,6 +116,11 @@ pub struct Memory {
     /// (e.g. relative to some other widget).
     #[cfg_attr(feature = "persistence", serde(skip))]
     popups: ViewportIdMap<OpenPopup>,
+
+    /// Whether to inform the backend to interrupt any ongoing IME composition
+    /// this pass.
+    #[cfg_attr(feature = "persistence", serde(skip))]
+    requested_interrupt_ime: bool,
 }
 
 impl Default for Memory {
@@ -133,6 +138,7 @@ impl Default for Memory {
             popups: Default::default(),
             everything_is_visible: Default::default(),
             add_fonts: Default::default(),
+            requested_interrupt_ime: Default::default(),
         };
         slf.interactions.entry(slf.viewport_id).or_default();
         slf.areas.entry(slf.viewport_id).or_default();
@@ -193,7 +199,7 @@ pub struct Options {
     #[cfg_attr(feature = "serde", serde(skip))]
     pub light_style: std::sync::Arc<Style>,
 
-    /// Preference for selection between dark and light [`crate::Context::style`]
+    /// Preference for selection between dark and light [`crate::Context::global_style`]
     /// as the active style used by all subsequent windows, panels, etc.
     ///
     /// Default: `ThemePreference::System`.
@@ -234,6 +240,16 @@ pub struct Options {
     #[cfg_attr(feature = "serde", serde(skip))]
     pub zoom_with_keyboard: bool,
 
+    /// Keyboard shortcuts to close the application.
+    ///
+    /// Pressing any of these will send [`crate::ViewportCommand::Close`]
+    /// to the root viewport.
+    ///
+    /// Defaults to `Cmd-Q` (which is Ctrl-Q on Linux/Windows, Cmd-Q on Mac).
+    /// Set to empty to disable.
+    #[cfg_attr(feature = "serde", serde(skip))]
+    pub quit_shortcuts: Vec<crate::KeyboardShortcut>,
+
     /// Controls the tessellator.
     pub tessellation_options: epaint::TessellationOptions,
 
@@ -256,7 +272,7 @@ pub struct Options {
     ///
     /// If this is `1`, [`crate::Context::request_discard`] will be ignored.
     ///
-    /// Multi-pass is supported by [`crate::Context::run`].
+    /// Multi-pass is supported by [`crate::Context::run_ui`].
     ///
     /// See [`crate::Context::request_discard`] for more.
     pub max_passes: NonZeroUsize,
@@ -304,6 +320,10 @@ impl Default for Options {
             system_theme: None,
             zoom_factor: 1.0,
             zoom_with_keyboard: true,
+            quit_shortcuts: vec![crate::KeyboardShortcut::new(
+                crate::Modifiers::COMMAND,
+                crate::Key::Q,
+            )],
             tessellation_options: Default::default(),
             repaint_on_widget_change: false,
 
@@ -363,6 +383,7 @@ impl Options {
             system_theme: _,
             zoom_factor,
             zoom_with_keyboard,
+            quit_shortcuts: _, // not shown in ui
             tessellation_options,
             repaint_on_widget_change,
             max_passes,
@@ -746,6 +767,8 @@ impl Memory {
 
         self.areas.entry(self.viewport_id).or_default();
 
+        self.requested_interrupt_ime = false;
+
         // self.interactions  is handled elsewhere
 
         self.options.begin_pass(new_raw_input);
@@ -797,12 +820,6 @@ impl Memory {
         }
     }
 
-    /// The currently set transform of a layer.
-    #[deprecated = "Use `Context::layer_transform_to_global` instead"]
-    pub fn layer_transforms(&self, layer_id: LayerId) -> Option<TSTransform> {
-        self.to_global.get(&layer_id).copied()
-    }
-
     /// An iterator over all layers. Back-to-front, top is last.
     pub fn layer_ids(&self) -> impl ExactSizeIterator<Item = LayerId> + '_ {
         self.areas().order().iter().copied()
@@ -860,9 +877,12 @@ impl Memory {
 
     /// Give keyboard focus to a specific widget.
     /// See also [`crate::Response::request_focus`].
+    ///
+    /// Calling this will interrupt IME composition.
     #[inline(always)]
     pub fn request_focus(&mut self, id: Id) {
         self.focus_mut().focused_widget = Some(FocusWidget::new(id));
+        self.interrupt_ime();
     }
 
     /// Surrender keyboard focus for a specific widget.
@@ -978,6 +998,28 @@ impl Memory {
     pub(crate) fn focus_mut(&mut self) -> &mut Focus {
         self.focus.entry(self.viewport_id).or_default()
     }
+
+    /// Check if the widget owns IME events.
+    ///
+    /// A widget should only consume IME events if this returns `true`. At most
+    /// one widget can own IME events for each frame.
+    #[inline(always)]
+    pub fn owns_ime_events(&self, id: Id) -> bool {
+        // Note: Even if the IME is being interrupted in the current frame, we
+        // should not return `false` here, since we still need
+        // `PlatformOutput::ime` to be set in such cases.
+
+        self.has_focus(id)
+    }
+
+    /// Interrupt the current IME composition, if any.
+    pub fn interrupt_ime(&mut self) {
+        self.requested_interrupt_ime = true;
+    }
+
+    pub(crate) fn should_interrupt_ime(&self) -> bool {
+        self.requested_interrupt_ime
+    }
 }
 
 /// State of an open popup.
@@ -1004,40 +1046,27 @@ impl OpenPopup {
     }
 }
 
-/// ## Deprecated popup API
-/// Use [`crate::Popup`] instead.
+/// ## Popup state (internal API)
+///
+/// Used by [`crate::Popup`].
 impl Memory {
-    /// Is the given popup open?
-    #[deprecated = "Use Popup::is_id_open instead"]
-    pub fn is_popup_open(&self, popup_id: Id) -> bool {
+    pub(crate) fn is_popup_open(&self, popup_id: Id) -> bool {
         self.popups
             .get(&self.viewport_id)
             .is_some_and(|state| state.id == popup_id)
             || self.everything_is_visible()
     }
 
-    /// Is any popup open?
-    #[deprecated = "Use Popup::is_any_open instead"]
-    pub fn any_popup_open(&self) -> bool {
+    pub(crate) fn any_popup_open(&self) -> bool {
         self.popups.contains_key(&self.viewport_id) || self.everything_is_visible()
     }
 
-    /// Open the given popup and close all others.
-    ///
-    /// Note that you must call `keep_popup_open` on subsequent frames as long as the popup is open.
-    #[deprecated = "Use Popup::open_id instead"]
-    pub fn open_popup(&mut self, popup_id: Id) {
+    pub(crate) fn open_popup(&mut self, popup_id: Id) {
         self.popups
             .insert(self.viewport_id, OpenPopup::new(popup_id, None));
     }
 
-    /// Popups must call this every frame while open.
-    ///
-    /// This is needed because in some cases popups can go away without `close_popup` being
-    /// called. For example, when a context menu is open and the underlying widget stops
-    /// being rendered.
-    #[deprecated = "Use Popup::show instead"]
-    pub fn keep_popup_open(&mut self, popup_id: Id) {
+    pub(crate) fn keep_popup_open(&mut self, popup_id: Id) {
         if let Some(state) = self.popups.get_mut(&self.viewport_id)
             && state.id == popup_id
         {
@@ -1045,43 +1074,27 @@ impl Memory {
         }
     }
 
-    /// Open the popup and remember its position.
-    #[deprecated = "Use Popup with PopupAnchor::Position instead"]
-    pub fn open_popup_at(&mut self, popup_id: Id, pos: impl Into<Option<Pos2>>) {
+    pub(crate) fn open_popup_at(&mut self, popup_id: Id, pos: impl Into<Option<Pos2>>) {
         self.popups
             .insert(self.viewport_id, OpenPopup::new(popup_id, pos.into()));
     }
 
-    /// Get the position for this popup.
-    #[deprecated = "Use Popup::position_of_id instead"]
-    pub fn popup_position(&self, id: Id) -> Option<Pos2> {
+    pub(crate) fn popup_position(&self, id: Id) -> Option<Pos2> {
         let state = self.popups.get(&self.viewport_id)?;
         if state.id == id { state.pos } else { None }
     }
 
-    /// Close any currently open popup.
-    #[deprecated = "Use Popup::close_all instead"]
-    pub fn close_all_popups(&mut self) {
+    pub(crate) fn close_all_popups(&mut self) {
         self.popups.clear();
     }
 
-    /// Close the given popup, if it is open.
-    ///
-    /// See also [`Self::close_all_popups`] if you want to close any / all currently open popups.
-    #[deprecated = "Use Popup::close_id instead"]
-    pub fn close_popup(&mut self, popup_id: Id) {
-        #[expect(deprecated)]
+    pub(crate) fn close_popup(&mut self, popup_id: Id) {
         if self.is_popup_open(popup_id) {
             self.popups.remove(&self.viewport_id);
         }
     }
 
-    /// Toggle the given popup between closed and open.
-    ///
-    /// Note: At most, only one popup can be open at a time.
-    #[deprecated = "Use Popup::toggle_id instead"]
-    pub fn toggle_popup(&mut self, popup_id: Id) {
-        #[expect(deprecated)]
+    pub(crate) fn toggle_popup(&mut self, popup_id: Id) {
         if self.is_popup_open(popup_id) {
             self.close_popup(popup_id);
         } else {
diff --git a/crates/egui/src/menu.rs b/crates/egui/src/menu.rs
deleted file mode 100644
index 7c562d726..000000000
--- a/crates/egui/src/menu.rs
+++ /dev/null
@@ -1,781 +0,0 @@
-#![expect(deprecated)]
-//! Deprecated menu API - Use [`crate::containers::menu`] instead.
-//!
-//! Usage:
-//! ```
-//! fn show_menu(ui: &mut egui::Ui) {
-//!     use egui::{menu, Button};
-//!
-//!     menu::bar(ui, |ui| {
-//!         ui.menu_button("File", |ui| {
-//!             if ui.button("Open").clicked() {
-//!                 // …
-//!             }
-//!         });
-//!     });
-//! }
-//! ```
-
-use super::{
-    Align, Context, Id, InnerResponse, PointerState, Pos2, Rect, Response, Sense, TextStyle, Ui,
-    Vec2, style::WidgetVisuals,
-};
-use crate::{
-    Align2, Area, Color32, Frame, Key, LayerId, Layout, NumExt as _, Order, Stroke, Style,
-    TextWrapMode, UiKind, WidgetText, epaint, vec2,
-    widgets::{Button, ImageButton},
-};
-use epaint::mutex::RwLock;
-use std::sync::Arc;
-
-/// What is saved between frames.
-#[derive(Clone, Default)]
-pub struct BarState {
-    open_menu: MenuRootManager,
-}
-
-impl BarState {
-    pub fn load(ctx: &Context, bar_id: Id) -> Self {
-        ctx.data_mut(|d| d.get_temp::<Self>(bar_id).unwrap_or_default())
-    }
-
-    pub fn store(self, ctx: &Context, bar_id: Id) {
-        ctx.data_mut(|d| d.insert_temp(bar_id, self));
-    }
-
-    /// Show a menu at pointer if primary-clicked response.
-    ///
-    /// Should be called from [`Context`] on a [`Response`]
-    pub fn bar_menu<R>(
-        &mut self,
-        button: &Response,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> Option<InnerResponse<R>> {
-        MenuRoot::stationary_click_interaction(button, &mut self.open_menu);
-        self.open_menu.show(button, add_contents)
-    }
-
-    pub(crate) fn has_root(&self) -> bool {
-        self.open_menu.inner.is_some()
-    }
-}
-
-impl std::ops::Deref for BarState {
-    type Target = MenuRootManager;
-
-    fn deref(&self) -> &Self::Target {
-        &self.open_menu
-    }
-}
-
-impl std::ops::DerefMut for BarState {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.open_menu
-    }
-}
-
-fn set_menu_style(style: &mut Style) {
-    if style.compact_menu_style {
-        style.spacing.button_padding = vec2(2.0, 0.0);
-        style.visuals.widgets.active.bg_stroke = Stroke::NONE;
-        style.visuals.widgets.hovered.bg_stroke = Stroke::NONE;
-        style.visuals.widgets.inactive.weak_bg_fill = Color32::TRANSPARENT;
-        style.visuals.widgets.inactive.bg_stroke = Stroke::NONE;
-    }
-}
-
-/// The menu bar goes well in a [`crate::Panel::top`],
-/// but can also be placed in a [`crate::Window`].
-/// In the latter case you may want to wrap it in [`Frame`].
-#[deprecated = "Use `egui::MenuBar::new().ui(` instead"]
-pub fn bar<R>(ui: &mut Ui, add_contents: impl FnOnce(&mut Ui) -> R) -> InnerResponse<R> {
-    ui.horizontal(|ui| {
-        set_menu_style(ui.style_mut());
-
-        // Take full width and fixed height:
-        let height = ui.spacing().interact_size.y;
-        ui.set_min_size(vec2(ui.available_width(), height));
-
-        add_contents(ui)
-    })
-}
-
-/// Construct a top level menu in a menu bar. This would be e.g. "File", "Edit" etc.
-///
-/// Responds to primary clicks.
-///
-/// Returns `None` if the menu is not open.
-pub fn menu_button<R>(
-    ui: &mut Ui,
-    title: impl Into<WidgetText>,
-    add_contents: impl FnOnce(&mut Ui) -> R,
-) -> InnerResponse<Option<R>> {
-    stationary_menu_impl(ui, title, Box::new(add_contents))
-}
-
-/// Construct a top level menu with a custom button in a menu bar.
-///
-/// Responds to primary clicks.
-///
-/// Returns `None` if the menu is not open.
-pub fn menu_custom_button<R>(
-    ui: &mut Ui,
-    button: Button<'_>,
-    add_contents: impl FnOnce(&mut Ui) -> R,
-) -> InnerResponse<Option<R>> {
-    stationary_menu_button_impl(ui, button, Box::new(add_contents))
-}
-
-/// Construct a top level menu with an image in a menu bar. This would be e.g. "File", "Edit" etc.
-///
-/// Responds to primary clicks.
-///
-/// Returns `None` if the menu is not open.
-#[deprecated = "Use `menu_custom_button` instead"]
-pub fn menu_image_button<R>(
-    ui: &mut Ui,
-    image_button: ImageButton<'_>,
-    add_contents: impl FnOnce(&mut Ui) -> R,
-) -> InnerResponse<Option<R>> {
-    stationary_menu_button_impl(
-        ui,
-        Button::image(image_button.image),
-        Box::new(add_contents),
-    )
-}
-
-/// Construct a nested sub menu in another menu.
-///
-/// Opens on hover.
-///
-/// Returns `None` if the menu is not open.
-pub fn submenu_button<R>(
-    ui: &mut Ui,
-    parent_state: Arc<RwLock<MenuState>>,
-    title: impl Into<WidgetText>,
-    add_contents: impl FnOnce(&mut Ui) -> R,
-) -> InnerResponse<Option<R>> {
-    SubMenu::new(parent_state, title).show(ui, add_contents)
-}
-
-/// wrapper for the contents of every menu.
-fn menu_popup<'c, R>(
-    ctx: &Context,
-    parent_layer: LayerId,
-    menu_state_arc: &Arc<RwLock<MenuState>>,
-    menu_id: Id,
-    add_contents: impl FnOnce(&mut Ui) -> R + 'c,
-) -> InnerResponse<R> {
-    let pos = {
-        let mut menu_state = menu_state_arc.write();
-        menu_state.entry_count = 0;
-        menu_state.rect.min
-    };
-
-    let area_id = menu_id.with("__menu");
-
-    ctx.pass_state_mut(|fs| {
-        fs.layers
-            .entry(parent_layer)
-            .or_default()
-            .open_popups
-            .insert(area_id)
-    });
-
-    let area = Area::new(area_id)
-        .kind(UiKind::Menu)
-        .order(Order::Foreground)
-        .fixed_pos(pos)
-        .default_width(ctx.global_style().spacing.menu_width)
-        .sense(Sense::hover());
-
-    let mut sizing_pass = false;
-
-    let area_response = area.show(ctx, |ui| {
-        sizing_pass = ui.is_sizing_pass();
-
-        set_menu_style(ui.style_mut());
-
-        Frame::menu(ui.style())
-            .show(ui, |ui| {
-                ui.set_menu_state(Some(Arc::clone(menu_state_arc)));
-                ui.with_layout(Layout::top_down_justified(Align::LEFT), add_contents)
-                    .inner
-            })
-            .inner
-    });
-
-    let area_rect = area_response.response.rect;
-
-    menu_state_arc.write().rect = if sizing_pass {
-        // During the sizing pass we didn't know the size yet,
-        // so we might have just constrained the position unnecessarily.
-        // Therefore keep the original=desired position until the next frame.
-        Rect::from_min_size(pos, area_rect.size())
-    } else {
-        // We knew the size, and this is where it ended up (potentially constrained to screen).
-        // Remember it for the future:
-        area_rect
-    };
-
-    area_response
-}
-
-/// Build a top level menu with a button.
-///
-/// Responds to primary clicks.
-fn stationary_menu_impl<'c, R>(
-    ui: &mut Ui,
-    title: impl Into<WidgetText>,
-    add_contents: Box<dyn FnOnce(&mut Ui) -> R + 'c>,
-) -> InnerResponse<Option<R>> {
-    let title = title.into();
-    let bar_id = ui.id();
-    let menu_id = bar_id.with(title.text());
-
-    let mut bar_state = BarState::load(ui.ctx(), bar_id);
-
-    let mut button = Button::new(title);
-
-    if bar_state.open_menu.is_menu_open(menu_id) {
-        button = button.fill(ui.visuals().widgets.open.weak_bg_fill);
-        button = button.stroke(ui.visuals().widgets.open.bg_stroke);
-    }
-
-    let button_response = ui.add(button);
-    let inner = bar_state.bar_menu(&button_response, add_contents);
-
-    bar_state.store(ui.ctx(), bar_id);
-    InnerResponse::new(inner.map(|r| r.inner), button_response)
-}
-
-/// Build a top level menu with an image button.
-///
-/// Responds to primary clicks.
-fn stationary_menu_button_impl<'c, R>(
-    ui: &mut Ui,
-    button: Button<'_>,
-    add_contents: Box<dyn FnOnce(&mut Ui) -> R + 'c>,
-) -> InnerResponse<Option<R>> {
-    let bar_id = ui.id();
-
-    let mut bar_state = BarState::load(ui.ctx(), bar_id);
-    let button_response = ui.add(button);
-    let inner = bar_state.bar_menu(&button_response, add_contents);
-
-    bar_state.store(ui.ctx(), bar_id);
-    InnerResponse::new(inner.map(|r| r.inner), button_response)
-}
-
-pub(crate) const CONTEXT_MENU_ID_STR: &str = "__egui::context_menu";
-
-/// Response to secondary clicks (right-clicks) by showing the given menu.
-pub fn context_menu(
-    response: &Response,
-    add_contents: impl FnOnce(&mut Ui),
-) -> Option<InnerResponse<()>> {
-    let menu_id = Id::new(CONTEXT_MENU_ID_STR);
-    let mut bar_state = BarState::load(&response.ctx, menu_id);
-
-    MenuRoot::context_click_interaction(response, &mut bar_state);
-    let inner_response = bar_state.show(response, add_contents);
-
-    bar_state.store(&response.ctx, menu_id);
-    inner_response
-}
-
-/// Returns `true` if the context menu is opened for this widget.
-pub fn context_menu_opened(response: &Response) -> bool {
-    let menu_id = Id::new(CONTEXT_MENU_ID_STR);
-    let bar_state = BarState::load(&response.ctx, menu_id);
-    bar_state.is_menu_open(response.id)
-}
-
-/// Stores the state for the context menu.
-#[derive(Clone, Default)]
-pub struct MenuRootManager {
-    inner: Option<MenuRoot>,
-}
-
-impl MenuRootManager {
-    /// Show a menu at pointer if right-clicked response.
-    ///
-    /// Should be called from [`Context`] on a [`Response`]
-    pub fn show<R>(
-        &mut self,
-        button: &Response,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> Option<InnerResponse<R>> {
-        if let Some(root) = self.inner.as_mut() {
-            let (menu_response, inner_response) = root.show(button, add_contents);
-            if menu_response.is_close() {
-                self.inner = None;
-            }
-            inner_response
-        } else {
-            None
-        }
-    }
-
-    fn is_menu_open(&self, id: Id) -> bool {
-        self.inner.as_ref().map(|m| m.id) == Some(id)
-    }
-}
-
-impl std::ops::Deref for MenuRootManager {
-    type Target = Option<MenuRoot>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl std::ops::DerefMut for MenuRootManager {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.inner
-    }
-}
-
-/// Menu root associated with an Id from a Response
-#[derive(Clone)]
-pub struct MenuRoot {
-    pub menu_state: Arc<RwLock<MenuState>>,
-    pub id: Id,
-}
-
-impl MenuRoot {
-    pub fn new(position: Pos2, id: Id) -> Self {
-        Self {
-            menu_state: Arc::new(RwLock::new(MenuState::new(position))),
-            id,
-        }
-    }
-
-    pub fn show<R>(
-        &self,
-        button: &Response,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> (MenuResponse, Option<InnerResponse<R>>) {
-        if self.id == button.id {
-            let inner_response = menu_popup(
-                &button.ctx,
-                button.layer_id,
-                &self.menu_state,
-                self.id,
-                add_contents,
-            );
-            let menu_state = self.menu_state.read();
-
-            let escape_pressed = button.ctx.input(|i| i.key_pressed(Key::Escape));
-            if menu_state.response.is_close()
-                || escape_pressed
-                || inner_response.response.should_close()
-            {
-                return (MenuResponse::Close, Some(inner_response));
-            }
-        }
-        (MenuResponse::Stay, None)
-    }
-
-    /// Interaction with a stationary menu, i.e. fixed in another Ui.
-    ///
-    /// Responds to primary clicks.
-    fn stationary_interaction(button: &Response, root: &mut MenuRootManager) -> MenuResponse {
-        let id = button.id;
-
-        if (button.clicked() && root.is_menu_open(id))
-            || button.ctx.input(|i| i.key_pressed(Key::Escape))
-        {
-            // menu open and button clicked or esc pressed
-            return MenuResponse::Close;
-        } else if (button.clicked() && !root.is_menu_open(id))
-            || (button.hovered() && root.is_some())
-        {
-            // menu not open and button clicked
-            // or button hovered while other menu is open
-            let mut pos = button.rect.left_bottom();
-
-            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.global_style().spacing.menu_spacing;
-
-            if let Some(root) = root.inner.as_mut() {
-                let menu_rect = root.menu_state.read().rect;
-                let content_rect = button.ctx.input(|i| i.content_rect());
-
-                if pos.y + menu_rect.height() > content_rect.max.y {
-                    pos.y = content_rect.max.y - menu_rect.height() - button.rect.height();
-                }
-
-                if pos.x + menu_rect.width() > content_rect.max.x {
-                    pos.x = content_rect.max.x - menu_rect.width();
-                }
-            }
-
-            if let Some(to_global) = button.ctx.layer_transform_to_global(button.layer_id) {
-                pos = to_global * pos;
-            }
-
-            return MenuResponse::Create(pos, id);
-        } else if button
-            .ctx
-            .input(|i| i.pointer.any_pressed() && i.pointer.primary_down())
-            && let Some(pos) = button.ctx.input(|i| i.pointer.interact_pos())
-            && let Some(root) = root.inner.as_mut()
-            && root.id == id
-        {
-            // pressed somewhere while this menu is open
-            let in_menu = root.menu_state.read().area_contains(pos);
-            if !in_menu {
-                return MenuResponse::Close;
-            }
-        }
-        MenuResponse::Stay
-    }
-
-    /// Interaction with a context menu (secondary click).
-    pub fn context_interaction(response: &Response, root: &mut Option<Self>) -> MenuResponse {
-        let response = response.interact(Sense::click());
-        let hovered = response.hovered();
-        let secondary_clicked = response.secondary_clicked();
-
-        response.ctx.input(|input| {
-            let pointer = &input.pointer;
-            if let Some(pos) = pointer.interact_pos() {
-                let (in_old_menu, destroy) = if let Some(root) = root {
-                    let in_old_menu = root.menu_state.read().area_contains(pos);
-                    let destroy = !in_old_menu && pointer.any_pressed() && root.id == response.id;
-                    (in_old_menu, destroy)
-                } else {
-                    (false, false)
-                };
-                if !in_old_menu {
-                    if hovered && secondary_clicked {
-                        return MenuResponse::Create(pos, response.id);
-                    } else if destroy || hovered && pointer.primary_down() {
-                        return MenuResponse::Close;
-                    }
-                }
-            }
-            MenuResponse::Stay
-        })
-    }
-
-    pub fn handle_menu_response(root: &mut MenuRootManager, menu_response: MenuResponse) {
-        match menu_response {
-            MenuResponse::Create(pos, id) => {
-                root.inner = Some(Self::new(pos, id));
-            }
-            MenuResponse::Close => root.inner = None,
-            MenuResponse::Stay => {}
-        }
-    }
-
-    /// Respond to secondary (right) clicks.
-    pub fn context_click_interaction(response: &Response, root: &mut MenuRootManager) {
-        let menu_response = Self::context_interaction(response, root);
-        Self::handle_menu_response(root, menu_response);
-    }
-
-    // Responds to primary clicks.
-    pub fn stationary_click_interaction(button: &Response, root: &mut MenuRootManager) {
-        let menu_response = Self::stationary_interaction(button, root);
-        Self::handle_menu_response(root, menu_response);
-    }
-}
-
-#[derive(Copy, Clone, PartialEq, Eq)]
-pub enum MenuResponse {
-    Close,
-    Stay,
-    Create(Pos2, Id),
-}
-
-impl MenuResponse {
-    pub fn is_close(&self) -> bool {
-        *self == Self::Close
-    }
-}
-
-pub struct SubMenuButton {
-    text: WidgetText,
-    icon: WidgetText,
-    index: usize,
-}
-
-impl SubMenuButton {
-    /// The `icon` can be an emoji (e.g. `⏵` right arrow), shown right of the label
-    fn new(text: impl Into<WidgetText>, icon: impl Into<WidgetText>, index: usize) -> Self {
-        Self {
-            text: text.into(),
-            icon: icon.into(),
-            index,
-        }
-    }
-
-    fn visuals<'a>(
-        ui: &'a Ui,
-        response: &Response,
-        menu_state: &MenuState,
-        sub_id: Id,
-    ) -> &'a WidgetVisuals {
-        if menu_state.is_open(sub_id) && !response.hovered() {
-            &ui.style().visuals.widgets.open
-        } else {
-            ui.style().interact(response)
-        }
-    }
-
-    #[inline]
-    pub fn icon(mut self, icon: impl Into<WidgetText>) -> Self {
-        self.icon = icon.into();
-        self
-    }
-
-    pub(crate) fn show(self, ui: &mut Ui, menu_state: &MenuState, sub_id: Id) -> Response {
-        let Self { text, icon, .. } = self;
-
-        let text_style = TextStyle::Button;
-        let sense = Sense::click();
-
-        let text_icon_gap = ui.spacing().item_spacing.x;
-        let button_padding = ui.spacing().button_padding;
-        let total_extra = button_padding + button_padding;
-        let text_available_width = ui.available_width() - total_extra.x;
-        let text_galley = text.into_galley(
-            ui,
-            Some(TextWrapMode::Wrap),
-            text_available_width,
-            text_style.clone(),
-        );
-
-        let icon_available_width = text_available_width - text_galley.size().x;
-        let icon_galley = icon.into_galley(
-            ui,
-            Some(TextWrapMode::Wrap),
-            icon_available_width,
-            text_style,
-        );
-        let text_and_icon_size = Vec2::new(
-            text_galley.size().x + text_icon_gap + icon_galley.size().x,
-            text_galley.size().y.max(icon_galley.size().y),
-        );
-        let mut desired_size = text_and_icon_size + 2.0 * button_padding;
-        desired_size.y = desired_size.y.at_least(ui.spacing().interact_size.y);
-
-        let (rect, response) = ui.allocate_at_least(desired_size, sense);
-        response.widget_info(|| {
-            crate::WidgetInfo::labeled(
-                crate::WidgetType::Button,
-                ui.is_enabled(),
-                text_galley.text(),
-            )
-        });
-
-        if ui.is_rect_visible(rect) {
-            let visuals = Self::visuals(ui, &response, menu_state, sub_id);
-            let text_pos = Align2::LEFT_CENTER
-                .align_size_within_rect(text_galley.size(), rect.shrink2(button_padding))
-                .min;
-            let icon_pos = Align2::RIGHT_CENTER
-                .align_size_within_rect(icon_galley.size(), rect.shrink2(button_padding))
-                .min;
-
-            if ui.visuals().button_frame {
-                ui.painter().rect_filled(
-                    rect.expand(visuals.expansion),
-                    visuals.corner_radius,
-                    visuals.weak_bg_fill,
-                );
-            }
-
-            let text_color = visuals.text_color();
-            ui.painter().galley(text_pos, text_galley, text_color);
-            ui.painter().galley(icon_pos, icon_galley, text_color);
-        }
-        response
-    }
-}
-
-pub struct SubMenu {
-    button: SubMenuButton,
-    parent_state: Arc<RwLock<MenuState>>,
-}
-
-impl SubMenu {
-    fn new(parent_state: Arc<RwLock<MenuState>>, text: impl Into<WidgetText>) -> Self {
-        let index = parent_state.write().next_entry_index();
-        Self {
-            button: SubMenuButton::new(text, "⏵", index),
-            parent_state,
-        }
-    }
-
-    pub fn show<R>(
-        self,
-        ui: &mut Ui,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> InnerResponse<Option<R>> {
-        let sub_id = ui.id().with(self.button.index);
-        let response = self.button.show(ui, &self.parent_state.read(), sub_id);
-        self.parent_state
-            .write()
-            .submenu_button_interaction(ui, sub_id, &response);
-        let inner =
-            self.parent_state
-                .write()
-                .show_submenu(ui.ctx(), ui.layer_id(), sub_id, add_contents);
-        InnerResponse::new(inner, response)
-    }
-}
-
-/// Components of menu state, public for advanced usage.
-///
-/// Usually you don't need to use it directly.
-pub struct MenuState {
-    /// The opened sub-menu and its [`Id`]
-    sub_menu: Option<(Id, Arc<RwLock<Self>>)>,
-
-    /// Bounding box of this menu (without the sub-menu),
-    /// including the frame and everything.
-    pub rect: Rect,
-
-    /// Used to check if any menu in the tree wants to close
-    pub response: MenuResponse,
-
-    /// Used to hash different [`Id`]s for sub-menus
-    entry_count: usize,
-}
-
-impl MenuState {
-    pub fn new(position: Pos2) -> Self {
-        Self {
-            rect: Rect::from_min_size(position, Vec2::ZERO),
-            sub_menu: None,
-            response: MenuResponse::Stay,
-            entry_count: 0,
-        }
-    }
-
-    /// Close menu hierarchy.
-    pub fn close(&mut self) {
-        self.response = MenuResponse::Close;
-    }
-
-    fn show_submenu<R>(
-        &mut self,
-        ctx: &Context,
-        parent_layer: LayerId,
-        id: Id,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> Option<R> {
-        let (sub_response, response) = self.submenu(id).map(|sub| {
-            let inner_response = menu_popup(ctx, parent_layer, sub, id, add_contents);
-            if inner_response.response.should_close() {
-                sub.write().close();
-            }
-            (sub.read().response, inner_response.inner)
-        })?;
-        self.cascade_close_response(sub_response);
-        Some(response)
-    }
-
-    /// Check if position is in the menu hierarchy's area.
-    pub fn area_contains(&self, pos: Pos2) -> bool {
-        self.rect.contains(pos)
-            || self
-                .sub_menu
-                .as_ref()
-                .is_some_and(|(_, sub)| sub.read().area_contains(pos))
-    }
-
-    fn next_entry_index(&mut self) -> usize {
-        self.entry_count += 1;
-        self.entry_count - 1
-    }
-
-    /// Sense button interaction opening and closing submenu.
-    fn submenu_button_interaction(&mut self, ui: &Ui, sub_id: Id, button: &Response) {
-        let pointer = ui.input(|i| i.pointer.clone());
-        let open = self.is_open(sub_id);
-        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.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();
-            pos.x = self.rect.right() + ui.spacing().menu_spacing;
-            pos.y -= Frame::menu(ui.style()).total_margin().top; // align the first button in the submenu with the parent button
-
-            self.open_submenu(sub_id, pos);
-        } else if open
-            && ui.response().contains_pointer()
-            && !button.hovered()
-            && !self.hovering_current_submenu(&pointer)
-        {
-            // We are hovering something else in the menu, so close the submenu.
-            self.close_submenu();
-        }
-    }
-
-    /// Check if pointer is moving towards current submenu.
-    fn moving_towards_current_submenu(&self, pointer: &PointerState) -> bool {
-        if pointer.is_still() {
-            return false;
-        }
-
-        if let Some(sub_menu) = self.current_submenu()
-            && let Some(pos) = pointer.hover_pos()
-        {
-            let rect = sub_menu.read().rect;
-            return rect.intersects_ray(pos, pointer.direction().normalized());
-        }
-        false
-    }
-
-    /// Check if pointer is hovering current submenu.
-    fn hovering_current_submenu(&self, pointer: &PointerState) -> bool {
-        if let Some(sub_menu) = self.current_submenu()
-            && let Some(pos) = pointer.hover_pos()
-        {
-            return sub_menu.read().area_contains(pos);
-        }
-        false
-    }
-
-    /// Cascade close response to menu root.
-    fn cascade_close_response(&mut self, response: MenuResponse) {
-        if response.is_close() {
-            self.response = response;
-        }
-    }
-
-    fn is_open(&self, id: Id) -> bool {
-        self.sub_id() == Some(id)
-    }
-
-    fn sub_id(&self) -> Option<Id> {
-        self.sub_menu.as_ref().map(|(id, _)| *id)
-    }
-
-    fn current_submenu(&self) -> Option<&Arc<RwLock<Self>>> {
-        self.sub_menu.as_ref().map(|(_, sub)| sub)
-    }
-
-    fn submenu(&self, id: Id) -> Option<&Arc<RwLock<Self>>> {
-        let (k, sub) = self.sub_menu.as_ref()?;
-        if id == *k { Some(sub) } else { None }
-    }
-
-    /// Open submenu at position, if not already open.
-    fn open_submenu(&mut self, id: Id, pos: Pos2) {
-        if !self.is_open(id) {
-            self.sub_menu = Some((id, Arc::new(RwLock::new(Self::new(pos)))));
-        }
-    }
-
-    fn close_submenu(&mut self) {
-        self.sub_menu = None;
-    }
-}
diff --git a/crates/egui/src/painter.rs b/crates/egui/src/painter.rs
index b01d673e4..4b81e98cb 100644
--- a/crates/egui/src/painter.rs
+++ b/crates/egui/src/painter.rs
@@ -82,12 +82,6 @@ impl Painter {
         self.layer_id = layer_id;
     }
 
-    /// If set, colors will be modified to look like this
-    #[deprecated = "Use `multiply_opacity` instead"]
-    pub fn set_fade_to_color(&mut self, fade_to_color: Option<Color32>) {
-        self.fade_to_color = fade_to_color;
-    }
-
     /// Set the opacity (alpha multiplier) of everything painted by this painter from this point forward.
     ///
     /// `opacity` must be between 0.0 and 1.0, where 0.0 means fully transparent (i.e., invisible)
@@ -195,41 +189,6 @@ impl Painter {
     pub fn round_to_pixel_center(&self, point: f32) -> f32 {
         point.round_to_pixel_center(self.pixels_per_point())
     }
-
-    /// Useful for pixel-perfect rendering of lines that are one pixel wide (or any odd number of pixels).
-    #[deprecated = "Use `emath::GuiRounding` with `painter.pixels_per_point()` instead"]
-    #[inline]
-    pub fn round_pos_to_pixel_center(&self, pos: Pos2) -> Pos2 {
-        pos.round_to_pixel_center(self.pixels_per_point())
-    }
-
-    /// Useful for pixel-perfect rendering of filled shapes.
-    #[deprecated = "Use `emath::GuiRounding` with `painter.pixels_per_point()` instead"]
-    #[inline]
-    pub fn round_to_pixel(&self, point: f32) -> f32 {
-        point.round_to_pixels(self.pixels_per_point())
-    }
-
-    /// Useful for pixel-perfect rendering.
-    #[deprecated = "Use `emath::GuiRounding` with `painter.pixels_per_point()` instead"]
-    #[inline]
-    pub fn round_vec_to_pixels(&self, vec: Vec2) -> Vec2 {
-        vec.round_to_pixels(self.pixels_per_point())
-    }
-
-    /// Useful for pixel-perfect rendering.
-    #[deprecated = "Use `emath::GuiRounding` with `painter.pixels_per_point()` instead"]
-    #[inline]
-    pub fn round_pos_to_pixels(&self, pos: Pos2) -> Pos2 {
-        pos.round_to_pixels(self.pixels_per_point())
-    }
-
-    /// Useful for pixel-perfect rendering.
-    #[deprecated = "Use `emath::GuiRounding` with `painter.pixels_per_point()` instead"]
-    #[inline]
-    pub fn round_rect_to_pixels(&self, rect: Rect) -> Rect {
-        rect.round_to_pixels(self.pixels_per_point())
-    }
 }
 
 /// ## Low level
diff --git a/crates/egui/src/pass_state.rs b/crates/egui/src/pass_state.rs
index 56564541d..3beef87fa 100644
--- a/crates/egui/src/pass_state.rs
+++ b/crates/egui/src/pass_state.rs
@@ -199,16 +199,15 @@ pub struct PassState {
 
     pub tooltips: TooltipPassState,
 
-    /// Starts off as the `screen_rect`, shrinks as panels are added.
-    /// The [`crate::CentralPanel`] does not change this.
-    pub available_rect: Rect,
+    /// What the root UI had available at the end of the previous pass.
+    ///
+    /// Only set if [`crate::Context::run_ui`] has been called.
+    pub root_ui_available_rect: Option<Rect>,
 
-    /// Starts off as the `screen_rect`, shrinks as panels are added.
-    /// The [`crate::CentralPanel`] retracts from this.
-    pub unused_rect: Rect,
-
-    /// How much space is used by panels.
-    pub used_by_panels: Rect,
+    /// What the root UI had used at the end of the previous pass.
+    ///
+    /// Only set if [`crate::Context::run_ui`] has been called.
+    pub root_ui_min_rect: Option<Rect>,
 
     /// The current scroll area should scroll to this range (horizontal, vertical).
     pub scroll_target: [Option<ScrollTarget>; 2],
@@ -240,9 +239,8 @@ impl Default for PassState {
             widgets: Default::default(),
             layers: Default::default(),
             tooltips: Default::default(),
-            available_rect: Rect::NAN,
-            unused_rect: Rect::NAN,
-            used_by_panels: Rect::NAN,
+            root_ui_available_rect: None,
+            root_ui_min_rect: None,
             scroll_target: [None, None],
             scroll_delta: (Vec2::default(), style::ScrollAnimation::none()),
             accesskit_state: None,
@@ -255,16 +253,15 @@ impl Default for PassState {
 }
 
 impl PassState {
-    pub(crate) fn begin_pass(&mut self, content_rect: Rect) {
+    pub(crate) fn begin_pass(&mut self) {
         profiling::function_scope!();
         let Self {
             used_ids,
             widgets,
             tooltips,
             layers,
-            available_rect,
-            unused_rect,
-            used_by_panels,
+            root_ui_available_rect,
+            root_ui_min_rect,
             scroll_target,
             scroll_delta,
             accesskit_state,
@@ -278,9 +275,8 @@ impl PassState {
         widgets.clear();
         tooltips.clear();
         layers.clear();
-        *available_rect = content_rect;
-        *unused_rect = content_rect;
-        *used_by_panels = Rect::NOTHING;
+        *root_ui_available_rect = None;
+        *root_ui_min_rect = None;
         *scroll_target = [None, None];
         *scroll_delta = Default::default();
 
@@ -293,64 +289,4 @@ impl PassState {
 
         highlight_next_pass.clear();
     }
-
-    /// How much space is still available after panels has been added.
-    pub(crate) fn available_rect(&self) -> Rect {
-        debug_assert!(
-            self.available_rect.is_finite(),
-            "Called `available_rect()` before `Context::run()`"
-        );
-        self.available_rect
-    }
-
-    /// Shrink `available_rect`.
-    pub(crate) fn allocate_left_panel(&mut self, panel_rect: Rect) {
-        debug_assert!(
-            panel_rect.min.distance(self.available_rect.min) < 0.1,
-            "Mismatching left panel. You must not create a panel from within another panel."
-        );
-        self.available_rect.min.x = panel_rect.max.x;
-        self.unused_rect.min.x = panel_rect.max.x;
-        self.used_by_panels |= panel_rect;
-    }
-
-    /// Shrink `available_rect`.
-    pub(crate) fn allocate_right_panel(&mut self, panel_rect: Rect) {
-        debug_assert!(
-            panel_rect.max.distance(self.available_rect.max) < 0.1,
-            "Mismatching right panel. You must not create a panel from within another panel."
-        );
-        self.available_rect.max.x = panel_rect.min.x;
-        self.unused_rect.max.x = panel_rect.min.x;
-        self.used_by_panels |= panel_rect;
-    }
-
-    /// Shrink `available_rect`.
-    pub(crate) fn allocate_top_panel(&mut self, panel_rect: Rect) {
-        debug_assert!(
-            panel_rect.min.distance(self.available_rect.min) < 0.1,
-            "Mismatching top panel. You must not create a panel from within another panel."
-        );
-        self.available_rect.min.y = panel_rect.max.y;
-        self.unused_rect.min.y = panel_rect.max.y;
-        self.used_by_panels |= panel_rect;
-    }
-
-    /// Shrink `available_rect`.
-    pub(crate) fn allocate_bottom_panel(&mut self, panel_rect: Rect) {
-        debug_assert!(
-            panel_rect.max.distance(self.available_rect.max) < 0.1,
-            "Mismatching bottom panel. You must not create a panel from within another panel."
-        );
-        self.available_rect.max.y = panel_rect.min.y;
-        self.unused_rect.max.y = panel_rect.min.y;
-        self.used_by_panels |= panel_rect;
-    }
-
-    pub(crate) fn allocate_central_panel(&mut self, panel_rect: Rect) {
-        // Note: we do not shrink `available_rect`, because
-        // we allow windows to cover the CentralPanel.
-        self.unused_rect = Rect::NOTHING; // Nothing left unused after this
-        self.used_by_panels |= panel_rect;
-    }
 }
diff --git a/crates/egui/src/response.rs b/crates/egui/src/response.rs
index 495d5dcdf..54d53f2b4 100644
--- a/crates/egui/src/response.rs
+++ b/crates/egui/src/response.rs
@@ -55,7 +55,7 @@ pub struct Response {
     /// Where the pointer (mouse/touch) were when this widget was clicked or dragged.
     /// `None` if the widget is not being interacted with.
     #[doc(hidden)]
-    pub interact_pointer_pos: Option<Pos2>,
+    pub interact_pointer_pos_or_nan: Pos2,
 
     /// The intrinsic / desired size of the widget.
     ///
@@ -67,12 +67,22 @@ pub struct Response {
     /// At the time of writing, this is only used by external crates
     /// for improved layouting.
     /// See for instance [`egui_flex`](https://github.com/lucasmerlin/hello_egui/tree/main/crates/egui_flex).
-    pub intrinsic_size: Option<Vec2>,
+    #[doc(hidden)]
+    pub intrinsic_size_or_nan: Vec2,
 
     #[doc(hidden)]
     pub flags: Flags,
 }
 
+#[test]
+fn test_response_size() {
+    assert_eq!(
+        std::mem::size_of::<Response>(),
+        88,
+        "Keep Response small, because we create them often, and we want to keep it lean and fast"
+    );
+}
+
 /// A bit set for various boolean properties of `Response`.
 #[doc(hidden)]
 #[derive(Copy, Clone, Debug)]
@@ -141,6 +151,22 @@ bitflags::bitflags! {
 }
 
 impl Response {
+    /// The [`Id`] of the parent [`crate::Ui`] that hosts this widget.
+    ///
+    /// Looks up the [`WidgetRect`] from the current (or previous) pass.
+    pub fn parent_id(&self) -> Id {
+        let id = self.ctx.viewport(|viewport| {
+            viewport
+                .this_pass
+                .widgets
+                .get(self.id)
+                .or_else(|| viewport.prev_pass.widgets.get(self.id))
+                .map(|w| w.parent_id)
+        });
+        debug_assert!(id.is_some(), "WidgetRect for Response not found!");
+        id.unwrap_or(Id::NULL)
+    }
+
     /// Returns true if this widget was clicked this frame by the primary button.
     ///
     /// A click is registered when the mouse or touch is released within
@@ -246,10 +272,10 @@ impl Response {
                 false
             } else if let Some(pos) = pointer_interact_pos {
                 let layer_under_pointer = self.ctx.layer_id_at(pos);
-                if layer_under_pointer != Some(self.layer_id) {
-                    true
-                } else {
+                if layer_under_pointer == Some(self.layer_id) {
                     !self.interact_rect.contains(pos)
+                } else {
+                    true
                 }
             } else {
                 false // clicked without a pointer, weird
@@ -489,7 +515,26 @@ impl Response {
     /// `None` if the widget is not being interacted with.
     #[inline]
     pub fn interact_pointer_pos(&self) -> Option<Pos2> {
-        self.interact_pointer_pos
+        let pos = self.interact_pointer_pos_or_nan;
+        if pos.any_nan() { None } else { Some(pos) }
+    }
+
+    /// The intrinsic / desired size of the widget.
+    ///
+    /// This is the size that a non-wrapped, non-truncated, non-justified version of the widget
+    /// would have.
+    ///
+    /// If this is `None`, use [`Self::rect`] instead.
+    #[inline]
+    pub fn intrinsic_size(&self) -> Option<Vec2> {
+        let size = self.intrinsic_size_or_nan;
+        if size.any_nan() { None } else { Some(size) }
+    }
+
+    /// Set the intrinsic / desired size of the widget.
+    #[inline]
+    pub fn set_intrinsic_size(&mut self, size: Vec2) {
+        self.intrinsic_size_or_nan = size;
     }
 
     /// If it is a good idea to show a tooltip, where is pointer?
@@ -732,6 +777,7 @@ impl Response {
             WidgetRect {
                 layer_id: self.layer_id,
                 id: self.id,
+                parent_id: self.parent_id(),
                 rect: self.rect,
                 interact_rect: self.interact_rect,
                 sense: self.sense | sense,
@@ -1007,8 +1053,10 @@ impl Response {
             interact_rect: self.interact_rect.union(other.interact_rect),
             sense: self.sense.union(other.sense),
             flags: self.flags | other.flags,
-            interact_pointer_pos: self.interact_pointer_pos.or(other.interact_pointer_pos),
-            intrinsic_size: None,
+            interact_pointer_pos_or_nan: self
+                .interact_pointer_pos()
+                .unwrap_or(other.interact_pointer_pos_or_nan),
+            intrinsic_size_or_nan: Vec2::NAN,
         }
     }
 }
diff --git a/crates/egui/src/style.rs b/crates/egui/src/style.rs
index 56a347f0d..c036b387a 100644
--- a/crates/egui/src/style.rs
+++ b/crates/egui/src/style.rs
@@ -297,17 +297,6 @@ pub struct Style {
     #[cfg_attr(feature = "serde", serde(skip))]
     pub number_formatter: NumberFormatter,
 
-    /// If set, labels, buttons, etc. will use this to determine whether to wrap the text at the
-    /// right edge of the [`Ui`] they are in. By default, this is `None`.
-    ///
-    /// **Note**: this API is deprecated, use `wrap_mode` instead.
-    ///
-    /// * `None`: use `wrap_mode` instead
-    /// * `Some(true)`: wrap mode defaults to [`crate::TextWrapMode::Wrap`]
-    /// * `Some(false)`: wrap mode defaults to [`crate::TextWrapMode::Extend`]
-    #[deprecated = "Use wrap_mode instead"]
-    pub wrap: Option<bool>,
-
     /// If set, labels, buttons, etc. will use this to determine whether to wrap or truncate the
     /// text at the right edge of the [`Ui`] they are in, or to extend it. By default, this is
     /// `None`.
@@ -586,6 +575,8 @@ pub struct ScrollStyle {
     /// This is only for floating scroll bars.
     /// Solid scroll bars are always opaque.
     pub interact_handle_opacity: f32,
+
+    pub fade: ScrollFadeStyle,
 }
 
 impl Default for ScrollStyle {
@@ -616,6 +607,8 @@ impl ScrollStyle {
             dormant_handle_opacity: 0.0,
             active_handle_opacity: 0.6,
             interact_handle_opacity: 1.0,
+
+            fade: Default::default(),
         }
     }
 
@@ -699,6 +692,8 @@ impl ScrollStyle {
             dormant_handle_opacity,
             active_handle_opacity,
             interact_handle_opacity,
+
+            fade,
         } = self;
 
         ui.horizontal(|ui| {
@@ -772,6 +767,52 @@ impl ScrollStyle {
                 ui.label("Inner margin");
             });
         }
+
+        ui.separator();
+        fade.ui(ui);
+    }
+}
+
+/// Controls if and how to fade out the sides of a [`crate::ScrollArea`]
+/// to indicate there is more there if you scroll.
+#[derive(Clone, Copy, Debug, PartialEq)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+#[cfg_attr(feature = "serde", serde(default))]
+pub struct ScrollFadeStyle {
+    /// Opacity of the fade effect at the outer edge, in 0.0-1.0.
+    ///
+    /// Set to 0.0 to disable the fade effect.
+    pub strength: f32,
+
+    /// Size of the fade-area (height for vertical scrolling,
+    /// width for horizontal scrolling).
+    pub size: f32,
+}
+
+impl Default for ScrollFadeStyle {
+    fn default() -> Self {
+        Self {
+            strength: 0.5,
+            size: 20.0,
+        }
+    }
+}
+
+impl ScrollFadeStyle {
+    pub fn ui(&mut self, ui: &mut Ui) {
+        let Self { strength, size } = self;
+
+        ui.horizontal(|ui| {
+            ui.add(DragValue::new(strength).speed(0.01).range(0.0..=1.0));
+            ui.label("Fade strength");
+        });
+
+        if 0.0 < *strength {
+            ui.horizontal(|ui| {
+                ui.add(DragValue::new(size).range(0.0..=64.0));
+                ui.label("Fade size");
+            });
+        }
     }
 }
 
@@ -1114,13 +1155,6 @@ impl Visuals {
         self.window_stroke
     }
 
-    /// When fading out things, we fade the colors towards this.
-    #[inline(always)]
-    #[deprecated = "Use disabled_alpha(). Fading is now handled by modifying the alpha channel."]
-    pub fn fade_out_to_color(&self) -> Color32 {
-        self.widgets.noninteractive.weak_bg_fill
-    }
-
     /// Disabled widgets have their alpha modified by this.
     #[inline(always)]
     pub fn disabled_alpha(&self) -> f32 {
@@ -1251,11 +1285,6 @@ impl WidgetVisuals {
     pub fn text_color(&self) -> Color32 {
         self.fg_stroke.color
     }
-
-    #[deprecated = "Renamed to corner_radius"]
-    pub fn rounding(&self) -> CornerRadius {
-        self.corner_radius
-    }
 }
 
 /// Options for help debug egui by adding extra visualization
@@ -1303,6 +1332,10 @@ pub struct DebugOptions {
     /// Show interesting widgets under the mouse cursor.
     pub show_widget_hits: bool,
 
+    /// Show a warning if the same `Rect` had different `Id` and the same parent `Id` on the
+    /// previous frame.
+    pub warn_if_rect_changes_id: bool,
+
     /// If true, highlight widgets that are not aligned to [`emath::GUI_ROUNDING`].
     ///
     /// See [`emath::GuiRounding`] for more.
@@ -1329,6 +1362,7 @@ impl Default for DebugOptions {
             show_resize: false,
             show_interactive_widgets: false,
             show_widget_hits: false,
+            warn_if_rect_changes_id: cfg!(debug_assertions),
             show_unaligned: cfg!(debug_assertions),
             show_focused_widget: false,
         }
@@ -1353,7 +1387,6 @@ pub fn default_text_styles() -> BTreeMap<TextStyle, FontId> {
 
 impl Default for Style {
     fn default() -> Self {
-        #[expect(deprecated)]
         Self {
             override_font_id: None,
             override_text_style: None,
@@ -1361,7 +1394,6 @@ impl Default for Style {
             text_styles: default_text_styles(),
             drag_value_text_style: TextStyle::Button,
             number_formatter: NumberFormatter(Arc::new(emath::format_with_decimals_in_range)),
-            wrap: None,
             wrap_mode: None,
             spacing: Spacing::default(),
             interaction: Interaction::default(),
@@ -1667,7 +1699,6 @@ use crate::{
 
 impl Style {
     pub fn ui(&mut self, ui: &mut crate::Ui) {
-        #[expect(deprecated)]
         let Self {
             override_font_id,
             override_text_style,
@@ -1675,7 +1706,6 @@ impl Style {
             text_styles,
             drag_value_text_style,
             number_formatter: _, // can't change callbacks in the UI
-            wrap: _,
             wrap_mode,
             spacing,
             interaction,
@@ -2287,11 +2317,13 @@ impl Visuals {
                 max_texture_side: _,
                 alpha_from_coverage,
                 font_hinting,
+                subpixel_binning,
             } = text_options;
 
             text_alpha_from_coverage_ui(ui, alpha_from_coverage);
 
-            ui.checkbox(font_hinting, "Enable font hinting");
+            ui.checkbox(font_hinting, "Font hinting (sharper text)");
+            ui.checkbox(subpixel_binning, "Sub-pixel binning (more even kerning)");
         });
 
         ui.collapsing("Text cursor", |ui| {
@@ -2491,6 +2523,7 @@ impl DebugOptions {
             show_resize,
             show_interactive_widgets,
             show_widget_hits,
+            warn_if_rect_changes_id,
             show_unaligned,
             show_focused_widget,
         } = self;
@@ -2522,6 +2555,11 @@ impl DebugOptions {
 
         ui.checkbox(show_widget_hits, "Show widgets under mouse pointer");
 
+        ui.checkbox(
+            warn_if_rect_changes_id,
+            "Warn if a Rect changes Id between frames",
+        );
+
         ui.checkbox(
             show_unaligned,
             "Show rectangles not aligned to integer point coordinates",
@@ -2850,8 +2888,11 @@ impl Widget for &mut FontTweak {
                     scale,
                     y_offset_factor,
                     y_offset,
-                    hinting_override,
+                    hinting,
                     coords,
+                    thin_space_width,
+                    tab_size,
+                    subpixel_binning,
                 } = self;
 
                 ui.label("Scale");
@@ -2867,18 +2908,20 @@ 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");
-                    });
+                ui.label("hinting");
+                ui.horizontal(|ui| {
+                    ui.radio_value(hinting, Some(true), "on");
+                    ui.radio_value(hinting, Some(false), "off");
+                    ui.radio_value(hinting, None, "default");
+                });
+                ui.end_row();
+
+                ui.label("subpixel_binning");
+                ui.horizontal(|ui| {
+                    ui.radio_value(subpixel_binning, Some(true), "on");
+                    ui.radio_value(subpixel_binning, Some(false), "off");
+                    ui.radio_value(subpixel_binning, None, "default");
+                });
                 ui.end_row();
 
                 ui.label("coords");
@@ -2924,6 +2967,21 @@ impl Widget for &mut FontTweak {
                 }
                 ui.end_row();
 
+                ui.label("thin_space_width");
+                ui.horizontal(|ui| {
+                    ui.add(
+                        DragValue::new(thin_space_width)
+                            .range(0.0..=1.0)
+                            .speed(0.01),
+                    );
+                    ui.label("1\u{2009}234\u{2009}567\u{2009}890");
+                });
+                ui.end_row();
+
+                ui.label("tab_size");
+                ui.add(DragValue::new(tab_size).range(0.0..=16.0).speed(0.1));
+                ui.end_row();
+
                 if ui.button("Reset").clicked() {
                     *self = Default::default();
                 }
diff --git a/crates/egui/src/text_selection/cursor_range.rs b/crates/egui/src/text_selection/cursor_range.rs
index f0445217f..26678362e 100644
--- a/crates/egui/src/text_selection/cursor_range.rs
+++ b/crates/egui/src/text_selection/cursor_range.rs
@@ -97,12 +97,6 @@ impl CCursorRange {
         }
     }
 
-    #[inline]
-    #[deprecated = "Use `self.sorted_cursors` instead."]
-    pub fn sorted(&self) -> [CCursor; 2] {
-        self.sorted_cursors()
-    }
-
     pub fn slice_str<'s>(&self, text: &'s str) -> &'s str {
         let [min, max] = self.sorted_cursors();
         slice_char_range(text, min.index..max.index)
diff --git a/crates/egui/src/text_selection/label_text_selection.rs b/crates/egui/src/text_selection/label_text_selection.rs
index 1dc825ad3..3df17d17c 100644
--- a/crates/egui/src/text_selection/label_text_selection.rs
+++ b/crates/egui/src/text_selection/label_text_selection.rs
@@ -49,10 +49,15 @@ fn pos_in_galley(galley: &Galley, ccursor: CCursor) -> Pos2 {
 
 impl std::fmt::Debug for WidgetTextCursor {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let Self {
+            widget_id,
+            ccursor,
+            pos: _,
+        } = self;
         f.debug_struct("WidgetTextCursor")
-            .field("widget_id", &self.widget_id.short_debug_format())
-            .field("ccursor", &self.ccursor.index)
-            .finish()
+            .field("widget_id", &widget_id.short_debug_format())
+            .field("ccursor", &ccursor.index)
+            .finish_non_exhaustive()
     }
 }
 
diff --git a/crates/egui/src/text_selection/text_cursor_state.rs b/crates/egui/src/text_selection/text_cursor_state.rs
index 9c9b0a263..b28c699dd 100644
--- a/crates/egui/src/text_selection/text_cursor_state.rs
+++ b/crates/egui/src/text_selection/text_cursor_state.rs
@@ -106,38 +106,26 @@ impl TextCursorState {
 }
 
 fn select_word_at(text: &str, ccursor: CCursor) -> CCursorRange {
-    if ccursor.index == 0 {
-        CCursorRange::two(ccursor, ccursor_next_word(text, ccursor))
-    } else {
-        let it = text.chars();
-        let mut it = it.skip(ccursor.index - 1);
-        if let Some(char_before_cursor) = it.next() {
-            if let Some(char_after_cursor) = it.next() {
-                if is_word_char(char_before_cursor) && is_word_char(char_after_cursor) {
-                    let min = ccursor_previous_word(text, ccursor + 1);
-                    let max = ccursor_next_word(text, min);
-                    CCursorRange::two(min, max)
-                } else if is_word_char(char_before_cursor) {
-                    let min = ccursor_previous_word(text, ccursor);
-                    let max = ccursor_next_word(text, min);
-                    CCursorRange::two(min, max)
-                } else if is_word_char(char_after_cursor) {
-                    let max = ccursor_next_word(text, ccursor);
-                    CCursorRange::two(ccursor, max)
-                } else {
-                    let min = ccursor_previous_word(text, ccursor);
-                    let max = ccursor_next_word(text, ccursor);
-                    CCursorRange::two(min, max)
-                }
-            } else {
-                let min = ccursor_previous_word(text, ccursor);
-                CCursorRange::two(min, ccursor)
-            }
-        } else {
-            let max = ccursor_next_word(text, ccursor);
-            CCursorRange::two(ccursor, max)
-        }
+    if text.is_empty() {
+        return CCursorRange::one(ccursor);
     }
+
+    let line_start = find_line_start(text, ccursor);
+    let line_end = ccursor_next_line(text, line_start);
+
+    let line_range = line_start.index..line_end.index;
+    let current_line_text = slice_char_range(text, line_range.clone());
+
+    let relative_idx = ccursor.index - line_start.index;
+    let relative_ccursor = CCursor::new(relative_idx);
+
+    let min = ccursor_previous_word(current_line_text, relative_ccursor);
+    let max = ccursor_next_word(current_line_text, relative_ccursor);
+
+    CCursorRange::two(
+        CCursor::new(line_start.index + min.index),
+        CCursor::new(line_start.index + max.index),
+    )
 }
 
 fn select_line_at(text: &str, ccursor: CCursor) -> CCursorRange {
@@ -156,13 +144,13 @@ fn select_line_at(text: &str, ccursor: CCursor) -> CCursorRange {
                     let min = ccursor_previous_line(text, ccursor);
                     let max = ccursor_next_line(text, min);
                     CCursorRange::two(min, max)
-                } else if !is_linebreak(char_after_cursor) {
-                    let max = ccursor_next_line(text, ccursor);
-                    CCursorRange::two(ccursor, max)
-                } else {
+                } else if is_linebreak(char_after_cursor) {
                     let min = ccursor_previous_line(text, ccursor);
                     let max = ccursor_next_line(text, ccursor);
                     CCursorRange::two(min, max)
+                } else {
+                    let max = ccursor_next_line(text, ccursor);
+                    CCursorRange::two(ccursor, max)
                 }
             } else {
                 let min = ccursor_previous_line(text, ccursor);
@@ -209,16 +197,20 @@ fn ccursor_previous_line(text: &str, ccursor: CCursor) -> CCursor {
 }
 
 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);
+    let mut current_char_idx = 0;
+
+    for (_word_byte_index, word) in text.split_word_bound_indices() {
+        let word_ci = current_char_idx;
 
         // 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;
+        let mut word_char_count = 0;
+        for chr in word.chars() {
+            let dot_ci = word_ci + word_char_count;
             if chr == '.' && cursor_ci < dot_ci {
                 return dot_ci;
             }
+            word_char_count += 1;
         }
 
         // Splitting considers contiguous whitespace as one word, such words must be skipped,
@@ -228,9 +220,11 @@ fn next_word_boundary_char_index(text: &str, cursor_ci: usize) -> usize {
         if cursor_ci < word_ci && !all_word_chars(word) {
             return word_ci;
         }
+
+        current_char_idx += word_char_count;
     }
 
-    char_index_from_byte_index(text, text.len())
+    current_char_idx
 }
 
 fn all_word_chars(text: &str) -> bool {
@@ -265,22 +259,14 @@ fn is_linebreak(c: char) -> bool {
 
 /// Accepts and returns character offset (NOT byte offset!).
 pub fn find_line_start(text: &str, current_index: CCursor) -> CCursor {
-    // We know that new lines, '\n', are a single byte char, but we have to
-    // work with char offsets because before the new line there may be any
-    // number of multi byte chars.
-    // We need to know the char index to be able to correctly set the cursor
-    // later.
-    let chars_count = text.chars().count();
+    let byte_idx = byte_index_from_char_index(text, current_index.index);
+    let text_before = &text[..byte_idx];
 
-    let position = text
-        .chars()
-        .rev()
-        .skip(chars_count - current_index.index)
-        .position(|x| x == '\n');
-
-    match position {
-        Some(pos) => CCursor::new(current_index.index - pos),
-        None => CCursor::new(0),
+    if let Some(last_newline_byte) = text_before.rfind('\n') {
+        let char_idx = char_index_from_byte_index(text, last_newline_byte + 1);
+        CCursor::new(char_idx)
+    } else {
+        CCursor::new(0)
     }
 }
 
@@ -329,7 +315,7 @@ pub fn cursor_rect(galley: &Galley, cursor: &CCursor, row_height: f32) -> Rect {
 
 #[cfg(test)]
 mod test {
-    use crate::text_selection::text_cursor_state::next_word_boundary_char_index;
+    use super::*;
 
     #[test]
     fn test_next_word_boundary_char_index() {
@@ -366,4 +352,117 @@ mod test {
         assert_eq!(next_word_boundary_char_index(text, 19), 20);
         assert_eq!(next_word_boundary_char_index(text, 20), 21);
     }
+
+    #[test]
+    fn test_previous_word() {
+        let text = "abc def ghi";
+        assert_eq!(ccursor_previous_word(text, CCursor::new(7)).index, 4);
+        assert_eq!(ccursor_previous_word(text, CCursor::new(5)).index, 4);
+        assert_eq!(ccursor_previous_word(text, CCursor::new(4)).index, 0);
+        assert_eq!(ccursor_previous_word(text, CCursor::new(0)).index, 0);
+    }
+
+    #[test]
+    fn test_next_word() {
+        let text = "abc def ghi";
+        assert_eq!(ccursor_next_word(text, CCursor::new(0)).index, 3);
+        assert_eq!(ccursor_next_word(text, CCursor::new(3)).index, 7);
+        assert_eq!(ccursor_next_word(text, CCursor::new(7)).index, 11);
+        assert_eq!(ccursor_next_word(text, CCursor::new(11)).index, 11);
+    }
+
+    #[test]
+    fn test_select_word_at() {
+        // CCursorRange::two(min, max) sets primary=max, secondary=min
+        let text = "hello world";
+        let range = select_word_at(text, CCursor::new(2));
+        let (lo, hi) = (
+            range.primary.index.min(range.secondary.index),
+            range.primary.index.max(range.secondary.index),
+        );
+        assert_eq!(lo, 0);
+        assert_eq!(hi, 5);
+
+        let range = select_word_at(text, CCursor::new(8));
+        let (lo, hi) = (
+            range.primary.index.min(range.secondary.index),
+            range.primary.index.max(range.secondary.index),
+        );
+        assert_eq!(lo, 6);
+        assert_eq!(hi, 11);
+    }
+
+    #[test]
+    fn test_word_boundary_large_text_performance() {
+        // Before the O(n²) → O(n) fix, this would take minutes on large text.
+        let large_text = "word ".repeat(200_000); // ~1MB
+        let len = large_text.chars().count();
+
+        let start = std::time::Instant::now();
+
+        let next = ccursor_next_word(&large_text, CCursor::new(len - 10));
+        assert!(next.index <= len);
+
+        let prev = ccursor_previous_word(&large_text, CCursor::new(len - 10));
+        assert!(prev.index < len);
+
+        let range = select_word_at(&large_text, CCursor::new(len - 3));
+        let lo = range.primary.index.min(range.secondary.index);
+        let hi = range.primary.index.max(range.secondary.index);
+        assert!(lo < hi, "Expected a non-empty word selection");
+
+        let elapsed = start.elapsed();
+        assert!(
+            elapsed.as_secs() < 5,
+            "Word boundary operations on 1MB text took {elapsed:?}, expected < 5s"
+        );
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_previous_word_graphemes() {
+        let cases = [
+            ("", 0, 0),
+            ("hello", 0, 0),
+            ("hello", "hello".chars().count(), 0),
+            ("hello world", 6, 0),
+            ("hello world", 8, 6),
+            ("hello world", "hello world".chars().count(), 6),
+            ("hello world   ", "hello world   ".chars().count(), 6),
+            ("hello   world", "hello   world".chars().count(), 8),
+            ("   ", "   ".chars().count(), 0),
+            ("hello, world", "hello, world".chars().count(), 7),
+            ("www.example.com", "www.example.com".chars().count(), 12),
+            ("안녕! 😊 세상", 8, 6),
+            ("❤️👍 skvělá knihovna 👍❤️", 18, 11),
+            (
+                "a e\u{301} b",
+                "a e\u{301} b".chars().count(),
+                "a e\u{301} ".chars().count(),
+            ),
+            (
+                "hi 🙂 world",
+                "hi 🙂 world".chars().count(),
+                "hi 🙂 ".chars().count(),
+            ),
+            (
+                "hi 👨‍👩‍👧‍👦 world",
+                "hi 👨‍👩‍👧‍👦 world".chars().count(),
+                "hi 👨‍👩‍👧‍👦 ".chars().count(),
+            ),
+        ];
+
+        for (text, cursor, expected) in cases {
+            let result = ccursor_previous_word(text, CCursor::new(cursor));
+            assert_eq!(
+                result.index, expected,
+                "text={text:?}, cursor={cursor}, got={}, expected={expected}",
+                result.index
+            );
+        }
+    }
 }
diff --git a/crates/egui/src/text_selection/visuals.rs b/crates/egui/src/text_selection/visuals.rs
index e41d7a436..e114ddb55 100644
--- a/crates/egui/src/text_selection/visuals.rs
+++ b/crates/egui/src/text_selection/visuals.rs
@@ -61,7 +61,7 @@ pub fn paint_text_selection(
             let last_glyph_index = if ri == max.row {
                 max.column
             } else {
-                row.glyphs.len() - 1
+                row.glyphs.len()
             };
 
             let first_vertex_index = row
diff --git a/crates/egui/src/ui.rs b/crates/egui/src/ui.rs
index 2c10f199b..9e7208fc3 100644
--- a/crates/egui/src/ui.rs
+++ b/crates/egui/src/ui.rs
@@ -3,12 +3,10 @@
 
 use std::{any::Any, hash::Hash, ops::Deref, sync::Arc};
 
-use emath::GuiRounding as _;
-use epaint::mutex::RwLock;
-
 use crate::containers::menu;
 use crate::widget_style::{HasClasses as _, ROOT_CLASS};
 use crate::{containers::*, ecolor::*, layout::*, placer::Placer, widgets::*, *};
+use emath::GuiRounding as _;
 // ----------------------------------------------------------------------------
 
 /// This is what you use to place widgets.
@@ -76,10 +74,6 @@ pub struct Ui {
     /// where we size up the contents of the Ui, without actually showing it.
     sizing_pass: bool,
 
-    /// Indicates whether this Ui belongs to a Menu.
-    #[expect(deprecated)]
-    menu_state: Option<Arc<RwLock<crate::menu::MenuState>>>,
-
     /// The [`UiStack`] for this [`Ui`].
     stack: Arc<UiStack>,
 
@@ -162,7 +156,6 @@ impl Ui {
             placer,
             enabled: true,
             sizing_pass,
-            menu_state: None,
             stack: Arc::new(ui_stack),
             sense,
             min_rect_already_remembered: false,
@@ -178,6 +171,7 @@ impl Ui {
         ui.ctx().create_widget(
             WidgetRect {
                 id: ui.unique_id,
+                parent_id: ui.id,
                 layer_id: ui.layer_id(),
                 rect: start_rect,
                 interact_rect: start_rect,
@@ -202,47 +196,6 @@ impl Ui {
         ui
     }
 
-    /// Create a new [`Ui`] at a specific region.
-    ///
-    /// Note: calling this function twice from the same [`Ui`] will create a conflict of id. Use
-    /// [`Self::scope`] if needed.
-    ///
-    /// When in doubt, use `None` for the `UiStackInfo` argument.
-    #[deprecated = "Use ui.new_child() instead"]
-    pub fn child_ui(
-        &mut self,
-        max_rect: Rect,
-        layout: Layout,
-        ui_stack_info: Option<UiStackInfo>,
-    ) -> Self {
-        self.new_child(
-            UiBuilder::new()
-                .max_rect(max_rect)
-                .layout(layout)
-                .ui_stack_info(ui_stack_info.unwrap_or_default()),
-        )
-    }
-
-    /// Create a new [`Ui`] at a specific region with a specific id.
-    ///
-    /// When in doubt, use `None` for the `UiStackInfo` argument.
-    #[deprecated = "Use ui.new_child() instead"]
-    pub fn child_ui_with_id_source(
-        &mut self,
-        max_rect: Rect,
-        layout: Layout,
-        id_salt: impl Hash,
-        ui_stack_info: Option<UiStackInfo>,
-    ) -> Self {
-        self.new_child(
-            UiBuilder::new()
-                .id_salt(id_salt)
-                .max_rect(max_rect)
-                .layout(layout)
-                .ui_stack_info(ui_stack_info.unwrap_or_default()),
-        )
-    }
-
     /// Create a child `Ui` with the properties of the given builder.
     ///
     /// This is a very low-level function.
@@ -327,7 +280,6 @@ impl Ui {
             placer,
             enabled,
             sizing_pass,
-            menu_state: self.menu_state.clone(),
             stack: Arc::new(ui_stack),
             sense,
             min_rect_already_remembered: false,
@@ -347,6 +299,7 @@ impl Ui {
         child_ui.ctx().create_widget(
             WidgetRect {
                 id: child_ui.unique_id,
+                parent_id: self.id,
                 layer_id: child_ui.layer_id(),
                 rect: start_rect,
                 interact_rect: start_rect,
@@ -368,18 +321,6 @@ impl Ui {
 
     // -------------------------------------------------
 
-    /// Set to true in special cases where we do one frame
-    /// where we size up the contents of the Ui, without actually showing it.
-    ///
-    /// This will also turn the Ui invisible.
-    /// Should be called right after [`Self::new`], if at all.
-    #[inline]
-    #[deprecated = "Use UiBuilder.sizing_pass().invisible()"]
-    pub fn set_sizing_pass(&mut self) {
-        self.sizing_pass = true;
-        self.set_invisible();
-    }
-
     /// Set to true in special cases where we do one frame
     /// where we size up the contents of the Ui, without actually showing it.
     #[inline]
@@ -418,7 +359,7 @@ impl Ui {
 
     /// Style options for this [`Ui`] and its children.
     ///
-    /// Note that this may be a different [`Style`] than that of [`Context::style`].
+    /// Note that this may be a different [`Style`] than that of [`Context::global_style`].
     #[inline]
     pub fn style(&self) -> &Arc<Style> {
         &self.style
@@ -493,6 +434,12 @@ impl Ui {
         &mut self.style_mut().visuals
     }
 
+    /// Is this [`Ui`] in a tooltip?
+    #[inline]
+    pub fn is_tooltip(&self) -> bool {
+        self.layer_id().order == Order::Tooltip
+    }
+
     /// Get a reference to this [`Ui`]'s [`UiStack`].
     #[inline]
     pub fn stack(&self) -> &Arc<UiStack> {
@@ -554,33 +501,6 @@ impl Ui {
         }
     }
 
-    /// Calling `set_enabled(false)` will cause the [`Ui`] to deny all future interaction
-    /// and all the widgets will draw with a gray look.
-    ///
-    /// Usually it is more convenient to use [`Self::add_enabled_ui`] or [`Self::add_enabled`].
-    ///
-    /// Calling `set_enabled(true)` has no effect - it will NOT re-enable the [`Ui`] once disabled.
-    ///
-    /// ### Example
-    /// ```
-    /// # egui::__run_test_ui(|ui| {
-    /// # let mut enabled = true;
-    /// ui.group(|ui| {
-    ///     ui.checkbox(&mut enabled, "Enable subsection");
-    ///     ui.set_enabled(enabled);
-    ///     if ui.button("Button that is not always clickable").clicked() {
-    ///         /* … */
-    ///     }
-    /// });
-    /// # });
-    /// ```
-    #[deprecated = "Use disable(), add_enabled_ui(), or add_enabled() instead"]
-    pub fn set_enabled(&mut self, enabled: bool) {
-        if !enabled {
-            self.disable();
-        }
-    }
-
     /// If `false`, any widgets added to the [`Ui`] will be invisible and non-interactive.
     ///
     /// This is `false` if any parent had [`UiBuilder::invisible`]
@@ -597,7 +517,7 @@ impl Ui {
     ///
     /// Once invisible, there is no way to make the [`Ui`] visible again.
     ///
-    /// Usually it is more convenient to use [`Self::add_visible_ui`] or [`Self::add_visible`].
+    /// Usually it is more convenient to use [`Self::add_visible`].
     ///
     /// ### Example
     /// ```
@@ -619,34 +539,6 @@ impl Ui {
         self.disable();
     }
 
-    /// Calling `set_visible(false)` will cause all further widgets to be invisible,
-    /// yet still allocate space.
-    ///
-    /// The widgets will not be interactive (`set_visible(false)` implies `set_enabled(false)`).
-    ///
-    /// Calling `set_visible(true)` has no effect.
-    ///
-    /// ### Example
-    /// ```
-    /// # egui::__run_test_ui(|ui| {
-    /// # let mut visible = true;
-    /// ui.group(|ui| {
-    ///     ui.checkbox(&mut visible, "Show subsection");
-    ///     ui.set_visible(visible);
-    ///     if ui.button("Button that is not always shown").clicked() {
-    ///         /* … */
-    ///     }
-    /// });
-    /// # });
-    /// ```
-    #[deprecated = "Use set_invisible(), add_visible_ui(), or add_visible() instead"]
-    pub fn set_visible(&mut self, visible: bool) {
-        if !visible {
-            self.painter.set_invisible();
-            self.disable();
-        }
-    }
-
     /// Make the widget in this [`Ui`] semi-transparent.
     ///
     /// `opacity` must be between 0.0 and 1.0, where 0.0 means fully transparent (i.e., invisible)
@@ -694,17 +586,8 @@ impl Ui {
     ///
     /// This is determined first by [`Style::wrap_mode`], and then by the layout of this [`Ui`].
     pub fn wrap_mode(&self) -> TextWrapMode {
-        #[expect(deprecated)]
         if let Some(wrap_mode) = self.style.wrap_mode {
             wrap_mode
-        }
-        // `wrap` handling for backward compatibility
-        else if let Some(wrap) = self.style.wrap {
-            if wrap {
-                TextWrapMode::Wrap
-            } else {
-                TextWrapMode::Extend
-            }
         } else if let Some(grid) = self.placer.grid() {
             if grid.wrap_text() {
                 TextWrapMode::Wrap
@@ -721,14 +604,6 @@ impl Ui {
         }
     }
 
-    /// Should text wrap in this [`Ui`]?
-    ///
-    /// This is determined first by [`Style::wrap_mode`], and then by the layout of this [`Ui`].
-    #[deprecated = "Use `wrap_mode` instead"]
-    pub fn wrap_text(&self) -> bool {
-        self.wrap_mode() == TextWrapMode::Wrap
-    }
-
     /// How to vertically align text
     #[inline]
     pub fn text_valign(&self) -> Align {
@@ -1051,6 +926,7 @@ impl Ui {
         self.ctx().create_widget(
             WidgetRect {
                 id,
+                parent_id: self.id,
                 layer_id: self.layer_id(),
                 rect,
                 interact_rect: self.clip_rect().intersect(rect),
@@ -1062,18 +938,6 @@ impl Ui {
         )
     }
 
-    /// Deprecated: use [`Self::interact`] instead.
-    #[deprecated = "The contains_pointer argument is ignored. Use `ui.interact` instead."]
-    pub fn interact_with_hovered(
-        &self,
-        rect: Rect,
-        _contains_pointer: bool,
-        id: Id,
-        sense: Sense,
-    ) -> Response {
-        self.interact(rect, id, sense)
-    }
-
     /// Read the [`Ui`]'s background [`Response`].
     /// Its [`Sense`] will be based on the [`UiBuilder::sense`] used to create this [`Ui`].
     ///
@@ -1085,7 +949,7 @@ impl Ui {
     pub fn response(&self) -> Response {
         // This is the inverse of Context::read_response. We prefer a response
         // based on last frame's widget rect since the one from this frame is Rect::NOTHING until
-        // Ui::interact_bg is called or the Ui is dropped.
+        // Ui::remember_min_rect is called or the Ui is dropped.
         let mut response = self
             .ctx()
             .viewport(|viewport| {
@@ -1120,6 +984,7 @@ impl Ui {
         let mut response = self.ctx().create_widget(
             WidgetRect {
                 id: self.unique_id,
+                parent_id: self.id,
                 layer_id: self.layer_id(),
                 rect: self.min_rect(),
                 interact_rect: self.clip_rect().intersect(self.min_rect()),
@@ -1135,16 +1000,6 @@ impl Ui {
         response
     }
 
-    /// Interact with the background of this [`Ui`],
-    /// i.e. behind all the widgets.
-    ///
-    /// The rectangle of the [`Response`] (and interactive area) will be [`Self::min_rect`].
-    #[deprecated = "Use UiBuilder::sense with Ui::response instead"]
-    pub fn interact_bg(&self, sense: Sense) -> Response {
-        // This will update the WidgetRect that was first created in `Ui::new`.
-        self.interact(self.min_rect(), self.unique_id, sense)
-    }
-
     /// Is the pointer (mouse/touch) above this rectangle in this [`Ui`]?
     ///
     /// The `clip_rect` and layer of this [`Ui`] will be respected, so, for instance,
@@ -1289,7 +1144,7 @@ impl Ui {
     pub fn allocate_response(&mut self, desired_size: Vec2, sense: Sense) -> Response {
         let (id, rect) = self.allocate_space(desired_size);
         let mut response = self.interact(rect, id, sense);
-        response.intrinsic_size = Some(desired_size);
+        response.set_intrinsic_size(desired_size);
         response
     }
 
@@ -1497,34 +1352,6 @@ impl Ui {
         )
     }
 
-    /// Allocated the given rectangle and then adds content to that rectangle.
-    ///
-    /// If the contents overflow, more space will be allocated.
-    /// When finished, the amount of space actually used (`min_rect`) will be allocated.
-    /// So you can request a lot of space and then use less.
-    #[deprecated = "Use `allocate_new_ui` instead"]
-    pub fn allocate_ui_at_rect<R>(
-        &mut self,
-        max_rect: Rect,
-        add_contents: impl FnOnce(&mut Self) -> R,
-    ) -> InnerResponse<R> {
-        self.scope_builder(UiBuilder::new().max_rect(max_rect), add_contents)
-    }
-
-    /// Allocated space (`UiBuilder::max_rect`) and then add content to it.
-    ///
-    /// If the contents overflow, more space will be allocated.
-    /// When finished, the amount of space actually used (`min_rect`) will be allocated in the parent.
-    /// So you can request a lot of space and then use less.
-    #[deprecated = "Use `scope_builder` instead"]
-    pub fn allocate_new_ui<R>(
-        &mut self,
-        ui_builder: UiBuilder,
-        add_contents: impl FnOnce(&mut Self) -> R,
-    ) -> InnerResponse<R> {
-        self.scope_dyn(ui_builder, Box::new(add_contents))
-    }
-
     /// Convenience function to get a region to paint on.
     ///
     /// Note that egui uses screen coordinates for everything.
@@ -1815,7 +1642,7 @@ impl Ui {
     /// If you call `add_visible` from within an already invisible [`Ui`],
     /// the widget will always be invisible, even if the `visible` argument is true.
     ///
-    /// See also [`Self::add_visible_ui`], [`Self::set_visible`] and [`Self::is_visible`].
+    /// See also [`Self::set_invisible`] and [`Self::is_visible`].
     ///
     /// ```
     /// # egui::__run_test_ui(|ui| {
@@ -1840,38 +1667,6 @@ impl Ui {
         }
     }
 
-    /// Add a section that is possibly invisible, i.e. greyed out and non-interactive.
-    ///
-    /// An invisible ui still takes up the same space as if it were visible.
-    ///
-    /// If you call `add_visible_ui` from within an already invisible [`Ui`],
-    /// the result will always be invisible, even if the `visible` argument is true.
-    ///
-    /// See also [`Self::add_visible`], [`Self::set_visible`] and [`Self::is_visible`].
-    ///
-    /// ### Example
-    /// ```
-    /// # egui::__run_test_ui(|ui| {
-    /// # let mut visible = true;
-    /// ui.checkbox(&mut visible, "Show subsection");
-    /// ui.add_visible_ui(visible, |ui| {
-    ///     ui.label("Maybe you see this, maybe you don't!");
-    /// });
-    /// # });
-    /// ```
-    #[deprecated = "Use 'ui.scope_builder' instead"]
-    pub fn add_visible_ui<R>(
-        &mut self,
-        visible: bool,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> InnerResponse<R> {
-        let mut ui_builder = UiBuilder::new();
-        if !visible {
-            ui_builder = ui_builder.invisible();
-        }
-        self.scope_builder(ui_builder, add_contents)
-    }
-
     /// Add extra space before the next widget.
     ///
     /// The direction is dependent on the layout.
@@ -2379,21 +2174,6 @@ impl Ui {
         self.scope_dyn(UiBuilder::new().id_salt(id_salt), Box::new(add_contents))
     }
 
-    /// Push another level onto the [`UiStack`].
-    ///
-    /// You can use this, for instance, to tag a group of widgets.
-    #[deprecated = "Use 'ui.scope_builder' instead"]
-    pub fn push_stack_info<R>(
-        &mut self,
-        ui_stack_info: UiStackInfo,
-        add_contents: impl FnOnce(&mut Ui) -> R,
-    ) -> InnerResponse<R> {
-        self.scope_dyn(
-            UiBuilder::new().ui_stack_info(ui_stack_info),
-            Box::new(add_contents),
-        )
-    }
-
     /// Create a scoped child ui.
     ///
     /// You can use this to temporarily change the [`Style`] of a sub-region, for instance:
@@ -2434,26 +2214,6 @@ impl Ui {
         InnerResponse::new(ret, response)
     }
 
-    /// Redirect shapes to another paint layer.
-    ///
-    /// ```
-    /// # use egui::{LayerId, Order, Id};
-    /// # egui::__run_test_ui(|ui| {
-    /// let layer_id = LayerId::new(Order::Tooltip, Id::new("my_floating_ui"));
-    /// ui.with_layer_id(layer_id, |ui| {
-    ///     ui.label("This is now in a different layer");
-    /// });
-    /// # });
-    /// ```
-    #[deprecated = "Use ui.scope_builder(UiBuilder::new().layer_id(…), …) instead"]
-    pub fn with_layer_id<R>(
-        &mut self,
-        layer_id: LayerId,
-        add_contents: impl FnOnce(&mut Self) -> R,
-    ) -> InnerResponse<R> {
-        self.scope_builder(UiBuilder::new().layer_id(layer_id), add_contents)
-    }
-
     /// A [`CollapsingHeader`] that starts out collapsed.
     ///
     /// The name must be unique within the current parent,
@@ -3007,22 +2767,6 @@ impl Ui {
 
 /// # Menus
 impl Ui {
-    /// Close the menu we are in (including submenus), if any.
-    ///
-    /// See also: [`Self::menu_button`] and [`Response::context_menu`].
-    #[deprecated = "Use `ui.close()` or `ui.close_kind(UiKind::Menu)` instead"]
-    pub fn close_menu(&self) {
-        self.close_kind(UiKind::Menu);
-    }
-
-    #[expect(deprecated)]
-    pub(crate) fn set_menu_state(
-        &mut self,
-        menu_state: Option<Arc<RwLock<crate::menu::MenuState>>>,
-    ) {
-        self.menu_state = menu_state;
-    }
-
     #[inline]
     /// Create a menu button that when clicked will show the given menu.
     ///
diff --git a/crates/egui/src/ui_stack.rs b/crates/egui/src/ui_stack.rs
index 4263e9e3e..f43834dba 100644
--- a/crates/egui/src/ui_stack.rs
+++ b/crates/egui/src/ui_stack.rs
@@ -2,6 +2,8 @@ use std::sync::Arc;
 use std::{any::Any, iter::FusedIterator};
 
 use crate::widget_style::Classes;
+use epaint::Color32;
+
 use crate::{Direction, Frame, Id, Rect};
 
 /// What kind is this [`crate::Ui`]?
@@ -255,6 +257,25 @@ impl UiStack {
     pub fn has_visible_frame(&self) -> bool {
         !self.info.frame.stroke.is_empty()
     }
+
+    /// The background color of this [`crate::Ui`].
+    ///
+    /// This blend together all [`Frame::fill`] colors
+    /// up to the root.
+    #[inline]
+    pub fn bg_color(&self) -> Color32 {
+        let mut total = Color32::TRANSPARENT;
+        for node in self.iter() {
+            let fill = node.frame().fill;
+            if fill != Color32::TRANSPARENT {
+                total = fill.blend(total);
+                if total.is_opaque() {
+                    break;
+                }
+            }
+        }
+        total
+    }
 }
 
 // these methods act on the entire stack
diff --git a/crates/egui/src/util/id_type_map.rs b/crates/egui/src/util/id_type_map.rs
index b1312a1da..76f0da5d7 100644
--- a/crates/egui/src/util/id_type_map.rs
+++ b/crates/egui/src/util/id_type_map.rs
@@ -4,7 +4,6 @@
 // This will also allow users to pick their own serialization format per type.
 
 use std::{any::Any, sync::Arc};
-
 // -----------------------------------------------------------------------------------------------
 
 /// Like [`std::any::TypeId`], but can be serialized and deserialized.
@@ -182,6 +181,18 @@ impl Element {
         }
     }
 
+    pub fn is_temp(&self) -> bool {
+        match self {
+            #[cfg(feature = "persistence")]
+            Self::Value { serialize_fn, .. } => serialize_fn.is_none(),
+
+            #[cfg(not(feature = "persistence"))]
+            Self::Value { .. } => true,
+
+            Self::Serialized(_) => false,
+        }
+    }
+
     #[inline]
     pub(crate) fn get_temp<T: 'static>(&self) -> Option<&T> {
         match self {
@@ -316,6 +327,41 @@ fn from_ron_str<T: serde::de::DeserializeOwned>(ron: &str) -> Option<T> {
 
 use crate::Id;
 
+/// The key used in [`IdTypeMap`], which is a combination of an [`Id`] and a [`TypeId`].
+///
+/// This key can be used to remove or access values in the [`IdTypeMap`] without
+/// knowledge of the `TypeId` `T` that is required for other accessors.
+///
+/// [`RawKey`]s make no guarantees about layout or their ability to be persisted.
+/// They only produce deterministic results if they are used with the map
+/// they were initially obtained from. Using them on other instances of [`IdTypeMap`]
+/// may produce unexpected behavior.
+#[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
+#[repr(transparent)]
+pub struct RawKey(u64);
+
+impl nohash_hasher::IsEnabled for RawKey {}
+
+impl RawKey {
+    /// Create a new key for the given type.
+    ///
+    /// Note that two keys with the same id but different types
+    /// will be different keys.
+    ///
+    /// ```
+    /// use egui::{Id, util::id_type_map::RawKey};
+    /// assert_ne!(
+    ///     RawKey::new::<i32>(Id::NULL),
+    ///     RawKey::new::<String>(Id::NULL),
+    /// );
+    /// ```
+    #[inline(always)]
+    pub fn new<T: 'static>(id: Id) -> Self {
+        let type_id = TypeId::of::<T>();
+        Self(type_id.value() ^ id.value())
+    }
+}
+
 // TODO(emilk): make IdTypeMap generic over the key (`Id`), and make a library of IdTypeMap.
 /// Stores values identified by an [`Id`] AND the [`std::any::TypeId`] of the value.
 ///
@@ -358,7 +404,7 @@ use crate::Id;
 #[derive(Clone, Debug)]
 // We use `id XOR typeid` as a key, so we don't need to hash again!
 pub struct IdTypeMap {
-    map: nohash_hasher::IntMap<u64, Element>,
+    map: nohash_hasher::IntMap<RawKey, Element>,
 
     max_bytes_per_type: usize,
 }
@@ -375,16 +421,23 @@ impl Default for IdTypeMap {
 impl IdTypeMap {
     /// Insert a value that will not be persisted.
     #[inline]
-    pub fn insert_temp<T: 'static + Any + Clone + Send + Sync>(&mut self, id: Id, value: T) {
-        let hash = hash(TypeId::of::<T>(), id);
-        self.map.insert(hash, Element::new_temp(value));
+    pub fn insert_temp<T: 'static + Any + Clone + Send + Sync>(
+        &mut self,
+        id: Id,
+        value: T,
+    ) -> RawKey {
+        let key = RawKey::new::<T>(id);
+        self.map.insert(key, Element::new_temp(value));
+        key
     }
 
     /// Insert a value that will be persisted next time you start the app.
     #[inline]
     pub fn insert_persisted<T: SerializableAny>(&mut self, id: Id, value: T) {
-        let hash = hash(TypeId::of::<T>(), id);
-        self.map.insert(hash, Element::new_persisted(value));
+        let key = RawKey::new::<T>(id);
+        self.map.insert(key, Element::new_persisted(value));
+        // We don't yet return the key here, because currently all our `raw`
+        // methods are only for temporary values.
     }
 
     /// Read a value without trying to deserialize a persisted value.
@@ -392,8 +445,28 @@ impl IdTypeMap {
     /// The call clones the value (if found), so make sure it is cheap to clone!
     #[inline]
     pub fn get_temp<T: 'static + Clone>(&self, id: Id) -> Option<T> {
-        let hash = hash(TypeId::of::<T>(), id);
-        self.map.get(&hash).and_then(|x| x.get_temp()).cloned()
+        let key = RawKey::new::<T>(id);
+        self.map.get(&key).and_then(|x| x.get_temp()).cloned()
+    }
+
+    /// Gets a reference to a value for a given raw key.
+    ///
+    /// Serialized values are ignored.
+    pub fn get_temp_raw(&self, raw: RawKey) -> Option<&(dyn Any + Send + Sync)> {
+        match self.map.get(&raw)? {
+            Element::Value { value, .. } => Some(value.as_ref()),
+            Element::Serialized(_) => None,
+        }
+    }
+
+    /// Gets a mutable reference to a value for a given raw key.
+    ///
+    /// Serialized values are ignored.
+    pub fn get_temp_raw_mut(&mut self, raw: RawKey) -> Option<&mut (dyn Any + Send + Sync)> {
+        match self.map.get_mut(&raw)? {
+            Element::Value { value, .. } => Some(value.as_mut()),
+            Element::Serialized(_) => None,
+        }
     }
 
     /// Read a value, optionally deserializing it if available.
@@ -404,9 +477,9 @@ impl IdTypeMap {
     /// The call clones the value (if found), so make sure it is cheap to clone!
     #[inline]
     pub fn get_persisted<T: SerializableAny>(&mut self, id: Id) -> Option<T> {
-        let hash = hash(TypeId::of::<T>(), id);
+        let key = RawKey::new::<T>(id);
         self.map
-            .get_mut(&hash)
+            .get_mut(&key)
             .and_then(|x| x.get_mut_persisted())
             .cloned()
     }
@@ -443,9 +516,9 @@ impl IdTypeMap {
         id: Id,
         insert_with: impl FnOnce() -> T,
     ) -> &mut T {
-        let hash = hash(TypeId::of::<T>(), id);
+        let key = RawKey::new::<T>(id);
         use std::collections::hash_map::Entry;
-        match self.map.entry(hash) {
+        match self.map.entry(key) {
             Entry::Vacant(vacant) => {
                 // this unwrap will never panic, because we insert correct type right now
                 #[expect(clippy::unwrap_used)]
@@ -465,9 +538,9 @@ impl IdTypeMap {
         id: Id,
         insert_with: impl FnOnce() -> T,
     ) -> &mut T {
-        let hash = hash(TypeId::of::<T>(), id);
+        let key = RawKey::new::<T>(id);
         use std::collections::hash_map::Entry;
-        match self.map.entry(hash) {
+        match self.map.entry(key) {
             Entry::Vacant(vacant) => {
                 // this unwrap will never panic, because we insert correct type right now
                 #[expect(clippy::unwrap_used)]
@@ -486,7 +559,7 @@ impl IdTypeMap {
     #[cfg(feature = "persistence")]
     #[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))?;
+        let element = self.map.get(&RawKey::new::<T>(id))?;
         match element {
             Element::Value { .. } => Some(0),
             Element::Serialized(SerializedElement { generation, .. }) => Some(*generation),
@@ -496,18 +569,33 @@ impl IdTypeMap {
     /// Remove the state of this type and id.
     #[inline]
     pub fn remove<T: 'static>(&mut self, id: Id) {
-        let hash = hash(TypeId::of::<T>(), id);
-        self.map.remove(&hash);
+        let key = RawKey::new::<T>(id);
+        self.map.remove(&key);
     }
 
     /// Remove and fetch the state of this type and id.
     #[inline]
     pub fn remove_temp<T: 'static + Default>(&mut self, id: Id) -> Option<T> {
-        let hash = hash(TypeId::of::<T>(), id);
-        let mut element = self.map.remove(&hash)?;
+        let key = RawKey::new::<T>(id);
+        let mut element = self.map.remove(&key)?;
         Some(std::mem::take(element.get_mut_temp()?))
     }
 
+    /// Remove a temporary value given a raw key.
+    ///
+    /// Serialized values are ignored.
+    pub fn remove_temp_raw(&mut self, raw: RawKey) -> Option<Box<dyn Any + Send + Sync>> {
+        use std::collections::hash_map::Entry;
+        if let Entry::Occupied(e) = self.map.entry(raw)
+            && e.get().is_temp()
+            && let Element::Value { value, .. } = e.remove()
+        {
+            Some(value)
+        } else {
+            None
+        }
+    }
+
     /// Note all state of the given type.
     pub fn remove_by_type<T: 'static>(&mut self) {
         let key = TypeId::of::<T>();
@@ -532,6 +620,18 @@ impl IdTypeMap {
         self.map.len()
     }
 
+    /// Returns all [`RawKey`]s to values in this map.
+    ///
+    /// The returned keys can only be used with this map.
+    ///
+    /// Serializable values will be ignored.
+    pub fn temp_keys(&self) -> impl Iterator<Item = RawKey> {
+        self.map
+            .iter()
+            .filter(|(_, v)| v.is_temp())
+            .map(|(k, _)| *k)
+    }
+
     /// Count how many values are stored but not yet deserialized.
     #[inline]
     pub fn count_serialized(&self) -> usize {
@@ -576,11 +676,6 @@ impl IdTypeMap {
     }
 }
 
-#[inline(always)]
-fn hash(type_id: TypeId, id: Id) -> u64 {
-    type_id.value() ^ id.value()
-}
-
 // ----------------------------------------------------------------------------
 
 /// How [`IdTypeMap`] is persisted.
@@ -613,13 +708,13 @@ impl PersistedMap {
 
         {
             profiling::scope!("gather");
-            for (hash, element) in &map.map {
+            for (key, element) in &map.map {
                 if let Some(element) = element.to_serialize() {
                     let stats = types_map.entry(element.type_id).or_default();
                     stats.num_bytes += element.ron.len();
                     let generation_stats = stats.generations.entry(element.generation).or_default();
                     generation_stats.num_bytes += element.ron.len();
-                    generation_stats.elements.push((*hash, element));
+                    generation_stats.elements.push((key.0, element));
                 } else {
                     // temporary value that shouldn't be serialized
                 }
@@ -659,7 +754,7 @@ impl PersistedMap {
             .into_iter()
             .map(
                 |(
-                    hash,
+                    raw,
                     SerializedElement {
                         type_id,
                         ron,
@@ -667,7 +762,7 @@ impl PersistedMap {
                     },
                 )| {
                     (
-                        hash,
+                        RawKey(raw),
                         Element::Serialized(SerializedElement {
                             type_id,
                             ron,
diff --git a/crates/egui/src/util/mod.rs b/crates/egui/src/util/mod.rs
index de62b9618..ad634d786 100644
--- a/crates/egui/src/util/mod.rs
+++ b/crates/egui/src/util/mod.rs
@@ -8,7 +8,3 @@ pub use id_type_map::IdTypeMap;
 
 pub use epaint::emath::History;
 pub use epaint::util::{hash, hash_with};
-
-/// Deprecated alias for [`crate::cache`].
-#[deprecated = "Use egui::cache instead"]
-pub use crate::cache;
diff --git a/crates/egui/src/viewport.rs b/crates/egui/src/viewport.rs
index ef6ee6c63..ac8704961 100644
--- a/crates/egui/src/viewport.rs
+++ b/crates/egui/src/viewport.rs
@@ -1201,7 +1201,7 @@ impl ViewportCommand {
 
 /// Describes a viewport, i.e. a native window.
 ///
-/// This is returned by [`crate::Context::run`] on each frame, and should be applied
+/// This is returned by [`crate::Context::run_ui`] on each frame, and should be applied
 /// by the integration.
 #[derive(Clone)]
 pub struct ViewportOutput {
diff --git a/crates/egui/src/widget_rect.rs b/crates/egui/src/widget_rect.rs
index a84dde519..b6fc9f7bb 100644
--- a/crates/egui/src/widget_rect.rs
+++ b/crates/egui/src/widget_rect.rs
@@ -17,6 +17,12 @@ pub struct WidgetRect {
     /// You can ensure globally unique ids using [`crate::Ui::push_id`].
     pub id: Id,
 
+    /// The [`Id`] of the parent [`crate::Ui`] that hosts this widget.
+    ///
+    /// Used by debug checks to distinguish true id-instability from
+    /// cascading id shifts caused by a parent Ui's auto-id changing.
+    pub parent_id: Id,
+
     /// What layer the widget is on.
     pub layer_id: LayerId,
 
@@ -46,6 +52,7 @@ impl WidgetRect {
     pub fn transform(self, transform: emath::TSTransform) -> Self {
         let Self {
             id,
+            parent_id,
             layer_id,
             rect,
             interact_rect,
@@ -54,6 +61,7 @@ impl WidgetRect {
         } = self;
         Self {
             id,
+            parent_id,
             layer_id,
             rect: transform * rect,
             interact_rect: transform * interact_rect,
diff --git a/crates/egui/src/widget_text.rs b/crates/egui/src/widget_text.rs
index 8bc88344b..13e8175a0 100644
--- a/crates/egui/src/widget_text.rs
+++ b/crates/egui/src/widget_text.rs
@@ -156,7 +156,7 @@ impl RichText {
     /// Default: 0.0.
     ///
     /// For even text it is recommended you round this to an even number of _pixels_,
-    /// e.g. using [`crate::Painter::round_to_pixel`].
+    /// e.g. using [`emath::GuiRounding`].
     #[inline]
     pub fn extra_letter_spacing(mut self, extra_letter_spacing: f32) -> Self {
         self.extra_letter_spacing = extra_letter_spacing;
@@ -170,7 +170,7 @@ impl RichText {
     /// If `None` (the default), the line height is determined by the font.
     ///
     /// For even text it is recommended you round this to an even number of _pixels_,
-    /// e.g. using [`crate::Painter::round_to_pixel`].
+    /// e.g. using [`emath::GuiRounding`].
     #[inline]
     pub fn line_height(mut self, line_height: Option<f32>) -> Self {
         self.line_height = line_height;
diff --git a/crates/egui/src/widgets/button.rs b/crates/egui/src/widgets/button.rs
index 48dbb98ff..a1526c50e 100644
--- a/crates/egui/src/widgets/button.rs
+++ b/crates/egui/src/widgets/button.rs
@@ -202,12 +202,6 @@ impl<'a> Button<'a> {
         self
     }
 
-    #[inline]
-    #[deprecated = "Renamed to `corner_radius`"]
-    pub fn rounding(self, corner_radius: impl Into<CornerRadius>) -> Self {
-        self.corner_radius(corner_radius)
-    }
-
     /// If true, the tint of the image is multiplied by the widget text color.
     ///
     /// This makes sense for images that are white, that should have the same color as the text color.
@@ -242,6 +236,18 @@ impl<'a> Button<'a> {
         self
     }
 
+    /// Show some text on the left side of the button.
+    #[inline]
+    pub fn left_text(mut self, left_text: impl IntoAtoms<'a>) -> Self {
+        self.layout.push_left(Atom::grow());
+
+        for atom in left_text.into_atoms() {
+            self.layout.push_left(atom);
+        }
+
+        self
+    }
+
     /// Show some text on the right side of the button.
     #[inline]
     pub fn right_text(mut self, right_text: impl IntoAtoms<'a>) -> Self {
@@ -364,6 +370,12 @@ impl<'a> Button<'a> {
             AtomLayoutResponse::empty(prepared.response)
         };
 
+        if let Some(cursor) = ui.visuals().interact_cursor
+            && response.response.hovered()
+        {
+            ui.ctx().set_cursor_icon(cursor);
+        }
+
         response.response.widget_info(|| {
             if let Some(text) = &text {
                 WidgetInfo::labeled(WidgetType::Button, ui.is_enabled(), text)
diff --git a/crates/egui/src/widgets/drag_value.rs b/crates/egui/src/widgets/drag_value.rs
index 1297b614b..bac5c33f4 100644
--- a/crates/egui/src/widgets/drag_value.rs
+++ b/crates/egui/src/widgets/drag_value.rs
@@ -91,16 +91,6 @@ impl<'a> DragValue<'a> {
         self
     }
 
-    /// Sets valid range for the value.
-    ///
-    /// By default all values are clamped to this range, even when not interacted with.
-    /// You can change this behavior by passing `false` to [`Self::clamp_existing_to_range`].
-    #[deprecated = "Use `range` instead"]
-    #[inline]
-    pub fn clamp_range<Num: emath::Numeric>(self, range: RangeInclusive<Num>) -> Self {
-        self.range(range)
-    }
-
     /// Sets valid range for dragging the value.
     ///
     /// By default all values are clamped to this range, even when not interacted with.
@@ -157,12 +147,6 @@ impl<'a> DragValue<'a> {
         self
     }
 
-    #[inline]
-    #[deprecated = "Renamed clamp_existing_to_range"]
-    pub fn clamp_to_range(self, clamp_to_range: bool) -> Self {
-        self.clamp_existing_to_range(clamp_to_range)
-    }
-
     /// Show a prefix before the number, e.g. "x: "
     #[inline]
     pub fn prefix(mut self, prefix: impl IntoAtoms<'a>) -> Self {
@@ -551,7 +535,7 @@ impl Widget for DragValue<'_> {
             if let Some(value_text) = value_text {
                 // We were editing the value as text last frame, but lost focus.
                 // Make sure we applied the last text value:
-                let parsed_value = parse(&custom_parser, &value_text);
+                let parsed_value = parse(custom_parser.as_ref(), &value_text);
                 if let Some(mut parsed_value) = parsed_value {
                     // User edits always clamps:
                     parsed_value = clamp_value_to_range(parsed_value, range.clone());
@@ -591,7 +575,7 @@ impl Widget for DragValue<'_> {
                 response.lost_focus() && !ui.input(|i| i.key_pressed(Key::Escape))
             };
             if update {
-                let parsed_value = parse(&custom_parser, &value_text);
+                let parsed_value = parse(custom_parser.as_ref(), &value_text);
                 if let Some(mut parsed_value) = parsed_value {
                     // User edits always clamps:
                     parsed_value = clamp_value_to_range(parsed_value, range.clone());
@@ -733,8 +717,8 @@ impl Widget for DragValue<'_> {
     }
 }
 
-fn parse(custom_parser: &Option<NumParser<'_>>, value_text: &str) -> Option<f64> {
-    match &custom_parser {
+fn parse(custom_parser: Option<&NumParser<'_>>, value_text: &str) -> Option<f64> {
+    match custom_parser {
         Some(parser) => parser(value_text),
         None => default_parser(value_text),
     }
diff --git a/crates/egui/src/widgets/image.rs b/crates/egui/src/widgets/image.rs
index 8a7c49209..30a5997ec 100644
--- a/crates/egui/src/widgets/image.rs
+++ b/crates/egui/src/widgets/image.rs
@@ -256,18 +256,6 @@ impl<'a> Image<'a> {
         self
     }
 
-    /// Round the corners of the image.
-    ///
-    /// The default is no rounding ([`CornerRadius::ZERO`]).
-    ///
-    /// Due to limitations in the current implementation,
-    /// this will turn off any rotation of the image.
-    #[inline]
-    #[deprecated = "Renamed to `corner_radius`"]
-    pub fn rounding(self, corner_radius: impl Into<CornerRadius>) -> Self {
-        self.corner_radius(corner_radius)
-    }
-
     /// Show a spinner when the image is loading.
     ///
     /// By default this uses the value of [`crate::Visuals::image_loading_spinners`].
diff --git a/crates/egui/src/widgets/image_button.rs b/crates/egui/src/widgets/image_button.rs
deleted file mode 100644
index 752980bb8..000000000
--- a/crates/egui/src/widgets/image_button.rs
+++ /dev/null
@@ -1,164 +0,0 @@
-use crate::{
-    Color32, CornerRadius, Image, Rect, Response, Sense, Ui, Vec2, Widget, WidgetInfo, WidgetType,
-    widgets,
-};
-
-/// A clickable image within a frame.
-#[must_use = "You should put this widget in a ui with `ui.add(widget);`"]
-#[derive(Clone, Debug)]
-#[deprecated(since = "0.33.0", note = "Use egui::Button::image instead")]
-pub struct ImageButton<'a> {
-    pub(crate) image: Image<'a>,
-    sense: Sense,
-    frame: bool,
-    selected: bool,
-    alt_text: Option<String>,
-}
-
-#[expect(deprecated, reason = "Deprecated in egui 0.33.0")]
-impl<'a> ImageButton<'a> {
-    pub fn new(image: impl Into<Image<'a>>) -> Self {
-        Self {
-            image: image.into(),
-            sense: Sense::click(),
-            frame: true,
-            selected: false,
-            alt_text: None,
-        }
-    }
-
-    /// Select UV range. Default is (0,0) in top-left, (1,1) bottom right.
-    #[inline]
-    pub fn uv(mut self, uv: impl Into<Rect>) -> Self {
-        self.image = self.image.uv(uv);
-        self
-    }
-
-    /// Multiply image color with this. Default is WHITE (no tint).
-    #[inline]
-    pub fn tint(mut self, tint: impl Into<Color32>) -> Self {
-        self.image = self.image.tint(tint);
-        self
-    }
-
-    /// If `true`, mark this button as "selected".
-    #[inline]
-    pub fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-
-    /// Turn off the frame
-    #[inline]
-    pub fn frame(mut self, frame: bool) -> Self {
-        self.frame = frame;
-        self
-    }
-
-    /// By default, buttons senses clicks.
-    /// Change this to a drag-button with `Sense::drag()`.
-    #[inline]
-    pub fn sense(mut self, sense: Sense) -> Self {
-        self.sense = sense;
-        self
-    }
-
-    /// Set rounding for the `ImageButton`.
-    ///
-    /// If the underlying image already has rounding, this
-    /// will override that value.
-    #[inline]
-    pub fn corner_radius(mut self, corner_radius: impl Into<CornerRadius>) -> Self {
-        self.image = self.image.corner_radius(corner_radius.into());
-        self
-    }
-
-    /// Set rounding for the `ImageButton`.
-    ///
-    /// If the underlying image already has rounding, this
-    /// will override that value.
-    #[inline]
-    #[deprecated = "Renamed to `corner_radius`"]
-    pub fn rounding(self, corner_radius: impl Into<CornerRadius>) -> Self {
-        self.corner_radius(corner_radius)
-    }
-}
-
-#[expect(deprecated, reason = "Deprecated in egui 0.33.0")]
-impl Widget for ImageButton<'_> {
-    fn ui(self, ui: &mut Ui) -> Response {
-        let padding = if self.frame {
-            // so we can see that it is a button:
-            Vec2::splat(ui.spacing().button_padding.x)
-        } else {
-            Vec2::ZERO
-        };
-
-        let available_size_for_image = ui.available_size() - 2.0 * padding;
-        let tlr = self.image.load_for_size(ui.ctx(), available_size_for_image);
-        let image_source_size = tlr.as_ref().ok().and_then(|t| t.size());
-        let image_size = self
-            .image
-            .calc_size(available_size_for_image, image_source_size);
-
-        let padded_size = image_size + 2.0 * padding;
-        let (rect, response) = ui.allocate_exact_size(padded_size, self.sense);
-        response.widget_info(|| {
-            let mut info = WidgetInfo::new(WidgetType::Button);
-            info.label = self.alt_text.clone();
-            info
-        });
-
-        if ui.is_rect_visible(rect) {
-            let (expansion, rounding, fill, stroke) = if self.selected {
-                let selection = ui.visuals().selection;
-                (
-                    Vec2::ZERO,
-                    self.image.image_options().corner_radius,
-                    selection.bg_fill,
-                    selection.stroke,
-                )
-            } else if self.frame {
-                let visuals = ui.style().interact(&response);
-                let expansion = Vec2::splat(visuals.expansion);
-                (
-                    expansion,
-                    self.image.image_options().corner_radius,
-                    visuals.weak_bg_fill,
-                    visuals.bg_stroke,
-                )
-            } else {
-                Default::default()
-            };
-
-            // Draw frame background (for transparent images):
-            ui.painter()
-                .rect_filled(rect.expand2(expansion), rounding, fill);
-
-            let image_rect = ui
-                .layout()
-                .align_size_within_rect(image_size, rect.shrink2(padding));
-            // let image_rect = image_rect.expand2(expansion); // can make it blurry, so let's not
-            let image_options = self.image.image_options().clone();
-
-            widgets::image::paint_texture_load_result(
-                ui,
-                &tlr,
-                image_rect,
-                None,
-                &image_options,
-                self.alt_text.as_deref(),
-            );
-
-            // Draw frame outline:
-            ui.painter().rect_stroke(
-                rect.expand2(expansion),
-                rounding,
-                stroke,
-                epaint::StrokeKind::Inside,
-            );
-        }
-
-        widgets::image::texture_load_result_response(&self.image.source(ui.ctx()), &tlr, response)
-    }
-}
diff --git a/crates/egui/src/widgets/label.rs b/crates/egui/src/widgets/label.rs
index 284cfd12c..7b2d3a3ba 100644
--- a/crates/egui/src/widgets/label.rs
+++ b/crates/egui/src/widgets/label.rs
@@ -220,7 +220,7 @@ impl Label {
                 .rect_without_leading_space()
                 .translate(pos.to_vec2());
             let mut response = ui.allocate_rect(rect, sense);
-            response.intrinsic_size = Some(galley.intrinsic_size());
+            response.set_intrinsic_size(galley.intrinsic_size());
             for placed_row in galley.rows.iter().skip(1) {
                 let rect = placed_row.rect().translate(pos.to_vec2());
                 response |= ui.allocate_rect(rect, sense);
@@ -256,7 +256,7 @@ impl Label {
 
             let galley = ui.fonts_mut(|fonts| fonts.layout_job(layout_job));
             let (rect, mut response) = ui.allocate_exact_size(galley.size(), sense);
-            response.intrinsic_size = Some(galley.intrinsic_size());
+            response.set_intrinsic_size(galley.intrinsic_size());
             let galley_pos = match galley.job.halign {
                 Align::LEFT => rect.left_top(),
                 Align::Center => rect.center_top(),
diff --git a/crates/egui/src/widgets/mod.rs b/crates/egui/src/widgets/mod.rs
index 617affa0c..21346d64a 100644
--- a/crates/egui/src/widgets/mod.rs
+++ b/crates/egui/src/widgets/mod.rs
@@ -4,7 +4,7 @@
 //! * `ui.add(Label::new("Text").text_color(color::red));`
 //! * `if ui.add(Button::new("Click me")).clicked() { … }`
 
-use crate::{Response, Ui, epaint};
+use crate::{Response, Ui};
 
 mod button;
 mod checkbox;
@@ -12,19 +12,14 @@ pub mod color_picker;
 pub(crate) mod drag_value;
 mod hyperlink;
 mod image;
-mod image_button;
 mod label;
 mod progress_bar;
 mod radio_button;
-mod selected_label;
 mod separator;
 mod slider;
 mod spinner;
 pub mod text_edit;
 
-#[expect(deprecated)]
-pub use self::selected_label::SelectableLabel;
-#[expect(deprecated, reason = "Deprecated in egui 0.33.0")]
 pub use self::{
     button::Button,
     checkbox::Checkbox,
@@ -34,7 +29,6 @@ pub use self::{
         FrameDurations, Image, ImageFit, ImageOptions, ImageSize, ImageSource,
         decode_animated_image_uri, has_gif_magic_header, has_webp_header, paint_texture_at,
     },
-    image_button::ImageButton,
     label::Label,
     progress_bar::ProgressBar,
     radio_button::RadioButton,
@@ -126,14 +120,6 @@ pub fn reset_button_with<T: PartialEq>(ui: &mut Ui, value: &mut T, text: &str, r
 
 // ----------------------------------------------------------------------------
 
-#[deprecated = "Use `ui.add(&mut stroke)` instead"]
-pub fn stroke_ui(ui: &mut crate::Ui, stroke: &mut epaint::Stroke, text: &str) {
-    ui.horizontal(|ui| {
-        ui.label(text);
-        ui.add(stroke);
-    });
-}
-
 /// Show a small button to switch to/from dark/light mode (globally).
 pub fn global_theme_preference_switch(ui: &mut Ui) {
     if let Some(new_theme) = ui.ctx().theme().small_toggle_button(ui) {
@@ -147,15 +133,3 @@ pub fn global_theme_preference_buttons(ui: &mut Ui) {
     theme_preference.radio_buttons(ui);
     ui.ctx().set_theme(theme_preference);
 }
-
-/// Show a small button to switch to/from dark/light mode (globally).
-#[deprecated = "Use global_theme_preference_switch instead"]
-pub fn global_dark_light_mode_switch(ui: &mut Ui) {
-    global_theme_preference_switch(ui);
-}
-
-/// Show larger buttons for switching between light and dark mode (globally).
-#[deprecated = "Use global_theme_preference_buttons instead"]
-pub fn global_dark_light_mode_buttons(ui: &mut Ui) {
-    global_theme_preference_buttons(ui);
-}
diff --git a/crates/egui/src/widgets/progress_bar.rs b/crates/egui/src/widgets/progress_bar.rs
index ced3d994b..444f6088c 100644
--- a/crates/egui/src/widgets/progress_bar.rs
+++ b/crates/egui/src/widgets/progress_bar.rs
@@ -94,12 +94,6 @@ impl ProgressBar {
         self.corner_radius = Some(corner_radius.into());
         self
     }
-
-    #[inline]
-    #[deprecated = "Renamed to `corner_radius`"]
-    pub fn rounding(self, corner_radius: impl Into<CornerRadius>) -> Self {
-        self.corner_radius(corner_radius)
-    }
 }
 
 impl Widget for ProgressBar {
diff --git a/crates/egui/src/widgets/selected_label.rs b/crates/egui/src/widgets/selected_label.rs
deleted file mode 100644
index 536ef43da..000000000
--- a/crates/egui/src/widgets/selected_label.rs
+++ /dev/null
@@ -1,13 +0,0 @@
-#![expect(deprecated, clippy::new_ret_no_self)]
-
-use crate::WidgetText;
-
-#[deprecated = "Use `Button::selectable()` instead"]
-pub struct SelectableLabel {}
-
-impl SelectableLabel {
-    #[deprecated = "Use `Button::selectable()` instead"]
-    pub fn new(selected: bool, text: impl Into<WidgetText>) -> super::Button<'static> {
-        crate::Button::selectable(selected, text)
-    }
-}
diff --git a/crates/egui/src/widgets/slider.rs b/crates/egui/src/widgets/slider.rs
index 69d08c44e..50b0265f1 100644
--- a/crates/egui/src/widgets/slider.rs
+++ b/crates/egui/src/widgets/slider.rs
@@ -79,7 +79,7 @@ pub enum SliderClamping {
 ///
 /// The slider range defines the values you get when pulling the slider to the far edges.
 /// By default all values are clamped to this range, even when not interacted with.
-/// You can change this behavior by passing `false` to [`Slider::clamp_to_range`].
+/// You can change this behavior by passing `false` to [`Slider::clamping`].
 ///
 /// The range can include any numbers, and go from low-to-high or from high-to-low.
 ///
@@ -288,16 +288,6 @@ impl<'a> Slider<'a> {
         self
     }
 
-    #[inline]
-    #[deprecated = "Use `slider.clamping(…) instead"]
-    pub fn clamp_to_range(self, clamp_to_range: bool) -> Self {
-        self.clamping(if clamp_to_range {
-            SliderClamping::Always
-        } else {
-            SliderClamping::Never
-        })
-    }
-
     /// Turn smart aim on/off. Default is ON.
     /// There is almost no point in turning this off.
     #[inline]
@@ -314,7 +304,7 @@ impl<'a> Slider<'a> {
     /// Default: `0.0` (disabled).
     #[inline]
     pub fn step_by(mut self, step: f64) -> Self {
-        self.step = if step != 0.0 { Some(step) } else { None };
+        self.step = if step == 0.0 { None } else { Some(step) };
         self
     }
 
diff --git a/crates/egui/src/widgets/text_edit/builder.rs b/crates/egui/src/widgets/text_edit/builder.rs
index b9fdb1cbe..7cb28d8f8 100644
--- a/crates/egui/src/widgets/text_edit/builder.rs
+++ b/crates/egui/src/widgets/text_edit/builder.rs
@@ -1,19 +1,20 @@
 use std::sync::Arc;
 
 use emath::{Rect, TSTransform};
-use epaint::{
-    StrokeKind,
-    text::{Galley, LayoutJob, cursor::CCursor},
-};
+use epaint::text::{Galley, LayoutJob, TextWrapMode, cursor::CCursor};
 
 use crate::{
-    Align, Align2, Color32, Context, CursorIcon, Event, EventFilter, FontSelection, Id, ImeEvent,
-    Key, KeyboardShortcut, Margin, Modifiers, NumExt as _, Response, Sense, Shape, TextBuffer,
-    TextStyle, TextWrapMode, Ui, Vec2, Widget, WidgetInfo, WidgetText, WidgetWithState, epaint,
+    Align, Align2, AtomExt as _, AtomKind, AtomLayout, Atoms, Color32, Context, CursorIcon, Event,
+    EventFilter, FontSelection, Frame, Id, ImeEvent, IntoAtoms, IntoSizedResult, Key,
+    KeyboardShortcut, Margin, Modifiers, NumExt as _, Response, Sense, SizedAtomKind, TextBuffer,
+    TextStyle, Ui, Vec2, Widget, WidgetInfo, WidgetWithState, epaint,
     os::OperatingSystem,
     output::OutputEvent,
-    response, text_selection,
-    text_selection::{CCursorRange, text_cursor_state::cursor_rect, visuals::paint_text_selection},
+    response,
+    text_edit::state::TextEditCursorPurpose,
+    text_selection::{
+        self, CCursorRange, text_cursor_state::cursor_rect, visuals::paint_text_selection,
+    },
     vec2,
 };
 
@@ -67,15 +68,16 @@ type LayouterFn<'t> = &'t mut dyn FnMut(&Ui, &dyn TextBuffer, f32) -> Arc<Galley
 #[must_use = "You should put this widget in a ui with `ui.add(widget);`"]
 pub struct TextEdit<'t> {
     text: &'t mut dyn TextBuffer,
-    hint_text: WidgetText,
-    hint_text_font: Option<FontSelection>,
+    prefix: Atoms<'static>,
+    suffix: Atoms<'static>,
+    hint_text: Atoms<'static>,
     id: Option<Id>,
     id_salt: Option<Id>,
     font_selection: FontSelection,
     text_color: Option<Color32>,
     layouter: Option<LayouterFn<'t>>,
     password: bool,
-    frame: bool,
+    frame: Option<Frame>,
     margin: Margin,
     multiline: bool,
     interactive: bool,
@@ -120,15 +122,16 @@ impl<'t> TextEdit<'t> {
     pub fn multiline(text: &'t mut dyn TextBuffer) -> Self {
         Self {
             text,
+            prefix: Default::default(),
+            suffix: Default::default(),
             hint_text: Default::default(),
-            hint_text_font: None,
             id: None,
             id_salt: None,
             font_selection: Default::default(),
             text_color: None,
             layouter: None,
             password: false,
-            frame: true,
+            frame: None,
             margin: Margin::symmetric(4, 2),
             multiline: true,
             interactive: true,
@@ -202,8 +205,22 @@ impl<'t> TextEdit<'t> {
     /// # });
     /// ```
     #[inline]
-    pub fn hint_text(mut self, hint_text: impl Into<WidgetText>) -> Self {
-        self.hint_text = hint_text.into();
+    pub fn hint_text(mut self, hint_text: impl IntoAtoms<'static>) -> Self {
+        self.hint_text = hint_text.into_atoms();
+        self
+    }
+
+    /// Add a prefix to the text edit. This will always be shown before the editable text.
+    #[inline]
+    pub fn prefix(mut self, prefix: impl IntoAtoms<'static>) -> Self {
+        self.prefix = prefix.into_atoms();
+        self
+    }
+
+    /// Add a suffix to the text edit. This will always be shown after the editable text.
+    #[inline]
+    pub fn suffix(mut self, suffix: impl IntoAtoms<'static>) -> Self {
+        self.suffix = suffix.into_atoms();
         self
     }
 
@@ -215,13 +232,6 @@ impl<'t> TextEdit<'t> {
         self
     }
 
-    /// Set a specific style for the hint text.
-    #[inline]
-    pub fn hint_text_font(mut self, hint_text_font: impl Into<FontSelection>) -> Self {
-        self.hint_text_font = Some(hint_text_font.into());
-        self
-    }
-
     /// If true, hide the letters from view and prevent copying from the field.
     #[inline]
     pub fn password(mut self, password: bool) -> Self {
@@ -290,10 +300,10 @@ impl<'t> TextEdit<'t> {
         self
     }
 
-    /// Default is `true`. If set to `false` there will be no frame showing that this is editable text!
+    /// Customize the [`Frame`] around the text edit.
     #[inline]
-    pub fn frame(mut self, frame: bool) -> Self {
-        self.frame = frame;
+    pub fn frame(mut self, frame: Frame) -> Self {
+        self.frame = Some(frame);
         self
     }
 
@@ -402,7 +412,7 @@ impl<'t> TextEdit<'t> {
 
 impl Widget for TextEdit<'_> {
     fn ui(self, ui: &mut Ui) -> Response {
-        self.show(ui).response
+        self.show(ui).response.response
     }
 }
 
@@ -423,63 +433,18 @@ impl TextEdit<'_> {
     /// # });
     /// ```
     pub fn show(self, ui: &mut Ui) -> TextEditOutput {
-        let is_mutable = self.text.is_mutable();
-        let frame = self.frame;
-        let where_to_put_background = ui.painter().add(Shape::Noop);
-        let background_color = self
-            .background_color
-            .unwrap_or_else(|| ui.visuals().text_edit_bg_color());
-        let output = self.show_content(ui);
-
-        if frame {
-            let visuals = ui.style().interact(&output.response);
-            let frame_rect = output.response.rect.expand(visuals.expansion);
-            let shape = if is_mutable {
-                if output.response.has_focus() {
-                    epaint::RectShape::new(
-                        frame_rect,
-                        visuals.corner_radius,
-                        background_color,
-                        ui.visuals().selection.stroke,
-                        StrokeKind::Inside,
-                    )
-                } else {
-                    epaint::RectShape::new(
-                        frame_rect,
-                        visuals.corner_radius,
-                        background_color,
-                        visuals.bg_stroke, // TODO(emilk): we want to show something here, or a text-edit field doesn't "pop".
-                        StrokeKind::Inside,
-                    )
-                }
-            } else {
-                let visuals = &ui.style().visuals.widgets.inactive;
-                epaint::RectShape::stroke(
-                    frame_rect,
-                    visuals.corner_radius,
-                    visuals.bg_stroke, // TODO(emilk): we want to show something here, or a text-edit field doesn't "pop".
-                    StrokeKind::Inside,
-                )
-            };
-
-            ui.painter().set(where_to_put_background, shape);
-        }
-
-        output
-    }
-
-    fn show_content(self, ui: &mut Ui) -> TextEditOutput {
         let TextEdit {
             text,
-            hint_text,
-            hint_text_font,
+            prefix,
+            suffix,
+            mut hint_text,
             id,
             id_salt,
             font_selection,
             text_color,
             layouter,
             password,
-            frame: _,
+            frame,
             margin,
             multiline,
             interactive,
@@ -492,7 +457,7 @@ impl TextEdit<'_> {
             clip_text,
             char_limit,
             return_key,
-            background_color: _,
+            background_color,
         } = self;
 
         let text_color = text_color
@@ -501,53 +466,45 @@ impl TextEdit<'_> {
             .unwrap_or_else(|| ui.visuals().widgets.inactive.text_color());
 
         let prev_text = text.as_str().to_owned();
-        let hint_text_str = hint_text.text().to_owned();
+        let hint_text_str = hint_text.text().unwrap_or_default().to_string();
 
         let font_id = font_selection.resolve(ui.style());
         let row_height = ui.fonts_mut(|f| f.row_height(&font_id));
         const MIN_WIDTH: f32 = 24.0; // Never make a [`TextEdit`] more narrow than this.
-        let available_width = (ui.available_width() - margin.sum().x).at_least(MIN_WIDTH);
-        let desired_width = desired_width.unwrap_or_else(|| ui.spacing().text_edit_width);
-        let wrap_width = if ui.layout().horizontal_justify() {
-            available_width
-        } else {
-            desired_width.min(available_width)
-        };
+        let available_width = ui.available_width().at_least(MIN_WIDTH);
+        let desired_width = desired_width
+            .unwrap_or_else(|| ui.spacing().text_edit_width)
+            .at_least(min_size.x);
+        let allocate_width = desired_width.at_most(available_width);
 
         let font_id_clone = font_id.clone();
         let mut default_layouter = move |ui: &Ui, text: &dyn TextBuffer, wrap_width: f32| {
             let text = mask_if_password(password, text.as_str());
-            let layout_job = if multiline {
+            let mut layout_job = if multiline {
                 LayoutJob::simple(text, font_id_clone.clone(), text_color, wrap_width)
             } else {
                 LayoutJob::simple_singleline(text, font_id_clone.clone(), text_color)
             };
+            layout_job.halign = align.x();
+            // We want to keep the trailing whitespace, since hiding it feels really weird when typing
+            layout_job.keep_trailing_whitespace = true;
             ui.fonts_mut(|f| f.layout_job(layout_job))
         };
 
         let layouter = layouter.unwrap_or(&mut default_layouter);
 
-        let mut galley = layouter(ui, text, wrap_width);
-
-        let desired_inner_width = if clip_text {
-            wrap_width // visual clipping with scroll in singleline input.
-        } else {
-            galley.size().x.max(wrap_width)
-        };
-        let desired_height = (desired_height_rows.at_least(1) as f32) * row_height;
-        let desired_inner_size = vec2(desired_inner_width, galley.size().y.max(desired_height));
-        let desired_outer_size = (desired_inner_size + margin.sum()).at_least(min_size);
-        let (auto_id, outer_rect) = ui.allocate_space(desired_outer_size);
-        let rect = outer_rect - margin; // inner rect (excluding frame/margin).
+        let min_inner_height = (desired_height_rows.at_least(1) as f32) * row_height;
 
         let id = id.unwrap_or_else(|| {
             if let Some(id_salt) = id_salt {
                 ui.make_persistent_id(id_salt)
             } else {
-                auto_id // Since we are only storing the cursor a persistent Id is not super important
+                // Since we are only storing the cursor a persistent Id is not super important
+                let id = ui.next_auto_id();
+                ui.skip_ahead_auto_ids(1);
+                id
             }
         });
-        let mut state = TextEditState::load(ui.ctx(), id).unwrap_or_default();
 
         // On touch screens (e.g. mobile in `eframe` web), should
         // dragging select text, or scroll the enclosing [`ScrollArea`] (if any)?
@@ -565,12 +522,221 @@ impl TextEdit<'_> {
         } else {
             Sense::hover()
         };
-        let mut response = ui.interact(outer_rect, id, sense);
-        response.intrinsic_size = Some(Vec2::new(desired_width, desired_outer_size.y));
 
-        // Don't sent `OutputEvent::Clicked` when a user presses the space bar
+        let mut state = TextEditState::load(ui.ctx(), id).unwrap_or_default();
+        let mut cursor_range = None;
+        let mut prev_cursor_range = None;
+
+        let mut text_changed = false;
+        let text_mutable = text.is_mutable();
+
+        let mut handle_events = |ui: &Ui, galley: &mut Arc<Galley>, layouter, wrap_width, text| {
+            if interactive && ui.memory(|mem| mem.has_focus(id)) {
+                ui.memory_mut(|mem| mem.set_focus_lock_filter(id, event_filter));
+
+                let default_cursor_range = if cursor_at_end {
+                    CCursorRange::one(galley.end())
+                } else {
+                    CCursorRange::default()
+                };
+                prev_cursor_range = state.cursor.range(galley);
+
+                let (changed, new_cursor_range) = events(
+                    ui,
+                    &mut state,
+                    text,
+                    galley,
+                    layouter,
+                    id,
+                    wrap_width,
+                    multiline,
+                    password,
+                    default_cursor_range,
+                    char_limit,
+                    event_filter,
+                    return_key,
+                );
+
+                if changed {
+                    text_changed = true;
+                }
+                cursor_range = Some(new_cursor_range);
+            }
+        };
+
+        // We need to calculate the galley within the atom closure, so we can calculate it based on
+        // the available width (in case of wrapping multiline text edits). But we show it later,
+        // so we can clip it to the available size. Thus, extract it from the atom closure here.
+        let mut get_galley = None;
+        let inner_rect_id = Id::new("text_edit_rect");
+        let mut response = {
+            let any_shrink = hint_text.any_shrink();
+            // Ideally we could just do `let mut atoms = prefix` here, but that won't compile
+            // but due to servo/rust-smallvec#146 (also see the comment below).
+            let mut atoms: Atoms<'_> = Atoms::new(());
+
+            // TODO(servo/rust-smallvec#146): Use extend_right instead of the loop once we have
+            // smallvec 2.0. Using `extend_right` here won't compile, due to lifetime issues.
+            for atom in prefix {
+                atoms.push_right(atom);
+            }
+
+            if text.as_str().is_empty() && !hint_text.is_empty() {
+                // Add hint_text (if any):
+                let mut shrunk = any_shrink;
+                let mut first = true;
+
+                // Since we can't set a fallback color per atom, we have to override it here.
+                // Sucks, since it means users won't be able to override it.
+                hint_text.map_texts(|t| t.color(ui.style().visuals.weak_text_color()));
+
+                for mut atom in hint_text {
+                    if !shrunk && matches!(atom.kind, AtomKind::Text(_)) {
+                        // elide the hint_text if needed
+                        atom = atom.atom_shrink(true);
+                        atom = atom.atom_grow(true);
+                        shrunk = true;
+                    }
+
+                    if first {
+                        // The first atom in the hint text gets inner_rect_id, so we can know
+                        // where to paint the cursor
+                        atom = atom.atom_id(inner_rect_id);
+                        first = false;
+                    }
+
+                    // The hint text should be shown left top instead of centered (important for
+                    // multi line text edits)
+                    atoms.push_right(atom.atom_align(Align2::LEFT_TOP));
+                }
+
+                // Calculate the empty galley, so it can be read later. The available width is
+                // technically wrong, but doesn't matter since the galley is empty
+                let available_width = allocate_width - margin.sum().x;
+                let galley = layouter(ui, text, available_width);
+
+                // We can't update the galley immediately here, since it would show both hint text
+                // and the newly typed letter. So we pass a clone instead, and accept having a frame
+                // delay on the very first keystroke.
+                let mut galley_clone = Arc::clone(&galley);
+                handle_events(ui, &mut galley_clone, layouter, available_width, text);
+
+                get_galley = Some(galley);
+            } else {
+                // We need to shrink when clip_text, so that we don't exceed the available size
+                // and thus clip. We also need to shrink in multi line text edits, so text can
+                // wrap appropriately.
+                let should_shrink = clip_text || multiline;
+
+                // We need a closure here, so we can calculate the galley based on the available
+                // width (after adding suffix and prefix), for correct wrapping in multi line text
+                // edits
+                atoms.push_right(
+                    AtomKind::closure(|ui, args| {
+                        let mut galley = layouter(ui, text, args.available_size.x);
+
+                        // Handling events here allows us to update the galley immediately on
+                        // keystrokes, avoiding frame delays, and ensuring the scroll_to within
+                        // ScrollAreas works correctly.
+                        handle_events(ui, &mut galley, layouter, args.available_size.x, text);
+
+                        let intrinsic_size = galley.intrinsic_size();
+                        let mut size = galley.size();
+                        size.y = size.y.at_least(min_inner_height);
+                        if clip_text {
+                            size.x = size.x.at_most(args.available_size.x);
+                        }
+
+                        // We paint the galley later, so we can do clipping and offsetting
+                        get_galley = Some(galley);
+                        IntoSizedResult {
+                            intrinsic_size,
+                            sized: SizedAtomKind::Empty { size: Some(size) },
+                        }
+                    })
+                    .atom_grow(true)
+                    .atom_align(self.align)
+                    .atom_id(inner_rect_id)
+                    .atom_shrink(should_shrink),
+                );
+            }
+
+            // TODO(servo/rust-smallvec#146): Use extend_right instead of the loop once we have
+            // smallvec 2.0. Using `extend_right` here won't compile, due to lifetime issues.
+            for atom in suffix {
+                atoms.push_right(atom);
+            }
+
+            let custom_frame = frame.is_some();
+            let frame = frame.unwrap_or_else(|| Frame::new().inner_margin(margin));
+
+            let min_height = min_inner_height + frame.total_margin().sum().y;
+
+            // This wrap mode only affects the hint_text
+            let wrap_mode = if multiline {
+                TextWrapMode::Wrap
+            } else {
+                TextWrapMode::Truncate
+            };
+
+            let mut allocated = AtomLayout::new(atoms)
+                .id(id)
+                .min_size(Vec2::new(allocate_width, min_height))
+                .max_width(allocate_width)
+                .sense(sense)
+                .frame(frame)
+                .align2(align)
+                .wrap_mode(wrap_mode)
+                .allocate(ui);
+
+            allocated.frame = if custom_frame {
+                allocated.frame
+            } else {
+                let visuals = ui.style().interact(&allocated.response);
+                let background_color =
+                    background_color.unwrap_or_else(|| ui.visuals().text_edit_bg_color());
+
+                let (corner_radius, background_color, stroke) = if text_mutable {
+                    if allocated.response.has_focus() {
+                        (
+                            visuals.corner_radius,
+                            background_color,
+                            ui.visuals().selection.stroke,
+                        )
+                    } else {
+                        (visuals.corner_radius, background_color, visuals.bg_stroke)
+                    }
+                } else {
+                    let visuals = &ui.style().visuals.widgets.inactive;
+                    (
+                        visuals.corner_radius,
+                        Color32::TRANSPARENT,
+                        visuals.bg_stroke,
+                    )
+                };
+                allocated
+                    .frame
+                    .fill(background_color)
+                    .corner_radius(corner_radius)
+                    .inner_margin(
+                        allocated.frame.inner_margin
+                            + Margin::same((visuals.expansion - stroke.width).round() as i8),
+                    )
+                    .outer_margin(Margin::same(-(visuals.expansion as i8)))
+                    .stroke(stroke)
+            };
+
+            allocated.paint(ui)
+        };
+
+        let inner_rect = response.rect(inner_rect_id).unwrap_or(Rect::ZERO);
+
+        // Our atom closure was now called, so the galley should always be available here
+        let mut galley = get_galley.expect("Galley should be available here");
+
+        // Don't send `OutputEvent::Clicked` when a user presses the space bar
         response.flags -= response::Flags::FAKE_PRIMARY_CLICKED;
-        let text_clip_rect = rect;
+        let text_clip_rect = inner_rect;
         let painter = ui.painter_at(text_clip_rect.expand(1.0)); // expand to avoid clipping cursor
 
         if interactive && let Some(pointer_pos) = response.interact_pointer_pos() {
@@ -580,20 +746,22 @@ impl TextEdit<'_> {
 
             // TODO(emilk): drag selected text to either move or clone (ctrl on windows, alt on mac)
 
-            let cursor_at_pointer =
-                galley.cursor_from_pos(pointer_pos - rect.min + state.text_offset);
+            let cursor_at_pointer = galley.cursor_from_pos(
+                pointer_pos - inner_rect.min + state.text_offset + vec2(galley.rect.left(), 0.0),
+            );
 
             if ui.visuals().text_cursor.preview
                 && response.hovered()
                 && ui.input(|i| i.pointer.is_moving())
             {
                 // text cursor preview:
-                let cursor_rect = TSTransform::from_translation(rect.min.to_vec2())
-                    * cursor_rect(&galley, &cursor_at_pointer, row_height);
+                let cursor_rect = TSTransform::from_translation(
+                    inner_rect.min.to_vec2() - vec2(galley.rect.left(), 0.0),
+                ) * cursor_rect(&galley, &cursor_at_pointer, row_height);
                 text_selection::visuals::paint_cursor_end(&painter, ui.visuals(), cursor_rect);
             }
 
-            let is_being_dragged = ui.ctx().is_being_dragged(response.id);
+            let is_being_dragged = ui.is_being_dragged(response.id);
             let did_interact = state.cursor.pointer_interaction(
                 ui,
                 &response,
@@ -613,44 +781,15 @@ impl TextEdit<'_> {
             ui.set_cursor_icon(CursorIcon::Text);
         }
 
-        let mut cursor_range = None;
-        let prev_cursor_range = state.cursor.range(&galley);
-        if interactive && ui.memory(|mem| mem.has_focus(id)) {
-            ui.memory_mut(|mem| mem.set_focus_lock_filter(id, event_filter));
-
-            let default_cursor_range = if cursor_at_end {
-                CCursorRange::one(galley.end())
-            } else {
-                CCursorRange::default()
-            };
-
-            let (changed, new_cursor_range) = events(
-                ui,
-                &mut state,
-                text,
-                &mut galley,
-                layouter,
-                id,
-                wrap_width,
-                multiline,
-                password,
-                default_cursor_range,
-                char_limit,
-                event_filter,
-                return_key,
-            );
-
-            if changed {
-                response.mark_changed();
-            }
-            cursor_range = Some(new_cursor_range);
+        if text_changed {
+            response.mark_changed();
         }
 
         let mut galley_pos = align
-            .align_size_within_rect(galley.size(), rect)
-            .intersect(rect) // limit pos to the response rect area
+            .align_size_within_rect(galley.size(), inner_rect)
+            .intersect(inner_rect) // limit pos to the response rect area
             .min;
-        let align_offset = rect.left_top() - galley_pos;
+        let align_offset = inner_rect.left_top() - galley_pos;
 
         // Visual clipping for singleline text editor with text larger than width
         if clip_text && align_offset.x == 0.0 {
@@ -660,18 +799,18 @@ impl TextEdit<'_> {
             };
 
             let mut offset_x = state.text_offset.x;
-            let visible_range = offset_x..=offset_x + desired_inner_size.x;
+            let visible_range = offset_x..=offset_x + inner_rect.width();
 
             if !visible_range.contains(&cursor_pos) {
                 if cursor_pos < *visible_range.start() {
                     offset_x = cursor_pos;
                 } else {
-                    offset_x = cursor_pos - desired_inner_size.x;
+                    offset_x = cursor_pos - inner_rect.width();
                 }
             }
 
             offset_x = offset_x
-                .at_most(galley.size().x - desired_inner_size.x)
+                .at_most(galley.size().x - inner_rect.width())
                 .at_least(0.0);
 
             state.text_offset = vec2(offset_x, align_offset.y);
@@ -688,32 +827,7 @@ impl TextEdit<'_> {
             false
         };
 
-        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_else(|| font_id.into());
-                let galley = if multiline {
-                    hint_text.into_galley(
-                        ui,
-                        Some(TextWrapMode::Wrap),
-                        desired_inner_size.x,
-                        hint_text_font_id,
-                    )
-                } else {
-                    hint_text.into_galley(
-                        ui,
-                        Some(TextWrapMode::Extend),
-                        f32::INFINITY,
-                        hint_text_font_id,
-                    )
-                };
-                let galley_pos = align
-                    .align_size_within_rect(galley.size(), rect)
-                    .intersect(rect)
-                    .min;
-                painter.galley(galley_pos, galley, hint_text_color);
-            }
-
+        if ui.is_rect_visible(inner_rect) {
             let has_focus = ui.memory(|mem| mem.has_focus(id));
 
             if has_focus && let Some(cursor_range) = state.cursor.range(&galley) {
@@ -721,53 +835,19 @@ impl TextEdit<'_> {
                 paint_text_selection(&mut galley, ui.visuals(), &cursor_range, None);
             }
 
-            // 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, Arc::clone(&galley), text_color);
+            painter.galley(
+                galley_pos - vec2(galley.rect.left(), 0.0),
+                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)
-                    .translate(galley_pos.to_vec2());
+                    .translate(galley_pos.to_vec2() - vec2(galley.rect.left(), 0.0));
 
                 if response.changed() || selection_changed {
                     // Scroll to keep primary cursor in view:
-                    ui.scroll_to_rect(primary_cursor_rect + margin, None);
+                    ui.scroll_to_rect(primary_cursor_rect, None);
                 }
 
                 if text.is_mutable() && interactive {
@@ -789,33 +869,24 @@ impl TextEdit<'_> {
                             now - state.last_interaction_time,
                         );
                     }
-
-                    // Set IME output (in screen coords) when text is editable and visible
-                    let to_global = ui
-                        .ctx()
-                        .layer_transform_to_global(ui.layer_id())
-                        .unwrap_or_default();
-
-                    ui.ctx().output_mut(|o| {
-                        o.ime = Some(crate::output::IMEOutput {
-                            rect: to_global * rect,
-                            cursor_rect: to_global * primary_cursor_rect,
+                    if ui.memory(|mem| mem.owns_ime_events(id)) {
+                        // Set IME output (in screen coords) when text is editable and visible
+                        let to_global = ui
+                            .ctx()
+                            .layer_transform_to_global(ui.layer_id())
+                            .unwrap_or_default();
+                        ui.output_mut(|o| {
+                            o.ime = Some(crate::output::IMEOutput {
+                                rect: to_global * inner_rect,
+                                cursor_rect: to_global * primary_cursor_rect,
+                                should_interrupt_composition: false,
+                            });
                         });
-                    });
+                    }
                 }
             }
         }
 
-        // Ensures correct IME behavior when the text input area gains or loses focus.
-        if state.ime_enabled && (response.gained_focus() || response.lost_focus()) {
-            state.ime_enabled = false;
-            if let Some(mut ccursor_range) = state.cursor.char_range() {
-                ccursor_range.secondary.index = ccursor_range.primary.index;
-                state.cursor.set_char_range(Some(ccursor_range));
-            }
-            ui.input_mut(|i| i.events.retain(|e| !matches!(e, Event::Ime(_))));
-        }
-
         state.clone().store(ui.ctx(), id);
 
         if response.changed() {
@@ -846,24 +917,22 @@ impl TextEdit<'_> {
             });
         }
 
-        {
-            let role = if password {
-                accesskit::Role::PasswordInput
-            } else if multiline {
-                accesskit::Role::MultilineTextInput
-            } else {
-                accesskit::Role::TextInput
-            };
+        let role = if password {
+            accesskit::Role::PasswordInput
+        } else if multiline {
+            accesskit::Role::MultilineTextInput
+        } else {
+            accesskit::Role::TextInput
+        };
 
-            crate::text_selection::accesskit_text::update_accesskit_for_text_widget(
-                ui.ctx(),
-                id,
-                cursor_range,
-                role,
-                TSTransform::from_translation(galley_pos.to_vec2()),
-                &galley,
-            );
-        }
+        crate::text_selection::accesskit_text::update_accesskit_for_text_widget(
+            ui.ctx(),
+            id,
+            cursor_range,
+            role,
+            TSTransform::from_translation(galley_pos.to_vec2()),
+            &galley,
+        );
 
         TextEditOutput {
             response,
@@ -911,7 +980,7 @@ fn events(
     event_filter: EventFilter,
     return_key: Option<KeyboardShortcut>,
 ) -> (bool, CCursorRange) {
-    let os = ui.ctx().os();
+    let os = ui.os();
 
     let mut cursor_range = state.cursor.range(galley).unwrap_or(default_cursor_range);
 
@@ -930,12 +999,11 @@ fn events(
 
     let mut any_change = false;
 
-    let mut events = ui.input(|i| i.filtered_events(&event_filter));
+    let events = ui.input(|i| i.filtered_events(&event_filter));
 
-    if state.ime_enabled {
-        remove_ime_incompatible_events(&mut events);
-        // Process IME events first:
-        events.sort_by_key(|e| !matches!(e, Event::Ime(_)));
+    let owns_ime_events = ui.memory(|mem| mem.owns_ime_events(id));
+    if !owns_ime_events {
+        state.cursor_purpose = TextEditCursorPurpose::Selection;
     }
 
     for event in &events {
@@ -958,7 +1026,9 @@ fn events(
                 }
             }
             Event::Paste(text_to_insert) => {
-                if !text_to_insert.is_empty() {
+                if text_to_insert.is_empty() {
+                    None
+                } else {
                     let mut ccursor = text.delete_selected(&cursor_range);
                     if multiline {
                         text.insert_text_at(&mut ccursor, text_to_insert, char_limit);
@@ -968,8 +1038,6 @@ fn events(
                     }
 
                     Some(CCursorRange::one(ccursor))
-                } else {
-                    None
                 }
             }
             Event::Text(text_to_insert) => {
@@ -1065,7 +1133,7 @@ fn events(
                 ..
             } => check_for_mutating_key_press(os, &cursor_range, text, galley, modifiers, *key),
 
-            Event::Ime(ime_event) => {
+            Event::Ime(ime_event) if owns_ime_events => {
                 /// Both `ImeEvent::Preedit("")` and `ImeEvent::Commit("")`
                 /// might be emitted from different integrations to signify that
                 /// the current IME composition should be cleared.
@@ -1099,46 +1167,58 @@ fn events(
                 }
 
                 match ime_event {
-                    ImeEvent::Enabled => {
-                        state.ime_enabled = true;
-                        state.ime_cursor_range = cursor_range;
+                    #[expect(deprecated)]
+                    ImeEvent::Enabled | ImeEvent::Disabled => None,
+                    // Ignore `Preedit`/`Commit` events with empty text when
+                    // there is no active IME composition.
+                    //
+                    // Some integrations may emit these events when there is no
+                    // active IME composition (e.g. when `set_ime_allowed` or
+                    // `set_ime_cursor_area` is called on `winit`'s `Window` on
+                    // Wayland). Without this guard, they would clear any
+                    // selected text.
+                    //
+                    // TODO(umajho): Ideally this would be handled by the
+                    // integration, but since this guard is harmless for well-
+                    // behaved integrations and also fixes the issue described
+                    // above, it is good enough for now.
+                    ImeEvent::Preedit(composition_text) | ImeEvent::Commit(composition_text)
+                        if composition_text.is_empty()
+                            && !matches!(
+                                state.cursor_purpose,
+                                TextEditCursorPurpose::ImeComposition
+                            ) =>
+                    {
+                        None
+                    }
+                    ImeEvent::Preedit(composition_text) | ImeEvent::Commit(composition_text)
+                        if composition_text == "\n" || composition_text == "\r" =>
+                    {
                         None
                     }
                     ImeEvent::Preedit(preedit_text) => {
-                        if preedit_text == "\n" || preedit_text == "\r" {
-                            None
+                        state.cursor_purpose = if preedit_text.is_empty() {
+                            TextEditCursorPurpose::Selection
                         } else {
-                            let mut ccursor = clear_preedit_text(text, &cursor_range);
+                            TextEditCursorPurpose::ImeComposition
+                        };
+                        let mut ccursor = clear_preedit_text(text, &cursor_range);
 
-                            let start_cursor = ccursor;
-                            if !preedit_text.is_empty() {
-                                text.insert_text_at(&mut ccursor, preedit_text, char_limit);
-                            }
-                            state.ime_cursor_range = cursor_range;
-                            Some(CCursorRange::two(start_cursor, ccursor))
+                        let start_cursor = ccursor;
+                        if !preedit_text.is_empty() {
+                            text.insert_text_at(&mut ccursor, preedit_text, char_limit);
                         }
+                        Some(CCursorRange::two(start_cursor, ccursor))
                     }
                     ImeEvent::Commit(commit_text) => {
-                        if commit_text == "\n" || commit_text == "\r" {
-                            None
-                        } else {
-                            state.ime_enabled = false;
+                        state.cursor_purpose = TextEditCursorPurpose::Selection;
+                        let mut ccursor = clear_preedit_text(text, &cursor_range);
 
-                            let mut ccursor = clear_preedit_text(text, &cursor_range);
-
-                            if !commit_text.is_empty()
-                                && cursor_range.secondary.index
-                                    == state.ime_cursor_range.secondary.index
-                            {
-                                text.insert_text_at(&mut ccursor, commit_text, char_limit);
-                            }
-
-                            Some(CCursorRange::one(ccursor))
+                        if !commit_text.is_empty() {
+                            text.insert_text_at(&mut ccursor, commit_text, char_limit);
                         }
-                    }
-                    ImeEvent::Disabled => {
-                        state.ime_enabled = false;
-                        None
+
+                        Some(CCursorRange::one(ccursor))
                     }
                 }
             }
@@ -1169,27 +1249,6 @@ fn events(
 
 // ----------------------------------------------------------------------------
 
-fn remove_ime_incompatible_events(events: &mut Vec<Event>) {
-    // Remove key events which cause problems while 'IME' is being used.
-    // See https://github.com/emilk/egui/pull/4509
-    events.retain(|event| {
-        !matches!(
-            event,
-            Event::Key { repeat: true, .. }
-                | Event::Key {
-                    key: Key::Backspace
-                        | Key::ArrowUp
-                        | Key::ArrowDown
-                        | Key::ArrowLeft
-                        | Key::ArrowRight,
-                    ..
-                }
-        )
-    });
-}
-
-// ----------------------------------------------------------------------------
-
 /// Returns `Some(new_cursor)` if we did mutate `text`.
 fn check_for_mutating_key_press(
     os: OperatingSystem,
diff --git a/crates/egui/src/widgets/text_edit/output.rs b/crates/egui/src/widgets/text_edit/output.rs
index 8149bbe58..3339f325e 100644
--- a/crates/egui/src/widgets/text_edit/output.rs
+++ b/crates/egui/src/widgets/text_edit/output.rs
@@ -5,7 +5,7 @@ use crate::text::CCursorRange;
 /// The output from a [`TextEdit`](crate::TextEdit).
 pub struct TextEditOutput {
     /// The interaction response.
-    pub response: crate::Response,
+    pub response: crate::AtomLayoutResponse,
 
     /// How the text was displayed.
     pub galley: Arc<crate::Galley>,
diff --git a/crates/egui/src/widgets/text_edit/state.rs b/crates/egui/src/widgets/text_edit/state.rs
index 5827aac4b..48935c4f7 100644
--- a/crates/egui/src/widgets/text_edit/state.rs
+++ b/crates/egui/src/widgets/text_edit/state.rs
@@ -37,18 +37,14 @@ pub struct TextEditState {
     /// Controls the text selection.
     pub cursor: TextCursorState,
 
+    /// The purpose of the cursor.
+    #[cfg_attr(feature = "serde", serde(skip))]
+    pub(crate) cursor_purpose: TextEditCursorPurpose,
+
     /// Wrapped in Arc for cheaper clones.
     #[cfg_attr(feature = "serde", serde(skip))]
     pub(crate) undoer: Arc<Mutex<TextEditUndoer>>,
 
-    // If IME candidate window is shown on this text edit.
-    #[cfg_attr(feature = "serde", serde(skip))]
-    pub(crate) ime_enabled: bool,
-
-    // cursor range for IME candidate.
-    #[cfg_attr(feature = "serde", serde(skip))]
-    pub(crate) ime_cursor_range: CCursorRange,
-
     // Text offset within the widget area.
     // Used for sensing and singleline text clipping.
     #[cfg_attr(feature = "serde", serde(skip))]
@@ -82,3 +78,13 @@ impl TextEditState {
         self.set_undoer(TextEditUndoer::default());
     }
 }
+
+#[derive(Clone, Default)]
+pub(crate) enum TextEditCursorPurpose {
+    /// The cursor is used for text selection.
+    #[default]
+    Selection,
+
+    /// The cursor is used for IME composition.
+    ImeComposition,
+}
diff --git a/crates/egui/src/widgets/text_edit/text_buffer.rs b/crates/egui/src/widgets/text_edit/text_buffer.rs
index a67dc1b38..dbc2db26e 100644
--- a/crates/egui/src/widgets/text_edit/text_buffer.rs
+++ b/crates/egui/src/widgets/text_edit/text_buffer.rs
@@ -1,9 +1,9 @@
 use std::{borrow::Cow, ops::Range};
 
-use epaint::{
-    Galley,
-    text::{TAB_SIZE, cursor::CCursor},
-};
+use epaint::{Galley, text::cursor::CCursor};
+
+/// One `\t` character is this many spaces wide (for indentation purposes).
+const TAB_SIZE: usize = 4;
 
 use crate::{
     text::CCursorRange,
diff --git a/crates/egui_demo_app/Cargo.toml b/crates/egui_demo_app/Cargo.toml
index 7cde46383..f9a153268 100644
--- a/crates/egui_demo_app/Cargo.toml
+++ b/crates/egui_demo_app/Cargo.toml
@@ -8,8 +8,8 @@ rust-version.workspace = true
 publish = false
 default-run = "egui_demo_app"
 
-[package.metadata.cargo-machete]
-ignored = ["profiling"]
+[package.metadata.cargo-shear]
+ignored = ["image", "profiling", "wasm-bindgen-futures"]
 
 [lints]
 workspace = true
@@ -23,12 +23,12 @@ crate-type = ["cdylib", "rlib"]
 
 
 [features]
-default = ["wgpu", "persistence"]
+default = ["wgpu", "persistence", "wayland", "x11"]
 
-# image_viewer adds about 0.9 MB of WASM
 web_app = ["http", "persistence"]
 
 accessibility_inspector = ["dep:accesskit", "dep:accesskit_consumer", "eframe/accesskit"]
+easymark = [] # easymark is off by default, because it a pretty shitty markup language
 http = ["ehttp", "image/jpeg", "poll-promise", "egui_extras/image"]
 image_viewer = ["image/jpeg", "egui_extras/all_loaders", "rfd"]
 persistence = ["eframe/persistence", "egui_extras/serde", "egui/persistence", "serde"]
@@ -37,20 +37,20 @@ serde = ["dep:serde", "egui_demo_lib/serde", "egui/serde"]
 syntect = ["egui_demo_lib/syntect"]
 
 glow = ["eframe/glow"]
-wgpu = ["eframe/wgpu", "bytemuck", "dep:wgpu"]
+wgpu = ["eframe/wgpu", "bytemuck"]
 wayland = ["eframe/wayland"]
 x11 = ["eframe/x11"]
 
 [dependencies]
-chrono = { workspace = true, features = ["js-sys", "wasmbind"] }
 eframe = { workspace = true, default-features = false, features = ["web_screen_reader"] }
 egui = { workspace = true, features = ["callstack", "default"] }
-egui_demo_lib = { workspace = true, features = ["default", "chrono"] }
+egui_demo_lib = { workspace = true, features = ["default", "jiff"] }
 egui_extras = { workspace = true, features = ["default", "image"] }
 image = { workspace = true, default-features = false, features = [
   # Ensure we can display the test images
   "png",
 ] }
+jiff = { workspace = true, features = ["std", "tz-system", "js"] }
 log.workspace = true
 profiling.workspace = true
 
@@ -60,9 +60,6 @@ accesskit_consumer = { workspace = true, optional = true }
 bytemuck = { workspace = true, optional = true }
 puffin = { workspace = true, optional = true }
 puffin_http = { workspace = true, optional = true }
-# Enable both WebGL & WebGPU when targeting the web (these features have no effect when not targeting wasm32)
-# Also enable the default features so we have a supported backend for every platform.
-wgpu = { workspace = true, features = ["default", "webgpu", "webgl"], optional = true }
 
 
 # feature "http":
diff --git a/crates/egui_demo_app/src/apps/custom3d_wgpu.rs b/crates/egui_demo_app/src/apps/custom3d_wgpu.rs
index fd1d9ae73..d83f000a4 100644
--- a/crates/egui_demo_app/src/apps/custom3d_wgpu.rs
+++ b/crates/egui_demo_app/src/apps/custom3d_wgpu.rs
@@ -40,7 +40,7 @@ impl Custom3d {
 
         let pipeline_layout = device.create_pipeline_layout(&wgpu::PipelineLayoutDescriptor {
             label: Some("custom3d"),
-            bind_group_layouts: &[&bind_group_layout],
+            bind_group_layouts: &[Some(&bind_group_layout)],
             immediate_size: 0,
         });
 
diff --git a/crates/egui_demo_app/src/backend_panel.rs b/crates/egui_demo_app/src/backend_panel.rs
index dfc4d116b..acd114ff4 100644
--- a/crates/egui_demo_app/src/backend_panel.rs
+++ b/crates/egui_demo_app/src/backend_panel.rs
@@ -211,7 +211,7 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
         let wgpu_adapter_details_ui = |ui: &mut egui::Ui, adapter: &eframe::wgpu::Adapter| {
             let info = &adapter.get_info();
 
-            let wgpu::AdapterInfo {
+            let eframe::wgpu::AdapterInfo {
                 name,
                 vendor,
                 device,
@@ -310,6 +310,11 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
                 ui.end_row();
             }
         });
+
+        if let Some(mut cfg) = _frame.wgpu_surface_config() {
+            wgpu_surface_config_ui(ui, &mut cfg);
+            _frame.set_wgpu_surface_config(cfg);
+        }
     }
 
     #[cfg(not(target_arch = "wasm32"))]
@@ -357,6 +362,52 @@ fn integration_ui(ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
     }
 }
 
+#[cfg(feature = "wgpu")]
+fn wgpu_surface_config_ui(ui: &mut egui::Ui, cfg: &mut eframe::SurfaceConfig) {
+    use eframe::wgpu::PresentMode;
+
+    egui::Grid::new("wgpu_surface_config")
+        .num_columns(2)
+        .show(ui, |ui| {
+            ui.label("Present mode:");
+            egui::ComboBox::from_id_salt("wgpu_present_mode")
+                .selected_text(format!("{:?}", cfg.present_mode))
+                .show_ui(ui, |ui| {
+                    for mode in [
+                        PresentMode::AutoVsync,
+                        PresentMode::AutoNoVsync,
+                        PresentMode::Fifo,
+                        PresentMode::FifoRelaxed,
+                        PresentMode::Immediate,
+                        PresentMode::Mailbox,
+                    ] {
+                        ui.selectable_value(&mut cfg.present_mode, mode, format!("{mode:?}"));
+                    }
+                });
+            ui.end_row();
+
+            ui.label("Desired max frame latency:");
+            egui::ComboBox::from_id_salt("wgpu_desired_max_frame_latency")
+                .selected_text(match cfg.desired_maximum_frame_latency {
+                    None => "Default".to_owned(),
+                    Some(n) => n.to_string(),
+                })
+                .show_ui(ui, |ui| {
+                    ui.weak("Lower value = lower latency");
+                    ui.selectable_value(&mut cfg.desired_maximum_frame_latency, None, "Default");
+                    for n in [0_u32, 1, 2, 3] {
+                        ui.selectable_value(
+                            &mut cfg.desired_maximum_frame_latency,
+                            Some(n),
+                            n.to_string(),
+                        );
+                    }
+                    ui.weak("Higher value = higher throughput/FPS");
+                });
+            ui.end_row();
+        });
+}
+
 // ----------------------------------------------------------------------------
 
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
diff --git a/crates/egui_demo_app/src/lib.rs b/crates/egui_demo_app/src/lib.rs
index ea30bda8d..45abccc7f 100644
--- a/crates/egui_demo_app/src/lib.rs
+++ b/crates/egui_demo_app/src/lib.rs
@@ -9,9 +9,10 @@ pub use wrap_app::{Anchor, WrapApp};
 
 /// Time of day as seconds since midnight. Used for clock in demo app.
 pub(crate) fn seconds_since_midnight() -> f64 {
-    use chrono::Timelike as _;
-    let time = chrono::Local::now().time();
-    time.num_seconds_from_midnight() as f64 + 1e-9 * (time.nanosecond() as f64)
+    jiff::Zoned::now()
+        .time()
+        .duration_since(jiff::civil::Time::midnight())
+        .as_secs_f64()
 }
 
 /// Trait that wraps different parts of the demo app.
diff --git a/crates/egui_demo_app/src/main.rs b/crates/egui_demo_app/src/main.rs
index a4ffdb5f9..38da5751d 100644
--- a/crates/egui_demo_app/src/main.rs
+++ b/crates/egui_demo_app/src/main.rs
@@ -38,7 +38,8 @@ fn main() {
         });
         for loud_crate in ["naga", "wgpu_core", "wgpu_hal"] {
             if !rust_log.contains(&format!("{loud_crate}=")) {
-                rust_log += &format!(",{loud_crate}=warn");
+                use std::fmt::Write as _;
+                write!(rust_log, ",{loud_crate}=warn").ok();
             }
         }
 
diff --git a/crates/egui_demo_app/src/wrap_app.rs b/crates/egui_demo_app/src/wrap_app.rs
index 5dcc89a3e..64ecbce56 100644
--- a/crates/egui_demo_app/src/wrap_app.rs
+++ b/crates/egui_demo_app/src/wrap_app.rs
@@ -8,12 +8,14 @@ use core::any::Any;
 
 use crate::DemoApp;
 
+#[cfg(feature = "easymark")]
 #[derive(Default)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 struct EasyMarkApp {
     editor: egui_demo_lib::easy_mark::EasyMarkEditor,
 }
 
+#[cfg(feature = "easymark")]
 impl DemoApp for EasyMarkApp {
     fn demo_ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
         self.editor.panels(ui);
@@ -152,12 +154,18 @@ enum Command {
 #[cfg_attr(feature = "serde", serde(default))]
 pub struct State {
     demo: DemoWindows,
+
+    #[cfg(feature = "easymark")]
     easy_mark_editor: EasyMarkApp,
+
     #[cfg(feature = "http")]
     http: crate::apps::HttpApp,
+
     #[cfg(feature = "image_viewer")]
     image_viewer: crate::apps::ImageViewer,
+
     pub clock: FractalClockApp,
+
     rendering_test: ColorTestApp,
 
     selected_anchor: Anchor,
@@ -212,6 +220,7 @@ impl WrapApp {
                 Anchor::Demo,
                 &mut self.state.demo as &mut dyn DemoApp,
             ),
+            #[cfg(feature = "easymark")]
             (
                 "🖹 EasyMark editor",
                 Anchor::EasyMarkEditor,
@@ -400,6 +409,8 @@ impl WrapApp {
     }
 
     fn bar_contents(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame, cmd: &mut Command) {
+        ui.add_space(8.0);
+
         egui::widgets::global_theme_preference_switch(ui);
 
         ui.separator();
@@ -455,10 +466,10 @@ impl WrapApp {
                 for file in &i.raw.hovered_files {
                     if let Some(path) = &file.path {
                         write!(text, "\n{}", path.display()).ok();
-                    } else if !file.mime.is_empty() {
-                        write!(text, "\n{}", file.mime).ok();
-                    } else {
+                    } else if file.mime.is_empty() {
                         text += "\n???";
+                    } else {
+                        write!(text, "\n{}", file.mime).ok();
                     }
                 }
                 text
@@ -494,10 +505,10 @@ impl WrapApp {
                     for file in &self.dropped_files {
                         let mut info = if let Some(path) = &file.path {
                             path.display().to_string()
-                        } else if !file.name.is_empty() {
-                            file.name.clone()
-                        } else {
+                        } else if file.name.is_empty() {
                             "???".to_owned()
+                        } else {
+                            file.name.clone()
                         };
 
                         let mut additional_info = vec![];
@@ -508,7 +519,8 @@ impl WrapApp {
                             additional_info.push(format!("{} bytes", bytes.len()));
                         }
                         if !additional_info.is_empty() {
-                            info += &format!(" ({})", additional_info.join(", "));
+                            use std::fmt::Write as _;
+                            write!(info, " ({})", additional_info.join(", ")).ok();
                         }
 
                         ui.label(info);
diff --git a/crates/egui_demo_app/tests/snapshots/clock.png b/crates/egui_demo_app/tests/snapshots/clock.png
index b8ba70789..347bdd568 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:e4cff85a005ad897624f6c7a2b2ad599325ec99e0b3c9c35963f16611f283997
-size 335371
+oid sha256:288e11a1fa684575155826a760d5aecc5855e1f4b68bc8954441bf3ac015ee84
+size 335175
diff --git a/crates/egui_demo_app/tests/snapshots/custom3d.png b/crates/egui_demo_app/tests/snapshots/custom3d.png
index 20a933d45..6778d8b92 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:cc55083688d043234c37d22c74635a44b00f4d28c3802c4327c2eaf563c73eed
-size 92800
+oid sha256:d674918c635bfc865043f2123c0f5d4a671dd21ba7b878c056e817b19f2e8f00
+size 92770
diff --git a/crates/egui_demo_app/tests/snapshots/easymarkeditor.png b/crates/egui_demo_app/tests/snapshots/easymarkeditor.png
index 7b370c38e..f8237d940 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:78d91fa4657cd1cb375487f606b80d418ed6fdbd8a0c0225b9383eead5001563
-size 169682
+oid sha256:fa67354cfe4d9cb8774c8de614be5975853a4a817ceaf96c3ec7a968de638d8d
+size 169740
diff --git a/crates/egui_demo_app/tests/snapshots/imageviewer.png b/crates/egui_demo_app/tests/snapshots/imageviewer.png
index 8d5f688bf..c47f260e9 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:c8b23a5286e5d2dbd8d3eddac6583d981152bd791f74edfa5c712a610f795256
-size 96759
+oid sha256:b9f5204a9b8f15e0f144e66f0df8685e4e3ed90cd265474f2600fdd4cb5df390
+size 98934
diff --git a/crates/egui_demo_lib/Cargo.toml b/crates/egui_demo_lib/Cargo.toml
index 3e61187d5..d2586fa11 100644
--- a/crates/egui_demo_lib/Cargo.toml
+++ b/crates/egui_demo_lib/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 repository = "https://github.com/emilk/egui/tree/main/crates/egui_demo_lib"
 categories = ["gui", "graphics"]
 keywords = ["glow", "egui", "gui", "gamedev"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml", "data/*"]
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml", "data/*"]
 
 [lints]
 workspace = true
@@ -20,13 +20,16 @@ workspace = true
 all-features = true
 rustdoc-args = ["--generate-link-to-definition"]
 
+[package.metadata.cargo-shear]
+ignored = ["image"] # We need the png feature
+
 [lib]
 
 
 [features]
 default = []
 
-chrono = ["egui_extras/datepicker", "dep:chrono"]
+jiff = ["egui_extras/datepicker", "dep:jiff"]
 
 ## Allow serialization using [`serde`](https://docs.rs/serde).
 serde = ["egui/serde", "dep:serde", "egui_extras/serde"]
@@ -42,7 +45,7 @@ egui_extras = { workspace = true, features = ["image", "svg"] }
 unicode_names2.workspace = true # this old version has fewer dependencies
 
 #! ### Optional dependencies
-chrono = { workspace = true, optional = true, features = ["js-sys", "wasmbind"] }
+jiff = { workspace = true, optional = true, features = ["std", "js"] }
 ## Enable this when generating docs.
 document-features = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
diff --git a/crates/egui_demo_lib/data/egui-logo.svg b/crates/egui_demo_lib/data/egui-logo.svg
new file mode 100644
index 000000000..506bb0d80
--- /dev/null
+++ b/crates/egui_demo_lib/data/egui-logo.svg
@@ -0,0 +1,21 @@
+<svg width="1165" height="366" viewBox="0 0 1165 366" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_2005_93)">
+<mask id="mask0_2005_93" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="334" y="0" width="831" height="366">
+<path d="M1165 0H334V365.17H1165V0Z" fill="white"/>
+</mask>
+<g mask="url(#mask0_2005_93)">
+<path d="M334.059 166.33C334.679 134.02 349.889 103.38 376.099 84.4502C390.759 73.8602 409.699 68.8302 427.749 68.9302C472.239 69.1802 500.199 89.0902 514.439 126.26C518.609 137.17 520.839 145.47 521.289 157.13C521.629 166.3 521.789 178.32 521.829 183.4C521.829 184.74 520.769 185.81 519.429 185.81H382.519C380.709 185.81 379.249 187.31 379.309 189.12C380.349 220.05 396.199 237.77 427.749 238.44C447.819 238.87 463.969 230.46 470.749 216.17C471.259 215.08 472.379 214.41 473.599 214.41H517.259C518.809 214.41 519.989 215.88 519.589 217.41C510.809 251.9 478.299 279.88 427.749 280.6C359.269 280.43 338.449 230.44 334.299 182.61C333.939 178.51 333.939 172.29 334.049 166.32V166.34L334.059 166.33ZM469.049 146.33C470.989 146.33 472.479 144.62 472.229 142.69C469.219 119.35 452.109 106.3 427.969 106.3C400.019 106.3 385.689 118.56 380.089 142.35C379.619 144.38 381.119 146.32 383.199 146.32H469.049V146.33Z" fill="white"/>
+<path d="M685.599 75.4002V79.9202C685.599 82.3602 682.999 83.9002 680.859 82.7302C670.869 75.0802 658.989 68.9002 637.819 68.9102C591.729 68.9602 552.329 100.48 547.649 145.55C546.819 153.48 546.669 183.26 546.859 186.07C550.349 242.31 566.189 280.84 636.229 280.84C661.839 280.84 670.739 272.74 681.219 266.01C683.319 265.14 685.629 266.71 685.629 268.98V317.05C712.179 317.05 733.709 289.78 733.709 263.22V75.4002C733.709 73.6302 732.279 72.1902 730.499 72.1902H688.839C687.069 72.1902 685.629 73.6202 685.629 75.3902L685.599 75.4002ZM685.229 190.32C685.229 195.53 684.519 202.49 682.979 207.58C676.579 228.66 662.369 239.82 636.519 239.82C612.679 239.82 595.699 226.2 592.379 202.84C592.029 200.44 591.899 198.01 591.899 195.58V155.56C591.899 150.25 592.609 144.96 594.149 139.88C600.549 118.8 614.759 106.82 640.609 106.82C664.449 106.82 681.429 121.26 684.749 144.63C685.089 147.03 685.229 149.46 685.229 151.89V190.34V190.32Z" fill="white"/>
+<path d="M561.44 317.09H685.63V320.3C685.63 345.09 665.54 365.17 640.76 365.17H561.44C559.67 365.17 558.23 363.73 558.23 361.96V320.3C558.23 318.53 559.67 317.09 561.44 317.09Z" fill="white"/>
+<path d="M1097.7 72.1301C1099.47 72.1301 1100.92 73.5301 1100.92 75.3001C1100.92 86.6501 1100.9 205.37 1100.9 226.49C1100.9 228.26 1102.34 229.7 1104.11 229.7H1161.79C1163.56 229.7 1165 231.14 1165 232.91V274.78C1165 276.55 1163.57 277.99 1161.79 277.99H991.928C990.158 277.99 988.718 276.56 988.718 274.78V232.9C988.718 231.13 990.148 229.69 991.928 229.69H1049.61C1051.38 229.69 1052.81 228.26 1052.81 226.48L1052.78 120.18C1052.78 118.41 1051.34 116.97 1049.57 116.97H991.878C990.108 116.97 988.668 115.54 988.668 113.76V75.3101C988.668 73.5401 990.098 72.1001 991.878 72.1001H1097.7V72.1201V72.1301Z" fill="white"/>
+<path d="M910.9 72.1299C909.13 72.1299 907.69 73.5699 907.69 75.3399V192.16C907.69 195.39 907.46 198.84 907.07 202.11C906.32 208.25 904.46 214.24 901.28 219.55C893.34 232.89 879.58 239.42 858.99 239.82C835.72 240.27 818.54 225.08 815.21 202.11C814.87 199.76 814.39 194.57 814.39 192.16V75.3399C814.39 73.5699 812.96 72.1299 811.18 72.1299H768.39C766.62 72.1299 765.18 73.5699 765.18 75.3399V188.89C765.18 240.58 788.39 282.7 860.25 281.02C883.37 277.82 890.5 272.68 903.44 266.05C905.56 264.96 908.09 266.52 908.09 268.91L907.97 274.61C907.97 276.38 909.41 277.82 911.18 277.82H952.89C954.66 277.82 956.1 276.38 956.1 274.61V75.3399C956.1 73.5699 954.67 72.1299 952.89 72.1299H910.9Z" fill="white"/>
+<path d="M1097.66 0H1056C1054.22 0 1052.79 1.43 1052.79 3.21V44.88C1052.79 46.65 1054.22 48.09 1056 48.09H1097.66C1099.43 48.09 1100.87 46.66 1100.87 44.88V3.21C1100.87 1.44 1099.43 0 1097.66 0Z" fill="white"/>
+</g>
+<path d="M165.96 72C171.15 72 175.95 74.8 178.55 79.34L229.02 167.66C231.62 172.2 231.62 177.8 229.02 182.34L178.55 270.66C175.95 275.2 171.15 278 165.96 278H65.01C59.82 278 55.02 275.2 52.42 270.66L1.95 182.34C-0.65 177.8 -0.65 172.2 1.95 167.66L52.43 79.34C55.03 74.8 59.82 72 65.02 72H165.97H165.96ZM99.88 249.29C99.88 251.36 101.56 253.03 103.63 253.03H127.56C129.51 253.03 131.09 251.45 131.09 249.5V221.82C131.09 204.58 117.12 190.61 99.88 190.61V249.29ZM40.99 159.39C39.04 159.39 37.46 160.97 37.46 162.92V186.85C37.46 188.92 39.14 190.6 41.21 190.6H99.89C99.89 173.36 85.92 159.39 68.68 159.39H41H40.99ZM131.09 159.39C131.09 176.63 145.06 190.6 162.3 190.6H189.98C191.93 190.6 193.51 189.02 193.51 187.07V163.14C193.51 161.07 191.83 159.39 189.76 159.39H131.08H131.09ZM103.41 96.97C101.46 96.97 99.88 98.55 99.88 100.5V128.18C99.88 145.42 113.85 159.39 131.09 159.39V100.71C131.09 98.64 129.41 96.96 127.34 96.96H103.41V96.97Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_2005_93">
+<rect width="1165" height="366" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/crates/egui_demo_lib/data/icon.png b/crates/egui_demo_lib/data/icon.png
index 87f15e746..27a6c9534 100644
Binary files a/crates/egui_demo_lib/data/icon.png and b/crates/egui_demo_lib/data/icon.png differ
diff --git a/crates/egui_demo_lib/data/icon.svg b/crates/egui_demo_lib/data/icon.svg
new file mode 100644
index 000000000..1723ec602
--- /dev/null
+++ b/crates/egui_demo_lib/data/icon.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 16 16">
+<rect x="0.1" y="0.1" width="15.8" height="15.8" rx="2.75714" fill="black" data-darkreader-inline-fill="" style="--darkreader-inline-fill: var(--darkreader-background-000000, #000000);"/>
+<rect x="0.1" y="0.1" width="15.8" height="15.8" rx="2.75714" stroke="white" stroke-width="0.2" data-darkreader-inline-stroke="" style="--darkreader-inline-stroke: var(--darkreader-text-ffffff, #e8e6e3);"/>
+<path d="M10.6112 2.54492C10.8843 2.54492 11.1367 2.69172 11.2733 2.93066L13.9286 7.5752C14.065 7.81401 14.0649 8.10877 13.9286 8.34766L11.2733 12.9932C11.1367 13.232 10.8843 13.3789 10.6112 13.3789H5.30162C5.02857 13.3789 4.77605 13.2321 4.63951 12.9932L1.98521 8.34766C1.8487 8.10872 1.84866 7.81412 1.98521 7.5752L4.63951 2.93066C4.77605 2.69176 5.02855 2.54497 5.30162 2.54492H10.6112ZM7.13658 11.8691C7.13674 11.9778 7.22514 12.0654 7.33384 12.0654H8.59263C8.69507 12.0652 8.77818 11.9824 8.77818 11.8799V10.4238C8.77797 9.51742 8.04301 8.78231 7.13658 8.78223V11.8691ZM4.03892 7.14062C3.93634 7.1407 3.85337 7.22456 3.85337 7.32715V8.58594C3.85355 8.6946 3.94195 8.78223 4.05064 8.78223H7.13658C7.13637 7.87582 6.40142 7.1407 5.49498 7.14062H4.03892ZM8.7772 7.14062C8.7772 8.04726 9.51217 8.78223 10.4188 8.78223H11.8749C11.9773 8.78201 12.0604 8.69918 12.0604 8.59668V7.33789C12.0604 7.22913 11.9719 7.14062 11.8631 7.14062H8.7772ZM7.32212 3.85742C7.21955 3.85749 7.13658 3.94135 7.13658 4.04395V5.49902C7.13658 6.40566 7.87154 7.14062 8.77818 7.14062V4.05469C8.77816 3.94591 8.68971 3.85742 8.58091 3.85742H7.32212Z" fill="white" data-darkreader-inline-fill="" style="--darkreader-inline-fill: var(--darkreader-background-ffffff, #181a1b);"/>
+</svg>
\ No newline at end of file
diff --git a/crates/egui_demo_lib/data/peace.svg b/crates/egui_demo_lib/data/peace.svg
deleted file mode 100644
index 4bf3e33a9..000000000
--- a/crates/egui_demo_lib/data/peace.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg"
-     xmlns:svg="http://www.w3.org/2000/svg"
-     viewBox="0 0 44 44" width="32" height="32">
-  <g fill="none" stroke="white" stroke-width="3">
-    <circle cx="22" cy="22" r="19"/>
-    <path d="M 22,2 V 41"/>
-    <path d="M 22,2 V 22" transform="rotate(135, 22, 22)"/>
-    <path d="M 22,2 V 22" transform="rotate(225, 22, 22)"/>
-  </g>
-</svg>
diff --git a/crates/egui_demo_lib/src/demo/about.rs b/crates/egui_demo_lib/src/demo/about.rs
index 56e2f1eaa..227aff429 100644
--- a/crates/egui_demo_lib/src/demo/about.rs
+++ b/crates/egui_demo_lib/src/demo/about.rs
@@ -27,20 +27,29 @@ impl crate::View for About {
     fn ui(&mut self, ui: &mut egui::Ui) {
         use egui::special_emojis::{OS_APPLE, OS_LINUX, OS_WINDOWS};
 
-        ui.heading("egui");
+        ui.vertical_centered(|ui| {
+            ui.add_space(4.0);
+            ui.add(
+                egui::Image::new(egui::include_image!("../../data/egui-logo.svg"))
+                    .max_height(30.0)
+                    .tint(ui.visuals().strong_text_color()),
+            );
+            ui.add_space(4.0);
+        });
+
         ui.label(format!(
-            "egui is an immediate mode GUI library written in Rust. egui runs both on the web and natively on {}{}{}. \
-            On the web it is compiled to WebAssembly and rendered with WebGL.{}",
+            "egui is an immediate mode GUI library written in Rust. egui runs natively on {}{}{}, and \
+            on the web it is compiled to WebAssembly and rendered with WebGL or WebGPU.{}",
             OS_APPLE, OS_LINUX, OS_WINDOWS,
             if cfg!(target_arch = "wasm32") {
                 " Everything you see is rendered as textured triangles. There is no DOM, HTML, JS or CSS. Just Rust."
             } else {""}
         ));
-        ui.label("egui is designed to be easy to use, portable, and fast.");
 
         ui.add_space(12.0);
+        ui.label("egui is easy to use, portable, and fast.");
 
-        ui.heading("Immediate mode");
+        ui.add_space(12.0);
         about_immediate_mode(ui);
 
         ui.add_space(12.0);
@@ -52,12 +61,12 @@ impl crate::View for About {
 
         ui.horizontal_wrapped(|ui| {
             ui.spacing_mut().item_spacing.x = 0.0;
-            ui.label("egui development is sponsored by ");
+            ui.weak("egui development is sponsored by ");
             ui.hyperlink_to("Rerun.io", "https://www.rerun.io/");
-            ui.label(", a startup building an SDK for visualizing streams of multimodal data. ");
-            ui.label("For an example of a real-world egui app, see ");
+            ui.weak(", a startup building a data platform for robotics. ");
+            ui.weak("For an example of a professional egui app, run ");
             ui.hyperlink_to("rerun.io/viewer", "https://www.rerun.io/viewer");
-            ui.label(" (runs in your browser).");
+            ui.weak(" (in your browser!).");
         });
 
         ui.add_space(12.0);
@@ -72,11 +81,9 @@ fn about_immediate_mode(ui: &mut egui::Ui) {
     ui.style_mut().spacing.interact_size.y = 0.0; // hack to make `horizontal_wrapped` work better with text.
 
     ui.horizontal_wrapped(|ui| {
-            ui.spacing_mut().item_spacing.x = 0.0;
-            ui.label("Immediate mode is a GUI paradigm that lets you create a GUI with less code and simpler control flow. For example, this is how you create a ");
-            let _ = ui.small_button("button");
-            ui.label(" in egui:");
-        });
+        ui.spacing_mut().item_spacing.x = 0.0;
+        ui.label("This is how you create a button in egui:");
+    });
 
     ui.add_space(8.0);
     crate::rust_view_ui(
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 d2cc17448..1c7831016 100644
--- a/crates/egui_demo_lib/src/demo/demo_app_windows.rs
+++ b/crates/egui_demo_lib/src/demo/demo_app_windows.rs
@@ -119,21 +119,30 @@ impl Default for DemoGroups {
 }
 
 impl DemoGroups {
+    pub fn about_egui_checkbox(&mut self, ui: &mut Ui, open: &mut BTreeSet<String>) {
+        let Self { about, .. } = self;
+        let mut is_open = open.contains(about.name());
+        ui.toggle_value(&mut is_open, about.name());
+        set_open(open, about.name(), is_open);
+    }
+
     pub fn checkboxes(&mut self, ui: &mut Ui, open: &mut BTreeSet<String>) {
         let Self {
-            about,
+            about: _,
             demos,
             tests,
         } = self;
 
-        {
-            let mut is_open = open.contains(about.name());
-            ui.toggle_value(&mut is_open, about.name());
-            set_open(open, about.name(), is_open);
-        }
-        ui.separator();
+        ui.vertical_centered(|ui| {
+            ui.strong("Demos");
+        });
         demos.checkboxes(ui, open);
+
         ui.separator();
+
+        ui.vertical_centered(|ui| {
+            ui.strong("Tests");
+        });
         tests.checkboxes(ui, open);
     }
 
@@ -267,22 +276,20 @@ impl DemoWindows {
             .default_size(160.0)
             .min_size(160.0)
             .show_inside(ui, |ui| {
-                ui.add_space(4.0);
-                ui.vertical_centered(|ui| {
-                    ui.heading("✒ egui demos");
+                ui.vertical_centered_justified(|ui| {
+                    ui.add_space(4.0);
+                    ui.add(
+                        egui::Image::new(egui::include_image!("../../data/egui-logo.svg"))
+                            .max_height(32.0)
+                            .tint(ui.visuals().strong_text_color()),
+                    );
+
+                    ui.add_space(4.0);
+
+                    self.groups.about_egui_checkbox(ui, &mut self.open);
                 });
 
-                ui.separator();
-
-                use egui::special_emojis::GITHUB;
-                ui.hyperlink_to(
-                    format!("{GITHUB} egui on GitHub"),
-                    "https://github.com/emilk/egui",
-                );
-                ui.hyperlink_to(
-                    "@ernerfeldt.bsky.social",
-                    "https://bsky.app/profile/ernerfeldt.bsky.social",
-                );
+                ui.add_space(4.0);
 
                 ui.separator();
 
diff --git a/crates/egui_demo_lib/src/demo/strip_demo.rs b/crates/egui_demo_lib/src/demo/strip_demo.rs
index 94df7bb57..69bcce4f6 100644
--- a/crates/egui_demo_lib/src/demo/strip_demo.rs
+++ b/crates/egui_demo_lib/src/demo/strip_demo.rs
@@ -27,7 +27,7 @@ impl crate::Demo for StripDemo {
 impl crate::View for StripDemo {
     fn ui(&mut self, ui: &mut egui::Ui) {
         let dark_mode = ui.visuals().dark_mode;
-        let faded_color = ui.visuals().window_fill();
+        let faded_color = ui.stack().bg_color();
         let faded_color = |color: Color32| -> Color32 {
             use egui::Rgba;
             let t = if dark_mode { 0.95 } else { 0.8 };
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 cd73f9150..9c188df74 100644
--- a/crates/egui_demo_lib/src/demo/tests/svg_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/svg_test.rs
@@ -30,7 +30,7 @@ impl crate::View for SvgTest {
     fn ui(&mut self, ui: &mut egui::Ui) {
         let Self { color } = self;
         ui.color_edit_button_srgba(color);
-        let img_src = egui::include_image!("../../../data/peace.svg");
+        let img_src = egui::include_image!("../../../data/icon.svg");
 
         // First paint a small version, sized the same as the source…
         ui.add(
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 3bb814889..abe3280eb 100644
--- a/crates/egui_demo_lib/src/demo/tests/tessellation_test.rs
+++ b/crates/egui_demo_lib/src/demo/tests/tessellation_test.rs
@@ -297,6 +297,7 @@ fn rect_shape_ui(ui: &mut egui::Ui, shape: &mut RectShape) {
         blur_width,
         round_to_pixels,
         brush: _,
+        angle: _,
     } = shape;
 
     let round_to_pixels = round_to_pixels.get_or_insert(true);
diff --git a/crates/egui_demo_lib/src/demo/text_edit.rs b/crates/egui_demo_lib/src/demo/text_edit.rs
index 3ec53a523..8fd42da11 100644
--- a/crates/egui_demo_lib/src/demo/text_edit.rs
+++ b/crates/egui_demo_lib/src/demo/text_edit.rs
@@ -1,15 +1,21 @@
+use egui::{Align, Align2, AtomExt as _};
+
 /// Showcase [`egui::TextEdit`].
 #[derive(PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[cfg_attr(feature = "serde", serde(default))]
 pub struct TextEditDemo {
     pub text: String,
+    halign: egui::Align,
+    valign: egui::Align,
 }
 
 impl Default for TextEditDemo {
     fn default() -> Self {
         Self {
             text: "Edit this text".to_owned(),
+            halign: egui::Align::LEFT,
+            valign: egui::Align::TOP,
         }
     }
 }
@@ -37,7 +43,11 @@ impl crate::View for TextEditDemo {
             ui.add(crate::egui_github_link_file!());
         });
 
-        let Self { text } = self;
+        let Self {
+            text,
+            halign,
+            valign,
+        } = self;
 
         ui.horizontal(|ui| {
             ui.spacing_mut().item_spacing.x = 0.0;
@@ -46,10 +56,40 @@ impl crate::View for TextEditDemo {
             ui.label(".");
         });
 
+        ui.horizontal(|ui| {
+            ui.label("Horizontal align:");
+            ui.selectable_value(halign, egui::Align::LEFT, "Left");
+            ui.selectable_value(halign, egui::Align::Center, "Center");
+            ui.selectable_value(halign, egui::Align::RIGHT, "Right");
+        });
+        ui.horizontal(|ui| {
+            ui.label("Vertical align:");
+            ui.selectable_value(valign, egui::Align::TOP, "Top");
+            ui.selectable_value(valign, egui::Align::Center, "Center");
+            ui.selectable_value(valign, egui::Align::BOTTOM, "Bottom");
+        });
+
+        let clear_id = egui::Id::new("clear_button");
+        let clear_size = egui::Vec2::splat(ui.spacing().interact_size.y);
+
         let output = egui::TextEdit::multiline(text)
             .hint_text("Type something!")
+            // Atoms are centered by default, so we need to pass the right align here:
+            .prefix("🔎".atom_align(Align2([Align::LEFT, *valign])))
+            .suffix(
+                egui::Atom::custom(clear_id, clear_size)
+                    .atom_align(Align2([Align::RIGHT, *valign])),
+            )
+            .horizontal_align(*halign)
+            .vertical_align(*valign)
             .show(ui);
 
+        if let Some(rect) = output.response.rect(clear_id)
+            && ui.place(rect, egui::Button::new("❌")).clicked()
+        {
+            text.clear();
+        }
+
         ui.horizontal(|ui| {
             ui.spacing_mut().item_spacing.x = 0.0;
             ui.label("Selected text: ");
diff --git a/crates/egui_demo_lib/src/demo/text_layout.rs b/crates/egui_demo_lib/src/demo/text_layout.rs
index ef84fb326..656d5a6d2 100644
--- a/crates/egui_demo_lib/src/demo/text_layout.rs
+++ b/crates/egui_demo_lib/src/demo/text_layout.rs
@@ -7,17 +7,21 @@ pub struct TextLayoutDemo {
     overflow_character: Option<char>,
     extra_letter_spacing: f32,
     line_height_pixels: u32,
+    halign: egui::Align,
+    justify: bool,
     lorem_ipsum: bool,
 }
 
 impl Default for TextLayoutDemo {
     fn default() -> Self {
         Self {
-            max_rows: 6,
-            break_anywhere: true,
+            max_rows: 1000,
+            break_anywhere: false,
             overflow_character: Some('…'),
             extra_letter_spacing: 0.0,
             line_height_pixels: 0,
+            halign: egui::Align::LEFT,
+            justify: false,
             lorem_ipsum: true,
         }
     }
@@ -48,6 +52,8 @@ impl crate::View for TextLayoutDemo {
             overflow_character,
             extra_letter_spacing,
             line_height_pixels,
+            halign,
+            justify,
             lorem_ipsum,
         } = self;
 
@@ -109,6 +115,18 @@ impl crate::View for TextLayoutDemo {
                 });
                 ui.end_row();
 
+                ui.label("Horizontal align:");
+                ui.horizontal(|ui| {
+                    ui.selectable_value(halign, egui::Align::LEFT, "Left");
+                    ui.selectable_value(halign, egui::Align::Center, "Center");
+                    ui.selectable_value(halign, egui::Align::RIGHT, "Right");
+                });
+                ui.end_row();
+
+                ui.label("Justify:");
+                ui.checkbox(justify, "Fill row width");
+                ui.end_row();
+
                 ui.label("Text:");
                 ui.horizontal(|ui| {
                     ui.selectable_value(lorem_ipsum, true, "Lorem Ipsum");
@@ -145,8 +163,14 @@ impl crate::View for TextLayoutDemo {
                     ..Default::default()
                 };
 
-                // NOTE: `Label` overrides some of the wrapping settings, e.g. wrap width
-                ui.label(job);
+                // NOTE: `Label` overrides some of the wrapping settings,
+                // e.g. wrap width, halign, and justify.
+                ui.with_layout(
+                    egui::Layout::top_down(*halign).with_cross_justify(*justify),
+                    |ui| {
+                        ui.label(job);
+                    },
+                );
             });
     }
 }
diff --git a/crates/egui_demo_lib/src/demo/widget_gallery.rs b/crates/egui_demo_lib/src/demo/widget_gallery.rs
index fe783af1c..ec5d5f3eb 100644
--- a/crates/egui_demo_lib/src/demo/widget_gallery.rs
+++ b/crates/egui_demo_lib/src/demo/widget_gallery.rs
@@ -19,11 +19,11 @@ pub struct WidgetGallery {
     color: egui::Color32,
     animate_progress_bar: bool,
 
-    #[cfg(feature = "chrono")]
+    #[cfg(feature = "jiff")]
     #[cfg_attr(feature = "serde", serde(skip))]
-    date: Option<chrono::NaiveDate>,
+    date: Option<jiff::civil::Date>,
 
-    #[cfg(feature = "chrono")]
+    #[cfg(feature = "jiff")]
     with_date_button: bool,
 }
 
@@ -39,19 +39,19 @@ impl Default for WidgetGallery {
             string: Default::default(),
             color: egui::Color32::LIGHT_BLUE.linear_multiply(0.5),
             animate_progress_bar: false,
-            #[cfg(feature = "chrono")]
+            #[cfg(feature = "jiff")]
             date: None,
-            #[cfg(feature = "chrono")]
+            #[cfg(feature = "jiff")]
             with_date_button: true,
         }
     }
 }
 
 impl WidgetGallery {
-    #[allow(clippy::allow_attributes, unused_mut)] // if not chrono
+    #[allow(clippy::allow_attributes, unused_mut)] // if not jiff
     #[inline]
     pub fn with_date_button(mut self, _with_date_button: bool) -> Self {
-        #[cfg(feature = "chrono")]
+        #[cfg(feature = "jiff")]
         {
             self.with_date_button = _with_date_button;
         }
@@ -140,9 +140,9 @@ impl WidgetGallery {
             string,
             color,
             animate_progress_bar,
-            #[cfg(feature = "chrono")]
+            #[cfg(feature = "jiff")]
             date,
-            #[cfg(feature = "chrono")]
+            #[cfg(feature = "jiff")]
             with_date_button,
         } = self;
 
@@ -229,7 +229,7 @@ impl WidgetGallery {
         ui.end_row();
 
         ui.add(doc_link_label("Image", "Image"));
-        let egui_icon = egui::include_image!("../../data/icon.png");
+        let egui_icon = egui::include_image!("../../data/icon.svg");
         ui.add(egui::Image::new(egui_icon.clone()));
         ui.end_row();
 
@@ -237,17 +237,14 @@ impl WidgetGallery {
             "Button with image",
             "Button::image_and_text",
         ));
-        if ui
-            .add(egui::Button::image_and_text(egui_icon, "Click me!"))
-            .clicked()
-        {
+        if ui.button((egui_icon, "Click me!")).clicked() {
             *boolean = !*boolean;
         }
         ui.end_row();
 
-        #[cfg(feature = "chrono")]
+        #[cfg(feature = "jiff")]
         if *with_date_button {
-            let date = date.get_or_insert_with(|| chrono::offset::Utc::now().date_naive());
+            let date = date.get_or_insert_with(|| jiff::Zoned::now().date());
             ui.add(doc_link_label_with_crate(
                 "egui_extras",
                 "DatePickerButton",
@@ -305,7 +302,7 @@ fn doc_link_label_with_crate<'a>(
     }
 }
 
-#[cfg(feature = "chrono")]
+#[cfg(feature = "jiff")]
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -317,7 +314,7 @@ mod tests {
     pub fn should_match_screenshot() {
         let mut demo = WidgetGallery {
             // If we don't set a fixed date, the snapshot test will fail.
-            date: Some(chrono::NaiveDate::from_ymd_opt(2024, 1, 1).unwrap()),
+            date: Some(jiff::civil::date(2024, 1, 1)),
             ..Default::default()
         };
 
diff --git a/crates/egui_demo_lib/tests/misc.rs b/crates/egui_demo_lib/tests/misc.rs
index d5f6a3a3c..427710629 100644
--- a/crates/egui_demo_lib/tests/misc.rs
+++ b/crates/egui_demo_lib/tests/misc.rs
@@ -13,8 +13,9 @@ fn test_kerning() {
                     ui.label("Hello world!");
                     ui.label("Repeated characters: iiiiiiiiiiiii lllllllll mmmmmmmmmmmmmmmm");
                     ui.label("Thin spaces: −123 456 789");
-                    ui.label("Ligature: fi :)");
-                    ui.label("\ttabbed");
+                    ui.label("Ligature: fi fl ffi ffl");
+                    ui.label("Kerning: AVATAR");
+                    ui.label("\ttabbed\ttext");
                 });
             harness.run();
             harness.fit_contents();
@@ -61,21 +62,25 @@ fn test_italics() {
 fn test_text_selection() {
     let mut results = egui_kittest::SnapshotResults::new();
 
-    for (test_idx, drag_start_x) in [0.2_f32, 0.9].into_iter().enumerate() {
-        let mut harness = Harness::builder().build_ui(|ui| {
-            let visuals = ui.visuals_mut();
-            visuals.selection.bg_fill = Color32::LIGHT_GREEN;
-            visuals.selection.stroke.color = Color32::RED;
+    for (test_idx, drag_start_x) in [0.2_f32, 0.95].into_iter().enumerate() {
+        let mut harness = Harness::builder()
+            .with_pixels_per_point(1.0) // TODO(emilk): why does this test fail with 2.0?
+            .build_ui(|ui| {
+                let visuals = ui.visuals_mut();
+                visuals.selection.bg_fill = Color32::LIGHT_GREEN;
+                visuals.selection.stroke.color = Color32::RED;
 
-            ui.label("Some varied ☺ text :)\nAnd it has a second line!");
-        });
+                ui.vertical_centered(|ui| {
+                    ui.label("Some varied ☺ text :)\nAnd it has a second line!\nAnd a third!");
+                });
+            });
         harness.run();
         harness.fit_contents();
 
         // Drag to select text:
         let label = harness.get_by_role(Role::Label);
         harness.drag_at(label.rect().lerp_inside([drag_start_x, 0.25]));
-        harness.drop_at(label.rect().lerp_inside([0.6, 0.75]));
+        harness.drop_at(label.rect().lerp_inside([0.5, 0.75]));
         harness.run();
 
         harness.snapshot(format!("text_selection_{test_idx}"));
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 71bed3294..96d7706ee 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:bff16d453b960bb9abcdd9f72dab73f8f25da6339a0e1c310ed352f57080db93
-size 32426
+oid sha256:10d64e017d1d0eba736a4471d28b1602a0cb69d8e2ab53f4ee604b01c9343116
+size 32475
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 2549417be..c9a05a629 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:a53262cf5d8507d8eeae8c968767cef462b727879245085673982b850a6da670
-size 26977
+oid sha256:ab0d730ce0cf5f1d79947601def4f60c0a015e23a5dcd780df65c7ddc7ae7156
+size 27194
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 f4b7690fc..6134dfad9 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:75a9cd9a3315b236c23a53e890de1a821d39c3327813d06df85ba86d2ed50cc7
-size 26887
+oid sha256:6fccbda741a056ae30a7bfd7497f7b0adfb337bdb885d247fbdfef43cc24b54c
+size 26948
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 46a5ed1f7..d43e856aa 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:a7601584308bf60820506f842569a3c1daf3c15fa6e715f6b9386b5112dcc92f
-size 76076
+oid sha256:26d247655398bae33c724ad3c3bdcab330d194093b07442708d5069e256f636b
+size 76542
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 d4c9508f9..60d3993ef 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:d4e33c7f817100d8414bba245ee7886354b86109f383d59e87a197e39501f0a0
-size 62604
+oid sha256:e3389491f9f5c54cfc2e295abe76ad53f223c31e9489e1d07a8323cf14fcf37d
+size 62628
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 40153611c..c59717683 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:93fcc271831167cb077f3de0a9f0e27037f9e5a2ce94e056bd6f1ede9890cb7e
-size 27818
+oid sha256:6e42e801758bb9e6130a4e94bd0857d6f254e68a7dedebec5af5cb7f7d896068
+size 27822
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 049d585ec..f3c65337f 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:d194db1705b36c1ee6189878a323a591555493c9319b7c2ddfc0cb0541055aca
-size 20948
+oid sha256:41e68fd3a679e2a6e3dd81129de5aa1ded3a8f24cc7b1f2ba0b876240d309d9b
+size 21019
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 1440d2be2..6a050e0e8 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:62af1b6d248b731b0930c51e481118ae01a5d8c08f27697ff121a47fefea83bf
-size 10795
+oid sha256:3db502ec416b322e0f98e9737faa52d5d2fd308d47649710fffa0b0bc5996f52
+size 10783
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 375b0f922..b187b4cfd 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:3fc2793506ec483c7f124b6206fb18ffb73bec29746f2d9bb5145042ddc45016
-size 114410
+oid sha256:c39ae3420fe01d696a032d8d052c405c5623a9208fc673f5cf09188b1e6a539b
+size 115447
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Frame.png b/crates/egui_demo_lib/tests/snapshots/demos/Frame.png
index b8791ed2e..658cb0922 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:20ea4f93ee50c7a3585aef74c66d7700083ac1c16519b0704b70387849d9d2bc
-size 25057
+oid sha256:19322248e8335301b2ce31fc1f1352993a374dda945d227784fecea2ee831761
+size 25088
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 b8f0440b6..f6f9a3cda 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:1b72a4c0e6d441190a7a156b8bba709e81b6c1fe7b0eacedc1ee7a3bfcf881f6
-size 99297
+oid sha256:98f8865d866a6f28ae3e3a16c815770ed691a031b1d06f7d3662a7e94f564606
+size 99318
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Highlighting.png b/crates/egui_demo_lib/tests/snapshots/demos/Highlighting.png
index a965901d5..ab7de6c2d 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:08c40934d4bd2a239bdcc1928d1e5eba56bac03fdded2c85cf47b020d669f07e
-size 18281
+oid sha256:39208c3c2c95f68fb37880b011f866bedd8dbccee33d163a725cb2a5cc6bb1b3
+size 18290
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 abd7c485b..b899d7356 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:82878e4150e38fdc4b2e78203c8c661c2d9e716ab32595c298392faf6ba96105
-size 113803
+oid sha256:d251ffd6c34e4ffa7b5de7fe5ae57a2d8f48ba7c2e03711da2c3f1a3fd84648c
+size 113998
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 46a949571..5b3a63aeb 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:72d49d9a35e16e7413158ba14ce9cab762925f5f5e52fbbe16292de499a177f1
-size 25791
+oid sha256:4d959e17ee5c8a32534ab98b6f08db884b2fbf25476d8dc2dc90edc79bd87ea4
+size 25821
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 8c3634222..85c205be0 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:bb7e3887cf12bd00ea09b297ac361562a961f64c15b28360bc87f72f270a4065
-size 51649
+oid sha256:c923f523cc77d678929f294b360f60b9f546ddec66d5317ad0eb44bd61a5f927
+size 51733
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 d01e4bb7b..b7d365f3a 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:58cd3aba4392332a45f57c7dd90a9b5da386cb396c0c6319e7a7dae71e03ff30
-size 22563
+oid sha256:c9c98d7bfa08e22e217dd9e7031cc49e4b4486f1a9fdd223bd122be07af72365
+size 22550
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 0f50709d3..a4a82635b 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:26ffcf6b71108b82ce15d4cf3f9dd0ce9fe0b9563f02725fef1b74f40e749439
-size 47281
+oid sha256:68afa93605427e12fe527f3ca9613095664b4983f1f585a60f14bc2370c0a1f2
+size 47224
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 1ba4655fd..b0cb0c27b 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:faedf9631149e231d510165215c24fccec50502d58000d5f893aa047a637a68f
-size 23148
+oid sha256:33959851f1bd2386fcca8fb5700133d14d90db5a8f783fbfaa9f3aebb7b0d5b2
+size 23119
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 f34ac0cd4..28e6d1845 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:b6b4c2e55c02fa4caf5f9f8bd2d8c0311cc4cbcf1fc2f568fe112e8e6125c675
-size 65308
+oid sha256:7b918565d66594fe53ed62bb14e357d3489335f3d037ccb088f198d944eb367d
+size 65307
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Modals.png b/crates/egui_demo_lib/tests/snapshots/demos/Modals.png
index 28fe7b683..7f0357df1 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:3a65927cd8bd8d24e3ffbea8eb421eb22849b27dc77d36f8acd82bf5d5e63959
-size 33469
+oid sha256:f8c3c2912a3a11892e65f94792c77c79400a81d8c913109d39e8ce12f5b095c6
+size 33503
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 4e2c0a458..59609d76a 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:115398e2b4b459afc2f1c49c4e60ef3f63e562650f05581372002c93030da632
-size 38374
+oid sha256:0c2c7b0d4913b59ef932f6d6349ddab5cc8619b2e8e9a8b5eb3e055a62e6ed60
+size 38382
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Painting.png b/crates/egui_demo_lib/tests/snapshots/demos/Painting.png
index da06d85bf..4d4b5c355 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:9c595ee9b7ada33780178a6a35e26a98055a707f2ff99f6bb36e8db4ed819791
-size 18242
+oid sha256:9567f56f2dd030608798347e1ab755d95730ba5c5dd1721f1c61147be7216e87
+size 18304
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Panels.png b/crates/egui_demo_lib/tests/snapshots/demos/Panels.png
index 992fb471e..553f8aa0b 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:627114dcbda4f3d2255d34926ed0b77c679d248ed1d822d723479b1e6652c67a
-size 249258
+oid sha256:d19d694e6a70ab6acb45668b391751e82f7beab19f9918e23821c667e8cc9cdb
+size 249733
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Popups.png b/crates/egui_demo_lib/tests/snapshots/demos/Popups.png
index 0aab4baf8..6a18dc9e5 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:c218115d305dfa6c9ab883ac6f3a21584b4840b3ba273ea765c8a8381d78935f
-size 57181
+oid sha256:9e1c73e28020371429b3e03d540f72dbf886fd40f0ba08bb194e868bbb3c95ff
+size 57230
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 8aa13dbfa..92d19c470 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:888ed4281c2c779b08bc1719302b9923f542026811cff8ae91e44ea1faa25783
-size 25804
+oid sha256:c2facd3881e6b107a0dcce9d6e00008a3c9b0f31ad270c35357a87e487180f56
+size 19814
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Scene.png b/crates/egui_demo_lib/tests/snapshots/demos/Scene.png
index 277f7ab2c..de52524ac 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:4d10b78f4d80d61a3352d7f2b0ed9b2d93af5f184f2487f6f2afff02a38f4608
-size 33475
+oid sha256:0ad81eb762150360368a97858ef30bb0d5aff72e71743fa40c3fd4d70ec84cdc
+size 33400
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Screenshot.png b/crates/egui_demo_lib/tests/snapshots/demos/Screenshot.png
index 5517e03ef..14603f2f2 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:f2ce9062c5d1f0b0861d5df49ae64e56ba0e6501e8bd3f8a92c53aea748be78b
-size 23629
+oid sha256:c22130891755ac095d73e0494f11ee8e89d0fd0c31a321d3afb969648ece11ef
+size 23675
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Scrolling.png b/crates/egui_demo_lib/tests/snapshots/demos/Scrolling.png
index 24e42cb23..525f23435 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:b5b965a7c690fd8e8646812513e2417170b687fd37e29d220c29127ba0cc200c
-size 172609
+oid sha256:465f33e53ebe15b776e2d6d0710f13f2453f00bab1f6ef4319b3491f1d1d3a26
+size 173487
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Sliders.png b/crates/egui_demo_lib/tests/snapshots/demos/Sliders.png
index 28864a446..34ec70a65 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:6ffba8bb50b42e47f855f62682f6d5ec10bf67b01d3aa2e843f6bf787f150d0d
-size 118562
+oid sha256:001f7a1310ddf37be4d9a7f56a95a3079f713b741824a348544561bb16c291fa
+size 118614
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Strip.png b/crates/egui_demo_lib/tests/snapshots/demos/Strip.png
index c28cac211..b9dea21f0 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:9d8d87e4cb944def0dc28e3515243a8c1b07b9b0f88e802924d4381c1cda74db
-size 26763
+oid sha256:8105f7c2b519716cc0a45dffd5f08980f53f35c6c6b788592e1d82506cdacccc
+size 26665
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Table.png b/crates/egui_demo_lib/tests/snapshots/demos/Table.png
index 3f72922d2..909b766b9 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:931f38ade8373ff79801c05c5d4397f2c5fcfa27022f2e1abe9eb29d561a3aef
-size 76022
+oid sha256:a9e83d5e83e3003830f7f719b02dd93273733a9b72d388aa42083387d02c1a20
+size 76310
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 c1b6f506a..b1ed6bcde 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:57bf5220ae8f47485a07e9117abaaad36924d8c6c0f9e278cb05c455f342bff6
-size 70250
+oid sha256:3d46c87417c49c8462fac6c488e46b1482bbc75f70fe8f7af8391f0d5d28dac3
+size 70271
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 e9b302746..0bd5b9ceb 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:7c964d07a39ad286a562b53cdfe514d568d91955e6c1ca06a0cb5e45dbe3977e
-size 60947
+oid sha256:661570ed4bdf24d52ab049e7d3cf22ef4d50542ee5486d133e0a618a6146da42
+size 98582
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/TextEdit.png b/crates/egui_demo_lib/tests/snapshots/demos/TextEdit.png
index 843bb93b4..839a15faa 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:718203d31d8b027a7718a66c4712cf1e17b9aea2e870d755bd2c0c346529d4f4
-size 21814
+oid sha256:94c4af5715992f4dbb5bbec6ce67eec1e2f66cfc078a3e704ec386bdb482cac4
+size 30064
diff --git a/crates/egui_demo_lib/tests/snapshots/demos/Tooltips.png b/crates/egui_demo_lib/tests/snapshots/demos/Tooltips.png
index 23adea69c..bea2050ab 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:89986132c5d2a3ccccf0a16cb2b0be07b7c5512838cc10ec9067022e7a238515
-size 63918
+oid sha256:9d69b9a12e777ee559a481aec012935a5bfb2ca8b0d48725ecd33e7f0880b2b8
+size 64273
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 81204a347..728dc59b6 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:6af5adc42544171c6d85e190c853aca06784c131a373a693a6f7069d4cf1a404
-size 13698
+oid sha256:f6c020860fe9cb7503cea548afbf298ebb9dc620133870b528fe7508d04150c8
+size 13691
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 78446cca9..951a6fd41 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:2e8e03c2a42e195e6489659053aecb78755d3c218558cb2e9339fa7b6db59405
-size 35875
+oid sha256:d033935ca18ebee7e3c35629233cc3e3a73766ac8c0627fcdd8a12660eed703c
+size 35873
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 a6d103d6d..933343f25 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:ad22ea6b6e69fd71416fdae76cbd142d279f8f562e74b77e63b3989be187c57c
-size 484631
+oid sha256:77c9058b036770a644f1bfcf9ed1ba7a29a7c98107b1823474c55ccc2880e9e7
+size 485880
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 5cc884a55..d65dcb44f 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:c8ea98c65376d9f6ac66d0a9471c4bf3add0904294e7ca1a105458b90654a2e2
-size 12476
+oid sha256:6d64cc7d014cf063689a4dd8a6cdd87eb944f9637890baf32f59a258342400bf
+size 15400
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 1359fd607..147a692f2 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:968c478d986fc71d8655492b19e833ca07bc0ab85899dc04022bc7cf1dcf782f
-size 29319
+oid sha256:9e9f800546cc98bbd92f31072aceef10b5b8b9bbef0db4c8f4dbae652aefec61
+size 35918
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 b223bbb3d..ad6dd5637 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:3793a5e83ef9bdffef99bcd8905a094acb69cde356e3a7125a544045296c3926
-size 13070
+oid sha256:e3f6e1cc6a069ac96ff9e039ce85462453ee943b4cb46080550bc1c0749ad658
+size 16085
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 80e561325..71b8a1cee 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:61e59f8360c567e20bf03b401362de7bb0f87716f13e817cc8da3df742ab68bf
-size 31869
+oid sha256:5901b5a8201b85b51118193eef300749a4569eedc62043cd4e03f76e73a12f51
+size 39222
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 5018d53c8..081f36a0e 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:7389e319d9153af313cc113d97b57d462da00feb0d5f99da211552af3ac7e18a
-size 6704
+oid sha256:19c9ae55906e0ad18a9507898884ec31ef785c498fb8d10267ee848bd3f17186
+size 6705
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 3a1b72bb3..0bd058217 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:d4480dd34ed36c6bdbc2084843dd136448b3934c22b3df3e40314ba6324b5b39
-size 10306
+oid sha256:6f13116cb76e52620221b41c8dbd37b74a0da513402cbb2cb7e70c89027f5e31
+size 10313
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 0f18eb109..330ecd636 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:624bfa884431c35cc5d852b96653f13da17e60f8545471f9fb1c3bb85b40ffc8
-size 16555
+oid sha256:6869b180f2d1dcfd9fcbb215ed3febfbe548f30035560272a4e11e465f20c592
+size 16567
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 6ebc6addc..86374449e 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:bf665389ef43524e097a7ae4eec0aa01bb788bdbb306144f20f9133f74a64b2c
-size 6941
+oid sha256:132f060b2e20b4cc0c55062367381f47856a5cc10310b903dbddc3790f475581
+size 6942
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 54fdc064b..30b722245 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:a2480d0f49a929993de70612572b321457b2507c149a25112064cfc27840e6ee
-size 11005
+oid sha256:e5ec63c5e2f5bb5c0048ee67df5b821a30f89ba35dbedf72e7bc91e04a5f8359
+size 11007
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 138fd8c83..ca90da21d 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:1e0013b499934f47370a3a20b3d3a19f8a8c6db360752a35a3fb1d676d122263
-size 18068
+oid sha256:491bb98b22cf56e50d3ed10a10649db15aaffb93d7e045dfecfa26e98f537c35
+size 18070
diff --git a/crates/egui_demo_lib/tests/snapshots/modals_1.png b/crates/egui_demo_lib/tests/snapshots/modals_1.png
index 96d31e11d..d1abde4fa 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:941582e2e20a9459db1f2cb7f07fa1930acfdb12cbbe7f96f9aafbeabf8b37f6
-size 47076
+oid sha256:8bd53b56322123940496700cbd2a73e336fd80eaf49dcb19a958888d66570ddb
+size 47159
diff --git a/crates/egui_demo_lib/tests/snapshots/modals_2.png b/crates/egui_demo_lib/tests/snapshots/modals_2.png
index 3c0a88ee0..8f6976ea5 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:2735a021f171f5c95888cda76e8668e1e023588c8c6c7cd382c03d8e31988fe3
-size 48209
+oid sha256:d15954e6183558141e05e1b566ec4a794d372503baf436da2a8c8c67299056f1
+size 48238
diff --git a/crates/egui_demo_lib/tests/snapshots/modals_3.png b/crates/egui_demo_lib/tests/snapshots/modals_3.png
index 28221255f..ab4a99a12 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:867bef6b55b73d127306a461e115b6f0047d582904999de80aeabae00e60c967
-size 44295
+oid sha256:1738ecf660979888c70b1046dd759fe0b082e4958814fb19077c4fed2fb4bdef
+size 44338
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 bb1935741..cbac0d342 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:936ec8b223ae7f0f32c640c127e1b6b14033bb7d168a4d1f0e6b3bd08a761e36
-size 44055
+oid sha256:dae7239dc065068147387eb313afdbaa3f0df8b81d060dbbc29f5a6a31ad76c8
+size 44309
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 b48827b6a..ea32cd32f 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:fba7387f5deba5e144e2106154b15ab956a50a418857bd34e16b306d7f1a29e4
-size 588252
+oid sha256:ce6e44aeb60b6cc2179e14c467edc2d570ea1adbce08511650fc733e39f7757c
+size 590679
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 d1286d6a1..1bff62c8d 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:4656f3255d7859c07b269ff655eafe21bdddb949a07aa91477b826f6e2af8c28
-size 740616
+oid sha256:2edd6679d434df3407048472aaa95e410158f28e9a13c9bd88e3f8be95b08d9d
+size 745771
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 f1892bf26..39c2a6b36 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:b18ff644ba5bd0c7f094bf8eac079d8a72bc6918638b1b110002f2f0a7a362cc
-size 967860
+oid sha256:20cb796b59113853345c98e5238021a9c5c977c25689ee9201fdec1e4d98123d
+size 973781
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 c32762306..fb0da4a80 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:134caff5b8a4969055c32e8f51ca9c6eae1528b84d348691d860913e839de0d9
-size 1076746
+oid sha256:9658cc6b4dd2dd33356facc6b48cf69f9a86f976ac2dd4f16e362a2fd3f73827
+size 1081864
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 d021a1e71..736c3dd67 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:d731b4ce039315e096113f3c83168165020949e57564e641e778728e35901169
-size 1125286
+oid sha256:b5d5941c8fa0456f8a92fce4888e7a2888945f5df7cfed867ef073c439c7ad9f
+size 1131030
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 03d4fb69a..b4bf73cb7 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:cfac3518220555984d47c9fdfea2202a37102250aefcc2509794f337b3a7baae
-size 1361407
+oid sha256:78ef6dba3dcf5e26a9289ce226165224c712c22f9b5dfe699b599c7d2531133b
+size 1363589
diff --git a/crates/egui_demo_lib/tests/snapshots/tessellation_test.png b/crates/egui_demo_lib/tests/snapshots/tessellation_test.png
deleted file mode 100644
index 7c65aef2c..000000000
--- a/crates/egui_demo_lib/tests/snapshots/tessellation_test.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa7d25b097911f6b18308bab56d302e3dae9f8f9916f563d5703632a26eda260
-size 72501
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 1d3f1785e..09763f516 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:cf21fe763e9762bca1b0f486e29a6024efcbc106a7f1ac195104acd0621cf8db
-size 45107
+oid sha256:9c0bf76e2a4d60fd4ba302b2217beaa4b0627614ff7d23294c7f5e6b81a028c7
+size 45061
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 646eaa1e0..7254be665 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:2f09338e652b965cc9ae7bbb261845cd9c15d79f3d15f3c5b5326ef6d163b606
-size 86885
+oid sha256:de7db1296bdd127dfd827c6d1cc1a5a840391c3abb558be07faeb7e6612ed6e8
+size 86830
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 e667fc387..85a4fa0da 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:e298244953653e46875053b12b4fe06ee692cb58fc131233ac4172677f0f8b44
-size 118961
+oid sha256:645519e1e4c196b985b6b422ddf1ba51e7e92d1b0c80972318dcf44dab3022d3
+size 118907
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 843c3ba3b..a3c23b831 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:6b9b36acf821cca71f97a3c8468fb925561f3bc2030742aef1e3c1d9e69ccc6f
-size 51419
+oid sha256:465a3aa235ea69bce6650cf6e100ffc719bba67baa0cb13d7015a0fc54d53d9a
+size 51376
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 e738e22eb..ec1182d15 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:f5ad7a37546d48fc5426c32534a1c452fd0bf8280346dbe6e67ac26f17f3ba8a
-size 54626
+oid sha256:aac429243686d35096760eb1b7c6a2bcad1c1d00a3341a858a6c71aaff2cf128
+size 54582
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 d46e593ba..fa5ea442d 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:c0b61e9d1c2bcbf891a7acd4f3c1d2bd7524133d8165e7e7984998670de5a085
-size 55090
+oid sha256:8afb610d9e86b324db22849457eb23419c4f3c240e5ee951a13ce8901003bca8
+size 55053
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 31a1dd365..ec2750465 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:a2e4975e9328a6d72f2c932daddfbb00cebdb2249aceb53f667d4060a1c0ea8a
-size 36006
+oid sha256:8e1a958b753fee4bec405a74dd7727e5c477c946484ed086c5c4ffee058dd5e8
+size 35960
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 db20010e0..b725ec08f 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:ac6f9adeef92be9f69cb288ccafda8d522b8c3cde64352cd5369ae63668240c0
-size 35973
+oid sha256:1887d632d0994efec3dd7cecc41e3ad460c109baa1012d69e005cdc916e3cd24
+size 35925
diff --git a/crates/egui_demo_lib/tests/snapshots/text_selection_0.png b/crates/egui_demo_lib/tests/snapshots/text_selection_0.png
index 7930dff48..dae75cfc3 100644
--- a/crates/egui_demo_lib/tests/snapshots/text_selection_0.png
+++ b/crates/egui_demo_lib/tests/snapshots/text_selection_0.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:344d90928510855dc718a2e36e31a97f084f1163ab750d0217fb8620469b621a
-size 5276
+oid sha256:d7d8578b55ed8fdaf2062cb53d7320555e490289ff9efb30f39ebb697d2e252e
+size 6529
diff --git a/crates/egui_demo_lib/tests/snapshots/text_selection_1.png b/crates/egui_demo_lib/tests/snapshots/text_selection_1.png
index 8691211cb..4be490adc 100644
--- a/crates/egui_demo_lib/tests/snapshots/text_selection_1.png
+++ b/crates/egui_demo_lib/tests/snapshots/text_selection_1.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:60449af267336663304e44e254d0984e037bebfa2d1efdf32234cab4374e8c79
-size 5301
+oid sha256:5e09ec77bd473ad6695557b78d4967ade09b12100f04bc66d0e29779dfb0d551
+size 6495
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 e4d385fce..5ea006f1f 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:c5a45307147f19f2d69a3de1f53e0a73ba4c3368eb25a66b4098fb54cb83822f
-size 64203
+oid sha256:8c0054dd1717833ae6f19726b58bffbf70bd4dc784b5f2774b194800a3adffed
+size 64973
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 102cb3650..c37f49163 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:0102aa84db99a6da1db1de3abf67f13c3b571de00e79e7c55805dc0504658d50
-size 150111
+oid sha256:9be7321d8184c3d06cfeb54410c1f839892c4f836767e9b1950e70306cde6c54
+size 151090
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 091948af6..54f2d37fd 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:3991cb1f922e0c6712d045b3cd8a1d98165c0fbef7e31b15d587f244e53ec04a
-size 59343
+oid sha256:f07c25c053e9c4d5f7416cc00e101e13b7007b65c46ba13d0853d95ca43fddc4
+size 59950
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 881f1b0d5..318fb89e4 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:355d8f08d08011635bf812aea1edeabd69e1ac3c724b521ed243f2b52e9b444b
-size 145257
+oid sha256:b6a9bc30b4d6ed100555ee553554848d20d93f25643e72eeef1826483ed307d9
+size 145940
diff --git a/crates/egui_extras/CHANGELOG.md b/crates/egui_extras/CHANGELOG.md
index 15eaf8704..f2685a11b 100644
--- a/crates/egui_extras/CHANGELOG.md
+++ b/crates/egui_extras/CHANGELOG.md
@@ -5,6 +5,22 @@ 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.34.2 - 2026-05-04
+Nothing new
+
+
+## 0.34.1 - 2026-03-27
+Nothing new
+
+
+## 0.34.0 - 2026-03-26
+* Fix media type with optional parameters [#7739](https://github.com/emilk/egui/pull/7739) by [@leungkkf](https://github.com/leungkkf)
+* Fix: CodeTheme functions - ui and add builder [#7684](https://github.com/emilk/egui/pull/7684) by [@Its-Just-Nans](https://github.com/Its-Just-Nans)
+* Update selected dependencies [#7920](https://github.com/emilk/egui/pull/7920) by [@oscargus](https://github.com/oscargus)
+* Add `DatePickerButton::reverse_years/year_scroll_to` [#7978](https://github.com/emilk/egui/pull/7978) by [@Deuracell](https://github.com/Deuracell)
+* Replace `chrono` with `jiff` [#8008](https://github.com/emilk/egui/pull/8008) by [@emilk](https://github.com/emilk)
+
+
 ## 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)
 
diff --git a/crates/egui_extras/Cargo.toml b/crates/egui_extras/Cargo.toml
index 6639126ef..944576f08 100644
--- a/crates/egui_extras/Cargo.toml
+++ b/crates/egui_extras/Cargo.toml
@@ -15,7 +15,7 @@ readme = "README.md"
 repository = "https://github.com/emilk/egui"
 categories = ["gui", "game-development"]
 keywords = ["gui", "imgui", "immediate", "portable", "gamedev"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
 
 [lints]
 workspace = true
@@ -34,7 +34,7 @@ default = ["dep:mime_guess2"]
 all_loaders = ["file", "http", "image", "svg", "gif", "webp"]
 
 ## Enable [`DatePickerButton`] widget.
-datepicker = ["chrono"]
+datepicker = ["jiff"]
 
 ## Add support for loading images from `file://` URIs.
 file = ["dep:mime_guess2"]
@@ -83,7 +83,7 @@ profiling.workspace = true
 serde = { workspace = true, optional = true }
 
 # Date operations needed for datepicker widget
-chrono = { workspace = true, optional = true, features = ["clock", "js-sys", "std", "wasmbind"] }
+jiff = { workspace = true, optional = true, features = ["std", "tz-system", "js"] }
 
 ## Enable this when generating docs.
 document-features = { workspace = true, optional = true }
diff --git a/crates/egui_extras/src/datepicker/button.rs b/crates/egui_extras/src/datepicker/button.rs
index 98aceefe2..42e4f900f 100644
--- a/crates/egui_extras/src/datepicker/button.rs
+++ b/crates/egui_extras/src/datepicker/button.rs
@@ -1,6 +1,6 @@
 use super::popup::DatePickerPopup;
-use chrono::NaiveDate;
 use egui::{Area, Button, Frame, InnerResponse, Key, Order, RichText, Ui, Widget};
+use jiff::civil::Date;
 use std::ops::RangeInclusive;
 
 #[derive(Default, Clone)]
@@ -11,7 +11,7 @@ pub(crate) struct DatePickerButtonState {
 
 /// Shows a date, and will open a date picker popup when clicked.
 pub struct DatePickerButton<'a> {
-    selection: &'a mut NaiveDate,
+    selection: &'a mut Date,
     id_salt: Option<&'a str>,
     combo_boxes: bool,
     arrows: bool,
@@ -20,11 +20,13 @@ pub struct DatePickerButton<'a> {
     show_icon: bool,
     format: String,
     highlight_weekends: bool,
-    start_end_years: Option<RangeInclusive<i32>>,
+    start_end_years: Option<RangeInclusive<i16>>,
+    reverse_years: bool,
+    year_scroll_to: Option<i16>,
 }
 
 impl<'a> DatePickerButton<'a> {
-    pub fn new(selection: &'a mut NaiveDate) -> Self {
+    pub fn new(selection: &'a mut Date) -> Self {
         Self {
             selection,
             id_salt: None,
@@ -36,6 +38,8 @@ impl<'a> DatePickerButton<'a> {
             format: "%Y-%m-%d".to_owned(),
             highlight_weekends: true,
             start_end_years: None,
+            reverse_years: false,
+            year_scroll_to: None,
         }
     }
 
@@ -47,14 +51,6 @@ impl<'a> DatePickerButton<'a> {
         self
     }
 
-    /// Add id source.
-    /// Must be set if multiple date picker buttons are in the same Ui.
-    #[inline]
-    #[deprecated = "Renamed id_salt"]
-    pub fn id_source(self, id_salt: &'a str) -> Self {
-        self.id_salt(id_salt)
-    }
-
     /// Show combo boxes in date picker popup. (Default: true)
     #[inline]
     pub fn combo_boxes(mut self, combo_boxes: bool) -> Self {
@@ -91,7 +87,7 @@ impl<'a> DatePickerButton<'a> {
     }
 
     /// Change the format shown on the button. (Default: %Y-%m-%d)
-    /// See [`chrono::format::strftime`] for valid formats.
+    /// See [`jiff::fmt::strtime`] for valid formats.
     #[inline]
     pub fn format(mut self, format: impl Into<String>) -> Self {
         self.format = format.into();
@@ -111,10 +107,25 @@ impl<'a> DatePickerButton<'a> {
     /// For example, if you want to provide the range of years from 2000 to 2035, you can use:
     /// `start_end_years(2000..=2035)`.
     #[inline]
-    pub fn start_end_years(mut self, start_end_years: RangeInclusive<i32>) -> Self {
+    pub fn start_end_years(mut self, start_end_years: RangeInclusive<i16>) -> Self {
         self.start_end_years = Some(start_end_years);
         self
     }
+
+    /// List years in descending order in the year dropdown. (Default: false)
+    #[inline]
+    pub fn reverse_years(mut self, reverse_years: bool) -> Self {
+        self.reverse_years = reverse_years;
+        self
+    }
+
+    /// Scroll the year dropdown to this year when the picker first opens.
+    /// Defaults to the currently selected year.
+    #[inline]
+    pub fn year_scroll_to(mut self, year: i16) -> Self {
+        self.year_scroll_to = Some(year);
+        self
+    }
 }
 
 impl Widget for DatePickerButton<'_> {
@@ -125,9 +136,9 @@ impl Widget for DatePickerButton<'_> {
             .unwrap_or_default();
 
         let mut text = if self.show_icon {
-            RichText::new(format!("{} 📆", self.selection.format(&self.format)))
+            RichText::new(format!("{} 📆", self.selection.strftime(&self.format)))
         } else {
-            RichText::new(format!("{}", self.selection.format(&self.format)))
+            RichText::new(format!("{}", self.selection.strftime(&self.format)))
         };
         let visuals = ui.visuals().widgets.open;
         if button_state.picker_visible {
@@ -154,7 +165,6 @@ impl Widget for DatePickerButton<'_> {
                 pos.x = button_response.rect.right() - width_with_padding;
             }
 
-            // Check to make sure the calendar never is displayed out of window
             pos.x = pos.x.max(ui.style().spacing.window_margin.leftf());
 
             //TODO(elwerene): Better positioning
@@ -182,6 +192,8 @@ impl Widget for DatePickerButton<'_> {
                                 calendar_week: self.calendar_week,
                                 highlight_weekends: self.highlight_weekends,
                                 start_end_years: self.start_end_years,
+                                reverse_years: self.reverse_years,
+                                year_scroll_to: self.year_scroll_to,
                             }
                             .draw(ui)
                         })
diff --git a/crates/egui_extras/src/datepicker/mod.rs b/crates/egui_extras/src/datepicker/mod.rs
index 7a114b357..f1f6e58fa 100644
--- a/crates/egui_extras/src/datepicker/mod.rs
+++ b/crates/egui_extras/src/datepicker/mod.rs
@@ -4,32 +4,32 @@ mod button;
 mod popup;
 
 pub use button::DatePickerButton;
-use chrono::{Datelike as _, Duration, NaiveDate, Weekday};
+use jiff::civil::{Date, ISOWeekDate, Weekday};
 
 #[derive(Debug)]
 struct Week {
     number: u8,
-    days: Vec<NaiveDate>,
+    days: Vec<Date>,
 }
 
-fn month_data(year: i32, month: u32) -> Vec<Week> {
-    let first = NaiveDate::from_ymd_opt(year, month, 1).expect("Could not create NaiveDate");
+fn month_data(year: i16, month: i8) -> Vec<Week> {
+    let first = Date::new(year, month, 1).expect("Could not create Date");
     let mut start = first;
-    while start.weekday() != Weekday::Mon {
-        start = start.checked_sub_signed(Duration::days(1)).unwrap();
+    while start.weekday() != Weekday::Monday {
+        start = start.yesterday().unwrap();
     }
     let mut weeks = vec![];
     let mut week = vec![];
-    while start < first || start.month() == first.month() || start.weekday() != Weekday::Mon {
+    while start < first || start.month() == first.month() || start.weekday() != Weekday::Monday {
         week.push(start);
 
-        if start.weekday() == Weekday::Sun {
+        if start.weekday() == Weekday::Sunday {
             weeks.push(Week {
-                number: start.iso_week().week() as u8,
+                number: ISOWeekDate::from(start).week() as u8,
                 days: std::mem::take(&mut week),
             });
         }
-        start = start.checked_add_signed(Duration::days(1)).unwrap();
+        start = start.tomorrow().unwrap();
     }
 
     weeks
diff --git a/crates/egui_extras/src/datepicker/popup.rs b/crates/egui_extras/src/datepicker/popup.rs
index d353307b3..5c0726e5a 100644
--- a/crates/egui_extras/src/datepicker/popup.rs
+++ b/crates/egui_extras/src/datepicker/popup.rs
@@ -1,4 +1,4 @@
-use chrono::{Datelike as _, NaiveDate, Weekday};
+use jiff::civil::{Date, Weekday};
 
 use egui::{Align, Button, Color32, ComboBox, Direction, Id, Layout, RichText, Ui, Vec2};
 
@@ -9,40 +9,39 @@ use crate::{Column, Size, StripBuilder, TableBuilder};
 #[derive(Default, Clone)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 struct DatePickerPopupState {
-    year: i32,
-    month: u32,
-    day: u32,
+    year: i16,
+    month: i8,
+    day: i8,
     setup: bool,
+    year_scroll_needed: bool,
 }
 
 impl DatePickerPopupState {
-    fn last_day_of_month(&self) -> u32 {
-        let date: NaiveDate =
-            NaiveDate::from_ymd_opt(self.year, self.month, 1).expect("Could not create NaiveDate");
-        date.with_day(31)
-            .map(|_| 31)
-            .or_else(|| date.with_day(30).map(|_| 30))
-            .or_else(|| date.with_day(29).map(|_| 29))
-            .unwrap_or(28)
+    fn last_day_of_month(&self) -> i8 {
+        Date::new(self.year, self.month, 1)
+            .expect("Could not create Date")
+            .days_in_month()
     }
 }
 
 pub(crate) struct DatePickerPopup<'a> {
-    pub selection: &'a mut NaiveDate,
+    pub selection: &'a mut Date,
     pub button_id: Id,
     pub combo_boxes: bool,
     pub arrows: bool,
     pub calendar: bool,
     pub calendar_week: bool,
     pub highlight_weekends: bool,
-    pub start_end_years: Option<std::ops::RangeInclusive<i32>>,
+    pub start_end_years: Option<std::ops::RangeInclusive<i16>>,
+    pub reverse_years: bool,
+    pub year_scroll_to: Option<i16>,
 }
 
 impl DatePickerPopup<'_> {
     /// Returns `true` if user pressed `Save` button.
     pub fn draw(&mut self, ui: &mut Ui) -> bool {
         let id = ui.make_persistent_id("date_picker");
-        let today = chrono::offset::Utc::now().date_naive();
+        let today = jiff::Zoned::now().date();
         let mut popup_state = ui
             .data_mut(|data| data.get_persisted::<DatePickerPopupState>(id))
             .unwrap_or_default();
@@ -51,6 +50,7 @@ impl DatePickerPopup<'_> {
             popup_state.month = self.selection.month();
             popup_state.day = self.selection.day();
             popup_state.setup = true;
+            popup_state.year_scroll_needed = true;
             ui.data_mut(|data| data.insert_persisted(id, popup_state.clone()));
         }
 
@@ -60,7 +60,7 @@ impl DatePickerPopup<'_> {
         let spacing = 2.0;
         ui.spacing_mut().item_spacing = Vec2::splat(spacing);
 
-        ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend); // Don't wrap any text
+        ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
 
         StripBuilder::new(ui)
             .clip(false)
@@ -89,15 +89,30 @@ impl DatePickerPopup<'_> {
                                             Some(range) => (*range.start(), *range.end()),
                                             None => (today.year() - 100, today.year() + 10),
                                         };
-                                        for year in start_year..=end_year {
-                                            if ui
-                                                .selectable_value(
-                                                    &mut popup_state.year,
-                                                    year,
-                                                    year.to_string(),
-                                                )
-                                                .changed()
+                                        let scroll_to_year =
+                                            self.year_scroll_to.unwrap_or(popup_state.year);
+                                        let years: Vec<i16> = if self.reverse_years {
+                                            (start_year..=end_year).rev().collect()
+                                        } else {
+                                            (start_year..=end_year).collect()
+                                        };
+                                        for year in years {
+                                            let resp = ui.selectable_value(
+                                                &mut popup_state.year,
+                                                year,
+                                                year.to_string(),
+                                            );
+                                            if popup_state.year_scroll_needed
+                                                && year == scroll_to_year
                                             {
+                                                resp.scroll_to_me(Some(Align::Center));
+                                                popup_state.year_scroll_needed = false;
+                                                ui.memory_mut(|mem| {
+                                                    mem.data
+                                                        .insert_persisted(id, popup_state.clone());
+                                                });
+                                            }
+                                            if resp.changed() {
                                                 popup_state.day = popup_state
                                                     .day
                                                     .min(popup_state.last_day_of_month());
@@ -113,7 +128,7 @@ impl DatePickerPopup<'_> {
                                 ComboBox::from_id_salt("date_picker_month")
                                     .selected_text(month_name(popup_state.month))
                                     .show_ui(ui, |ui| {
-                                        for month in 1..=12 {
+                                        for month in 1i8..=12 {
                                             if ui
                                                 .selectable_value(
                                                     &mut popup_state.month,
@@ -137,7 +152,7 @@ impl DatePickerPopup<'_> {
                                 ComboBox::from_id_salt("date_picker_day")
                                     .selected_text(popup_state.day.to_string())
                                     .show_ui(ui, |ui| {
-                                        for day in 1..=popup_state.last_day_of_month() {
+                                        for day in 1i8..=popup_state.last_day_of_month() {
                                             if ui
                                                 .selectable_value(
                                                     &mut popup_state.day,
@@ -314,9 +329,10 @@ impl DatePickerPopup<'_> {
                                                             && popup_state.day == day.day()
                                                         {
                                                             ui.visuals().selection.bg_fill
-                                                        } else if (day.weekday() == Weekday::Sat
-                                                            || day.weekday() == Weekday::Sun)
-                                                            && self.highlight_weekends
+                                                        } else if (matches!(
+                                                            day.weekday(),
+                                                            Weekday::Saturday | Weekday::Sunday
+                                                        )) && self.highlight_weekends
                                                         {
                                                             if ui.visuals().dark_mode {
                                                                 Color32::DARK_RED
@@ -349,7 +365,6 @@ impl DatePickerPopup<'_> {
                                                         );
 
                                                         if day == today {
-                                                            // Encircle today's date
                                                             let stroke = ui
                                                                 .visuals()
                                                                 .widgets
@@ -396,12 +411,12 @@ impl DatePickerPopup<'_> {
                         strip.cell(|ui| {
                             ui.with_layout(Layout::top_down_justified(Align::Center), |ui| {
                                 if ui.button("Save").clicked() {
-                                    *self.selection = NaiveDate::from_ymd_opt(
+                                    *self.selection = Date::new(
                                         popup_state.year,
                                         popup_state.month,
                                         popup_state.day,
                                     )
-                                    .expect("Could not create NaiveDate");
+                                    .expect("Could not create Date");
                                     saved = true;
                                     close = true;
                                 }
@@ -424,7 +439,7 @@ impl DatePickerPopup<'_> {
     }
 }
 
-fn month_name(i: u32) -> &'static str {
+fn month_name(i: i8) -> &'static str {
     match i {
         1 => "January",
         2 => "February",
diff --git a/crates/egui_extras/src/lib.rs b/crates/egui_extras/src/lib.rs
index 19e0c95a8..99e6dd5e4 100644
--- a/crates/egui_extras/src/lib.rs
+++ b/crates/egui_extras/src/lib.rs
@@ -8,7 +8,7 @@
 
 #![expect(clippy::manual_range_contains)]
 
-#[cfg(feature = "chrono")]
+#[cfg(feature = "datepicker")]
 mod datepicker;
 
 pub mod syntax_highlighting;
@@ -21,7 +21,7 @@ mod sizing;
 mod strip;
 mod table;
 
-#[cfg(feature = "chrono")]
+#[cfg(feature = "datepicker")]
 pub use crate::datepicker::DatePickerButton;
 
 pub(crate) use crate::layout::StripLayout;
diff --git a/crates/egui_extras/src/table.rs b/crates/egui_extras/src/table.rs
index 78c6e7435..9fc75f57b 100644
--- a/crates/egui_extras/src/table.rs
+++ b/crates/egui_extras/src/table.rs
@@ -270,15 +270,6 @@ impl<'a> TableBuilder<'a> {
         }
     }
 
-    /// Give this table a unique id within the parent [`Ui`].
-    ///
-    /// This is required if you have multiple tables in the same [`Ui`].
-    #[inline]
-    #[deprecated = "Renamed id_salt"]
-    pub fn id_source(self, id_salt: impl std::hash::Hash) -> Self {
-        self.id_salt(id_salt)
-    }
-
     /// Give this table a unique id within the parent [`Ui`].
     ///
     /// This is required if you have multiple tables in the same [`Ui`].
@@ -329,7 +320,7 @@ impl<'a> TableBuilder<'a> {
 
     /// Enables scrolling the table's contents using mouse drag (default: `true`).
     ///
-    /// See [`ScrollArea::drag_to_scroll`] for more.
+    /// See [`ScrollArea::scroll_source`] for more.
     #[inline]
     pub fn drag_to_scroll(mut self, drag_to_scroll: bool) -> Self {
         self.scroll_options.drag_to_scroll = drag_to_scroll;
@@ -656,14 +647,13 @@ impl TableState {
     }
 
     fn store(self, ui: &egui::Ui, state_id: egui::Id) {
-        #![expect(clippy::needless_return)]
         #[cfg(feature = "serde")]
         {
-            return ui.data_mut(|d| d.insert_persisted(state_id, self));
+            ui.data_mut(|d| d.insert_persisted(state_id, self));
         }
         #[cfg(not(feature = "serde"))]
         {
-            return ui.data_mut(|d| d.insert_temp(state_id, self));
+            ui.data_mut(|d| d.insert_temp(state_id, self));
         }
     }
 
@@ -997,7 +987,7 @@ impl<'a> TableBody<'a> {
             overline: false,
             response: &mut response,
         });
-        self.capture_hover_state(&response, self.row_index);
+        self.capture_hover_state(response.as_ref(), self.row_index);
         let bottom_y = self.layout.cursor.y;
 
         if Some(self.row_index) == self.scroll_to_row {
@@ -1079,7 +1069,7 @@ impl<'a> TableBody<'a> {
                 overline: false,
                 response: &mut response,
             });
-            self.capture_hover_state(&response, row_index);
+            self.capture_hover_state(response.as_ref(), row_index);
         }
 
         if total_rows - max_row > 0 {
@@ -1161,7 +1151,7 @@ impl<'a> TableBody<'a> {
                     overline: false,
                     response: &mut response,
                 });
-                self.capture_hover_state(&response, row_index);
+                self.capture_hover_state(response.as_ref(), row_index);
                 break;
             }
         }
@@ -1184,7 +1174,7 @@ impl<'a> TableBody<'a> {
                 selected: false,
                 response: &mut response,
             });
-            self.capture_hover_state(&response, row_index);
+            self.capture_hover_state(response.as_ref(), row_index);
             cursor_y += (row_height + spacing.y) as f64;
 
             if Some(row_index) == self.scroll_to_row {
@@ -1235,8 +1225,8 @@ impl<'a> TableBody<'a> {
 
     // Capture the hover information for the just created row. This is used in the next render
     // to ensure that the entire row is highlighted.
-    fn capture_hover_state(&self, response: &Option<Response>, row_index: usize) {
-        let is_row_hovered = response.as_ref().is_some_and(|r| r.hovered());
+    fn capture_hover_state(&self, response: Option<&Response>, row_index: usize) {
+        let is_row_hovered = response.is_some_and(|r| r.hovered());
         if is_row_hovered {
             self.layout
                 .ui
diff --git a/crates/egui_glow/CHANGELOG.md b/crates/egui_glow/CHANGELOG.md
index 2fccf1166..32ed885cd 100644
--- a/crates/egui_glow/CHANGELOG.md
+++ b/crates/egui_glow/CHANGELOG.md
@@ -6,6 +6,18 @@ Changes since the last release can be found at <https://github.com/emilk/egui/co
 
 
 
+## 0.34.2 - 2026-05-04
+Nothing new
+
+
+## 0.34.1 - 2026-03-27
+Nothing new
+
+
+## 0.34.0 - 2026-03-26
+Nothing new
+
+
 ## 0.33.3 - 2025-12-11
 Nothing new
 
diff --git a/crates/egui_glow/Cargo.toml b/crates/egui_glow/Cargo.toml
index 4a083611b..d5a9f3716 100644
--- a/crates/egui_glow/Cargo.toml
+++ b/crates/egui_glow/Cargo.toml
@@ -11,7 +11,13 @@ readme = "README.md"
 repository = "https://github.com/emilk/egui/tree/main/crates/egui_glow"
 categories = ["gui", "game-development"]
 keywords = ["glow", "egui", "gui", "gamedev"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml", "src/shader/*.glsl"]
+include = [
+  "../../LICENSE-APACHE",
+  "../../LICENSE-MIT",
+  "**/*.rs",
+  "Cargo.toml",
+  "src/shader/*.glsl",
+]
 
 [lints]
 workspace = true
@@ -60,11 +66,6 @@ document-features = { workspace = true, optional = true }
 # Native:
 winit = { workspace = true, optional = true, default-features = false, features = ["rwh_06"] }
 
-# Web:
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-web-sys = { workspace = true, features = ["console"] }
-wasm-bindgen.workspace = true
-
 
 [dev-dependencies]
 glutin = { workspace = true, default-features = true } # examples/pure_glow
diff --git a/crates/egui_glow/src/lib.rs b/crates/egui_glow/src/lib.rs
index b0ee4c2a2..e12baa993 100644
--- a/crates/egui_glow/src/lib.rs
+++ b/crates/egui_glow/src/lib.rs
@@ -95,3 +95,60 @@ pub fn check_for_gl_error_impl(gl: &glow::Context, file: &str, line: u32, contex
         }
     }
 }
+
+/// Selects the level of hardware graphics acceleration.
+#[cfg(not(target_arch = "wasm32"))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub enum HardwareAcceleration {
+    /// Require graphics acceleration.
+    Required,
+
+    /// Prefer graphics acceleration, but fall back to software.
+    Preferred,
+
+    /// Do NOT use graphics acceleration.
+    ///
+    /// On some platforms (macOS) this is ignored and treated the same as [`Self::Preferred`].
+    Off,
+}
+
+/// Configuration for using glow with eframe or the egui-glow winit feature.
+#[derive(Clone)]
+pub struct GlowConfiguration {
+    /// Turn on vertical syncing, limiting the FPS to the display refresh rate.
+    ///
+    /// The default is `true`.
+    #[cfg(not(target_arch = "wasm32"))]
+    pub vsync: bool,
+
+    /// Specify whether or not hardware acceleration is preferred, required, or not.
+    ///
+    /// Default: [`HardwareAcceleration::Preferred`].
+    #[cfg(not(target_arch = "wasm32"))]
+    pub hardware_acceleration: HardwareAcceleration,
+
+    /// Needed for cross compiling for VirtualBox VMSVGA driver with OpenGL ES 2.0 and OpenGL 2.1 which doesn't support SRGB texture.
+    /// See <https://github.com/emilk/egui/pull/1993>.
+    ///
+    /// For OpenGL ES 2.0: set this to [`ShaderVersion::Es100`] to solve blank texture problem (by using the "fallback shader").
+    pub shader_version: Option<ShaderVersion>,
+}
+
+#[cfg_attr(target_arch = "wasm32", expect(clippy::derivable_impls))]
+impl Default for GlowConfiguration {
+    fn default() -> Self {
+        Self {
+            #[cfg(not(target_arch = "wasm32"))]
+            vsync: true,
+            #[cfg(not(target_arch = "wasm32"))]
+            hardware_acceleration: HardwareAcceleration::Preferred,
+            shader_version: None,
+        }
+    }
+}
+
+#[test]
+fn glow_config_impl_send_sync() {
+    fn assert_send_sync<T: Send + Sync>() {}
+    assert_send_sync::<GlowConfiguration>();
+}
diff --git a/crates/egui_kittest/CHANGELOG.md b/crates/egui_kittest/CHANGELOG.md
index f2470787e..e53ab50ed 100644
--- a/crates/egui_kittest/CHANGELOG.md
+++ b/crates/egui_kittest/CHANGELOG.md
@@ -6,6 +6,21 @@ 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.34.2 - 2026-05-04
+Nothing new
+
+
+## 0.34.1 - 2026-03-27
+Nothing new
+
+
+## 0.34.0 - 2026-03-26
+* Turn `HarnessBuilder::with_options` into a proper builder method [#7697](https://github.com/emilk/egui/pull/7697) by [@emilk](https://github.com/emilk)
+* Paint mouse cursor in kittest snapshot images [#7721](https://github.com/emilk/egui/pull/7721) by [@emilk](https://github.com/emilk)
+* Add `kittest.toml` config file [#7643](https://github.com/emilk/egui/pull/7643) by [@lucasmerlin](https://github.com/lucasmerlin)
+* Close debug_open_snapshot temp file before viewing it [#7841](https://github.com/emilk/egui/pull/7841) by [@yuriks](https://github.com/yuriks)
+
+
 ## 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)
diff --git a/crates/egui_kittest/Cargo.toml b/crates/egui_kittest/Cargo.toml
index f922b807e..2d26e6bd8 100644
--- a/crates/egui_kittest/Cargo.toml
+++ b/crates/egui_kittest/Cargo.toml
@@ -11,7 +11,7 @@ readme = "./README.md"
 repository = "https://github.com/emilk/egui"
 categories = ["gui", "development-tools::testing", "accessibility"]
 keywords = ["gui", "immediate", "egui", "testing", "accesskit"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -38,7 +38,7 @@ egui.workspace = true
 eframe = { workspace = true, optional = true }
 kittest.workspace = true
 serde.workspace = true
-toml = {workspace = true, features = ["parse", "serde"] }
+toml = { workspace = true, features = ["parse", "serde"] }
 
 # wgpu dependencies
 egui-wgpu = { workspace = true, optional = true }
diff --git a/crates/egui_kittest/src/app_kind.rs b/crates/egui_kittest/src/app_kind.rs
index 90cb5bd43..42edd6d66 100644
--- a/crates/egui_kittest/src/app_kind.rs
+++ b/crates/egui_kittest/src/app_kind.rs
@@ -1,24 +1,24 @@
 use egui::Frame;
 
-type AppKindContextState<'a, State> = Box<dyn FnMut(&egui::Context, &mut State) + 'a>;
 type AppKindUiState<'a, State> = Box<dyn FnMut(&mut egui::Ui, &mut State) + 'a>;
-type AppKindContext<'a> = Box<dyn FnMut(&egui::Context) + 'a>;
 type AppKindUi<'a> = Box<dyn FnMut(&mut egui::Ui) + 'a>;
 
 /// In order to access the [`eframe::App`] trait from the generic `State`, we store a function pointer
-/// here that will return the dyn trait from the struct. In the builder we have the correct where
-/// clause to be able to create this.
+/// here that will return the dyn trait from the struct.
+/// In the builder we have the correct `where`-clause to be able to create this.
 /// Later we can use it anywhere to get the [`eframe::App`] from the `State`.
 #[cfg(feature = "eframe")]
-type AppKindEframe<'a, State> = (fn(&mut State) -> &mut dyn eframe::App, eframe::Frame);
+pub(crate) struct AppKindEframe<State> {
+    pub get_app: fn(&mut State) -> &mut dyn eframe::App,
+    pub take_app: fn(State) -> Box<dyn eframe::App>,
+    pub frame: eframe::Frame,
+}
 
 pub(crate) enum AppKind<'a, State> {
-    Context(AppKindContext<'a>),
     Ui(AppKindUi<'a>),
-    ContextState(AppKindContextState<'a, State>),
     UiState(AppKindUiState<'a, State>),
     #[cfg(feature = "eframe")]
-    Eframe(AppKindEframe<'a, State>),
+    Eframe(AppKindEframe<State>),
 }
 
 impl<State> AppKind<'_, State> {
@@ -29,27 +29,11 @@ impl<State> AppKind<'_, State> {
         sizing_pass: bool,
     ) -> Option<egui::Response> {
         match self {
-            AppKind::Context(f) => {
-                debug_assert!(!sizing_pass, "Context closures cannot do a sizing pass");
-                f(ui);
-                None
-            }
-            AppKind::ContextState(f) => {
-                debug_assert!(!sizing_pass, "Context closures cannot do a sizing pass");
-                f(ui, state);
-                None
-            }
             #[cfg(feature = "eframe")]
-            AppKind::Eframe((get_app, frame)) => {
+            AppKind::Eframe(AppKindEframe { get_app, frame, .. }) => {
                 let app = get_app(state);
-
                 app.logic(ui, frame);
-
-                #[expect(deprecated)]
-                app.update(ui, frame);
-
                 app.ui(ui, frame);
-
                 None
             }
             kind_ui => Some(kind_ui.run_ui(ui, state, sizing_pass)),
@@ -74,8 +58,9 @@ impl<State> AppKind<'_, State> {
                 .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"
+                    #[cfg(feature = "eframe")]
+                    AppKind::Eframe(_) => unreachable!(
+                        "run_ui should only be called with AppKind::Ui or AppKind::UiState"
                     ),
                 });
         })
diff --git a/crates/egui_kittest/src/builder.rs b/crates/egui_kittest/src/builder.rs
index b33e37e39..58bfb8601 100644
--- a/crates/egui_kittest/src/builder.rs
+++ b/crates/egui_kittest/src/builder.rs
@@ -1,4 +1,6 @@
 use crate::app_kind::AppKind;
+#[cfg(feature = "eframe")]
+use crate::app_kind::AppKindEframe;
 use crate::{Harness, LazyRenderer, TestRenderer};
 use egui::{Pos2, Rect, Vec2};
 use std::marker::PhantomData;
@@ -18,6 +20,9 @@ pub struct HarnessBuilder<State = ()> {
 
     #[cfg(feature = "snapshot")]
     pub(crate) default_snapshot_options: crate::SnapshotOptions,
+
+    #[cfg(feature = "wgpu")]
+    pub(crate) render_options: egui_wgpu::RendererOptions,
 }
 
 impl<State> Default for HarnessBuilder<State> {
@@ -35,6 +40,9 @@ impl<State> Default for HarnessBuilder<State> {
 
             #[cfg(feature = "snapshot")]
             default_snapshot_options: crate::SnapshotOptions::default(),
+
+            #[cfg(feature = "wgpu")]
+            render_options: egui_wgpu::RendererOptions::PREDICTABLE,
         }
     }
 }
@@ -119,6 +127,16 @@ impl<State> HarnessBuilder<State> {
         self
     }
 
+    /// Configures the [`egui_wgpu::RendererOptions`] used by this harness.
+    ///
+    /// The default is [`egui_wgpu::RendererOptions::PREDICTABLE`].
+    #[cfg(feature = "wgpu")]
+    #[inline]
+    pub fn with_render_options(mut self, options: egui_wgpu::RendererOptions) -> Self {
+        self.render_options = options;
+        self
+    }
+
     /// Set the [`TestRenderer`] to use for rendering.
     ///
     /// By default, a [`LazyRenderer`] is used.
@@ -133,7 +151,8 @@ impl<State> HarnessBuilder<State> {
     /// This sets up a [`crate::wgpu::WgpuTestRenderer`] with the default setup.
     #[cfg(feature = "wgpu")]
     pub fn wgpu(self) -> Self {
-        self.renderer(crate::wgpu::WgpuTestRenderer::default())
+        let test_renderer = crate::wgpu::WgpuTestRenderer::with_render_options(self.render_options);
+        self.renderer(test_renderer)
     }
 
     /// Enable wgpu rendering with the given setup.
@@ -142,46 +161,10 @@ impl<State> HarnessBuilder<State> {
         self.renderer(crate::wgpu::WgpuTestRenderer::from_setup(setup))
     }
 
-    /// Create a new Harness with the given app closure and a state.
-    ///
-    /// The app closure will immediately be called once to create the initial ui.
-    ///
-    /// If you don't need to create Windows / Panels, you can use [`HarnessBuilder::build_ui`] instead.
-    ///
-    /// # Example
-    /// ```rust
-    /// # use egui::CentralPanel;
-    /// # use egui_kittest::{Harness, kittest::Queryable};
-    /// let checked = false;
-    /// let mut harness = Harness::builder()
-    ///     .with_size(egui::Vec2::new(300.0, 200.0))
-    ///     .build_state(|ctx, checked| {
-    ///         CentralPanel::default().show(ctx, |ui| {
-    ///             ui.checkbox(checked, "Check me!");
-    ///         });
-    ///     }, checked);
-    ///
-    /// harness.get_by_label("Check me!").click();
-    /// harness.run();
-    ///
-    /// 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,
-        state: State,
-    ) -> Harness<'a, State> {
-        Harness::from_builder(self, AppKind::ContextState(Box::new(app)), state, None)
-    }
-
     /// Create a new Harness with the given ui closure and a state.
     ///
     /// The ui closure will immediately be called once to create the initial ui.
     ///
-    /// If you need to create Windows / Panels, you can use [`HarnessBuilder::build`] instead.
-    ///
     /// # Example
     /// ```rust
     /// # use egui_kittest::{Harness, kittest::Queryable};
@@ -215,7 +198,7 @@ impl<State> HarnessBuilder<State> {
         build: impl FnOnce(&mut eframe::CreationContext<'a>) -> State,
     ) -> Harness<'a, State>
     where
-        State: eframe::App,
+        State: eframe::App + 'static,
     {
         let ctx = egui::Context::default();
 
@@ -226,43 +209,20 @@ impl<State> HarnessBuilder<State> {
 
         let app = build(&mut cc);
 
-        let kind = AppKind::Eframe((|state| state, frame));
+        let kind = AppKind::Eframe(AppKindEframe {
+            get_app: |state| state,
+            take_app: |state| Box::new(state),
+            frame,
+        });
         Harness::from_builder(self, kind, app, Some(ctx))
     }
 }
 
 impl HarnessBuilder {
-    /// Create a new Harness with the given app closure.
-    ///
-    /// The app closure will immediately be called once to create the initial ui.
-    ///
-    /// If you don't need to create Windows / Panels, you can use [`HarnessBuilder::build_ui`] instead.
-    ///
-    /// # Example
-    /// ```rust
-    /// # use egui::CentralPanel;
-    /// # use egui_kittest::{Harness, kittest::Queryable};
-    /// let mut harness = Harness::builder()
-    ///     .with_size(egui::Vec2::new(300.0, 200.0))
-    ///     .build(|ctx| {
-    ///         CentralPanel::default().show(ctx, |ui| {
-    ///             ui.label("Hello, world!");
-    ///         });
-    ///     });
-    /// ```
-    #[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)
-    }
-
     /// Create a new Harness with the given ui closure.
     ///
     /// The ui closure will immediately be called once to create the initial ui.
     ///
-    /// If you need to create Windows / Panels, you can use [`HarnessBuilder::build`] instead.
-    ///
     /// # Example
     /// ```rust
     /// # use egui_kittest::{Harness, kittest::Queryable};
diff --git a/crates/egui_kittest/src/lib.rs b/crates/egui_kittest/src/lib.rs
index b9f7dc7c2..4fa68d93c 100644
--- a/crates/egui_kittest/src/lib.rs
+++ b/crates/egui_kittest/src/lib.rs
@@ -60,7 +60,7 @@ impl Display for ExceededMaxStepsError {
 
 /// The test Harness. This contains everything needed to run the test.
 ///
-/// Create a new Harness using [`Harness::new`] or [`Harness::builder`].
+/// Create a new Harness using [`Harness::new_ui`] or [`Harness::builder`].
 ///
 /// The [Harness] has a optional generic state that can be used to pass data to the app / ui closure.
 /// In _most cases_ it should be fine to just store the state in the closure itself.
@@ -116,6 +116,11 @@ impl<'a, State> Harness<'a, State> {
 
             #[cfg(feature = "snapshot")]
             default_snapshot_options,
+
+            // rustfmt adds this weird indentation below.
+            // See: https://github.com/rust-lang/rustfmt/issues/5920
+            #[cfg(feature = "wgpu")]
+                render_options: _,
         } = builder;
         let ctx = ctx.unwrap_or_default();
         ctx.set_theme(theme);
@@ -180,43 +185,10 @@ impl<'a, State> Harness<'a, State> {
         HarnessBuilder::default()
     }
 
-    /// Create a new Harness with the given app closure and a state.
-    ///
-    /// The app closure will immediately be called once to create the initial ui.
-    ///
-    /// If you don't need to create Windows / Panels, you can use [`Harness::new_ui`] instead.
-    ///
-    /// If you e.g. want to customize the size of the window, you can use [`Harness::builder`].
-    ///
-    /// # Example
-    /// ```rust
-    /// # use egui::CentralPanel;
-    /// # use egui_kittest::{Harness, kittest::Queryable};
-    /// let mut checked = false;
-    /// let mut harness = Harness::new_state(|ctx, checked| {
-    ///     CentralPanel::default().show(ctx, |ui| {
-    ///         ui.checkbox(checked, "Check me!");
-    ///     });
-    /// }, checked);
-    ///
-    /// harness.get_by_label("Check me!").click();
-    /// harness.run();
-    ///
-    /// 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)
-    }
-
     /// Create a new Harness with the given ui closure and a state.
     ///
     /// The ui closure will immediately be called once to create the initial ui.
     ///
-    /// If you need to create Windows / Panels, you can use [`Harness::new`] instead.
-    ///
     /// If you e.g. want to customize the size of the ui, you can use [`Harness::builder`].
     ///
     /// # Example
@@ -242,7 +214,7 @@ impl<'a, State> Harness<'a, State> {
     #[track_caller]
     pub fn new_eframe(builder: impl FnOnce(&mut eframe::CreationContext<'a>) -> State) -> Self
     where
-        State: eframe::App,
+        State: eframe::App + 'static,
     {
         Self::builder().build_eframe(builder)
     }
@@ -488,6 +460,11 @@ impl<'a, State> Harness<'a, State> {
         &mut self.state
     }
 
+    /// Consume the harness and return the state.
+    pub fn into_state(self) -> State {
+        self.state
+    }
+
     /// Queue an event to be processed in the next frame.
     pub fn event(&self, event: egui::Event) {
         self.queued_events.lock().push(EventType::Event(event));
@@ -710,47 +687,118 @@ impl<'a, State> Harness<'a, State> {
         }
     }
 
-    #[deprecated = "Use `Harness::root` instead."]
-    pub fn node(&self) -> Node<'_> {
-        self.root()
+    /// Spawn a real native eframe window running this harness's app, reusing its [`egui::Context`].
+    ///
+    /// Blocks until the window is closed.
+    ///
+    /// Useful for interactively debugging a failing test: add a call to this before the failing
+    /// assertion to poke at the UI yourself.
+    ///
+    /// # macOS: must be called on the main thread
+    /// `AppKit` requires UI work to happen on the main thread, but by default cargo's test harness
+    /// runs each test on a spawned worker thread, so this function will panic on macOS unless
+    /// you opt out of the default harness.
+    ///
+    /// To fix this, disable the default libtest harness for your test target and run tests on
+    /// the main thread yourself. In `Cargo.toml`:
+    ///
+    /// ```toml
+    /// [[test]]
+    /// name = "your_test"
+    /// harness = false
+    /// ```
+    ///
+    /// Then write a `fn main()` in the test file that invokes your test directly.
+    ///
+    /// See also: <https://doc.rust-lang.org/cargo/reference/cargo-targets.html#the-harness-field>
+    #[cfg(feature = "eframe")]
+    #[deprecated = "Only for debugging, don't commit this."]
+    pub fn spawn_eframe_app(self)
+    where
+        'a: 'static,
+        State: 'static,
+    {
+        #[cfg(target_os = "macos")]
+        {
+            // AppKit requires UI work to happen on the main thread, but by default cargo's
+            // test harness runs each test on a spawned worker thread.
+            #[expect(unsafe_code)]
+            // SAFETY: `pthread_main_np` is a thread-safe libc query with no arguments.
+            let is_main_thread = unsafe {
+                unsafe extern "C" {
+                    fn pthread_main_np() -> std::ffi::c_int;
+                }
+                pthread_main_np() != 0
+            };
+            assert!(
+                is_main_thread,
+                "spawn_eframe_app must be called on the main thread on macOS, \
+                 but the default `cargo test` harness runs each test on a worker thread.\n\
+                 \n\
+                 To fix this, disable the default libtest harness for your test target and run \
+                 tests on the main thread yourself. In Cargo.toml:\n\
+                 \n\
+                     [[test]]\n\
+                     name = \"your_test\"\n\
+                     harness = false\n\
+                 \n\
+                 Then write a `fn main()` in the test file that invokes your test directly.\n\
+                 \n\
+                 See: https://doc.rust-lang.org/cargo/reference/cargo-targets.html#the-harness-field"
+            );
+        }
+
+        struct UiApp {
+            f: Box<dyn FnMut(&mut egui::Ui)>,
+        }
+
+        impl eframe::App for UiApp {
+            fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+                (self.f)(ui);
+            }
+        }
+
+        struct UiStateApp<State> {
+            f: Box<dyn FnMut(&mut egui::Ui, &mut State)>,
+            state: State,
+        }
+
+        impl<State: 'static> eframe::App for UiStateApp<State> {
+            fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+                let Self { f, state } = self;
+                f(ui, state);
+            }
+        }
+
+        use crate::app_kind::AppKindEframe;
+
+        let Self {
+            ctx, state, app, ..
+        } = self;
+
+        let eframe_app: Box<dyn eframe::App> = match app {
+            AppKind::Ui(f) => Box::new(UiApp { f }),
+            AppKind::UiState(f) => Box::new(UiStateApp { f, state }),
+            AppKind::Eframe(AppKindEframe { take_app, .. }) => take_app(state),
+        };
+
+        eframe::run_native_ext(
+            "egui_kittest",
+            eframe::NativeOptions::default(),
+            Some(ctx),
+            Box::new(|_cc| Ok(eframe_app)),
+        )
+        .unwrap();
     }
 }
 
 /// Utilities for stateless harnesses.
 impl<'a> Harness<'a> {
-    /// Create a new Harness with the given app closure.
-    /// Use the [`Harness::run`], [`Harness::step`], etc... methods to run the app.
-    ///
-    /// The app closure will immediately be called once to create the initial ui.
-    ///
-    /// If you don't need to create Windows / Panels, you can use [`Harness::new_ui`] instead.
-    ///
-    /// If you e.g. want to customize the size of the window, you can use [`Harness::builder`].
-    ///
-    /// # Example
-    /// ```rust
-    /// # use egui::CentralPanel;
-    /// # use egui_kittest::Harness;
-    /// let mut harness = Harness::new(|ctx| {
-    ///     CentralPanel::default().show(ctx, |ui| {
-    ///         ui.label("Hello, world!");
-    ///     });
-    /// });
-    /// ```
-    #[track_caller]
-    #[deprecated = "use `new_ui` instead"]
-    pub fn new(app: impl FnMut(&egui::Context) + 'a) -> Self {
-        #[expect(deprecated)]
-        Self::builder().build(app)
-    }
-
     /// Create a new Harness with the given ui closure.
     /// Use the [`Harness::run`], [`Harness::step`], etc... methods to run the app.
     ///
     /// The ui closure will immediately be called once to create the initial ui.
     ///
-    /// If you need to create Windows / Panels, you can use [`Harness::new`] instead.
-    ///
     /// If you e.g. want to customize the size of the ui, you can use [`Harness::builder`].
     ///
     /// # Example
diff --git a/crates/egui_kittest/src/node.rs b/crates/egui_kittest/src/node.rs
index ed68d50ee..7e3161c09 100644
--- a/crates/egui_kittest/src/node.rs
+++ b/crates/egui_kittest/src/node.rs
@@ -54,11 +54,6 @@ impl Node<'_> {
         self.click_button(PointerButton::Primary);
     }
 
-    #[deprecated = "Use `click()` instead."]
-    pub fn simulate_click(&self) {
-        self.click();
-    }
-
     pub fn click_secondary(&self) {
         self.click_button(PointerButton::Secondary);
     }
@@ -130,28 +125,6 @@ impl Node<'_> {
         }));
     }
 
-    #[deprecated = "Use `Harness::key_down` instead."]
-    pub fn key_down(&self, key: egui::Key) {
-        self.event(egui::Event::Key {
-            key,
-            pressed: true,
-            modifiers: Modifiers::default(),
-            repeat: false,
-            physical_key: None,
-        });
-    }
-
-    #[deprecated = "Use `Harness::key_up` instead."]
-    pub fn key_up(&self, key: egui::Key) {
-        self.event(egui::Event::Key {
-            key,
-            pressed: false,
-            modifiers: Modifiers::default(),
-            repeat: false,
-            physical_key: None,
-        });
-    }
-
     pub fn type_text(&self, text: &str) {
         self.event(egui::Event::Text(text.to_owned()));
     }
diff --git a/crates/egui_kittest/src/snapshot.rs b/crates/egui_kittest/src/snapshot.rs
index 28b5ac986..adbe32399 100644
--- a/crates/egui_kittest/src/snapshot.rs
+++ b/crates/egui_kittest/src/snapshot.rs
@@ -563,7 +563,7 @@ pub fn image_snapshot_options(
     options: &SnapshotOptions,
 ) {
     match try_image_snapshot_options(current, name, options) {
-        Ok(_) => {}
+        Ok(()) => {}
         Err(err) => {
             panic!("{err}");
         }
@@ -582,7 +582,7 @@ pub fn image_snapshot_options(
 #[track_caller]
 pub fn image_snapshot(current: &image::RgbaImage, name: impl Into<String>) {
     match try_image_snapshot(current, name) {
-        Ok(_) => {}
+        Ok(()) => {}
         Err(err) => {
             panic!("{err}");
         }
@@ -884,14 +884,14 @@ impl Drop for SnapshotResults {
             #[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 3f97e0036..45152e81e 100644
--- a/crates/egui_kittest/src/wgpu.rs
+++ b/crates/egui_kittest/src/wgpu.rs
@@ -17,7 +17,8 @@ pub(crate) const WAIT_TIMEOUT: Duration = Duration::from_secs(10);
 
 /// Default wgpu setup used for the wgpu renderer.
 pub fn default_wgpu_setup() -> egui_wgpu::WgpuSetup {
-    let mut setup = egui_wgpu::WgpuSetupCreateNew::default();
+    // No display handle needed for headless testing — we don't present to a window.
+    let mut setup = egui_wgpu::WgpuSetupCreateNew::without_display_handle();
 
     // WebGPU not supported yet since we rely on blocking screenshots.
     setup
@@ -57,7 +58,11 @@ pub fn default_wgpu_setup() -> egui_wgpu::WgpuSetup {
     egui_wgpu::WgpuSetup::CreateNew(setup)
 }
 
-pub fn create_render_state(setup: WgpuSetup) -> egui_wgpu::RenderState {
+pub fn create_render_state(
+    setup: WgpuSetup,
+    options: egui_wgpu::RendererOptions,
+) -> egui_wgpu::RenderState {
+    // No display handle needed for headless testing — we don't present to a window.
     let instance = pollster::block_on(setup.new_instance());
 
     pollster::block_on(egui_wgpu::RenderState::create(
@@ -67,7 +72,7 @@ pub fn create_render_state(setup: WgpuSetup) -> egui_wgpu::RenderState {
         },
         &instance,
         None,
-        egui_wgpu::RendererOptions::PREDICTABLE,
+        options,
     ))
     .expect("Failed to create render state")
 }
@@ -87,14 +92,17 @@ impl WgpuTestRenderer {
     /// Create a new [`WgpuTestRenderer`] with the default setup.
     pub fn new() -> Self {
         Self {
-            render_state: create_render_state(default_wgpu_setup()),
+            render_state: create_render_state(
+                default_wgpu_setup(),
+                egui_wgpu::RendererOptions::PREDICTABLE,
+            ),
         }
     }
 
     /// Create a new [`WgpuTestRenderer`] with the given setup.
     pub fn from_setup(setup: WgpuSetup) -> Self {
         Self {
-            render_state: create_render_state(setup),
+            render_state: create_render_state(setup, egui_wgpu::RendererOptions::PREDICTABLE),
         }
     }
 
@@ -113,6 +121,13 @@ impl WgpuTestRenderer {
         );
         Self { render_state }
     }
+
+    /// Create a new [`WgpuTestRenderer`] with custom render options.
+    pub fn with_render_options(options: egui_wgpu::RendererOptions) -> Self {
+        Self {
+            render_state: create_render_state(default_wgpu_setup(), options),
+        }
+    }
 }
 
 impl crate::TestRenderer for WgpuTestRenderer {
diff --git a/crates/egui_kittest/tests/regression_tests.rs b/crates/egui_kittest/tests/regression_tests.rs
index 4289fe3a9..2cb656b25 100644
--- a/crates/egui_kittest/tests/regression_tests.rs
+++ b/crates/egui_kittest/tests/regression_tests.rs
@@ -1,5 +1,5 @@
 use egui::accesskit::{self, Role};
-use egui::{Button, ComboBox, Image, Modifiers, Popup, Vec2, Widget as _};
+use egui::{Button, ComboBox, Image, Modifiers, Popup, Rect, Vec2, Widget as _};
 #[cfg(all(feature = "wgpu", feature = "snapshot"))]
 use egui_kittest::SnapshotResults;
 use egui_kittest::{Harness, kittest::Queryable as _};
@@ -262,3 +262,195 @@ pub fn menus_should_close_even_if_submenu_disappears() {
         );
     }
 }
+
+fn keyboard_submenu_harness() -> Harness<'static, bool> {
+    Harness::builder()
+        .with_size(Vec2::new(400.0, 240.0))
+        .build_ui_state(
+            |ui, checked| {
+                egui::Panel::top("menu_bar").show_inside(ui, |ui| {
+                    egui::MenuBar::new().ui(ui, |ui| {
+                        ui.menu_button("X", |ui| {
+                            ui.menu_button("Y", |ui| {
+                                ui.checkbox(checked, "Goal");
+                            });
+                        });
+                    });
+                });
+            },
+            false,
+        )
+}
+
+#[test]
+pub fn keyboard_should_open_nested_submenu() {
+    let mut harness = keyboard_submenu_harness();
+
+    harness.get_by_label("X").focus();
+    harness.run();
+
+    harness.key_press(egui::Key::Enter);
+    harness.run();
+
+    harness.get_by_label_contains("Y").focus();
+    harness.run();
+
+    harness.key_press(egui::Key::Enter);
+    harness.run();
+
+    assert!(
+        harness.query_by_label("Goal").is_some(),
+        "Expected nested submenu to open via keyboard"
+    );
+}
+
+#[test]
+pub fn keyboard_should_close_nested_submenu_with_second_enter() {
+    let mut harness = keyboard_submenu_harness();
+
+    harness.get_by_label("X").focus();
+    harness.run();
+
+    harness.key_press(egui::Key::Enter);
+    harness.run();
+
+    harness.get_by_label_contains("Y").focus();
+    harness.run();
+
+    harness.key_press(egui::Key::Enter);
+    harness.run();
+
+    assert!(
+        harness.query_by_label("Goal").is_some(),
+        "Expected nested submenu to open before close attempt"
+    );
+
+    harness.get_by_label_contains("Y").focus();
+    harness.run();
+
+    harness.key_press(egui::Key::Enter);
+    harness.run();
+
+    assert!(
+        harness.query_by_label("Goal").is_none(),
+        "Expected nested submenu to close when pressing Enter again"
+    );
+}
+
+/// Regression test for a bug in `horizontal_wrapped` layouts where text wraps but does not
+/// move to the next line, causing overlapping text.
+///
+/// Sweeps the available width from 200 down to 50 (one frame per width) and asserts that no
+/// two `TextRun` accesskit nodes (one per laid-out row) have overlapping bounds, and that
+/// all accesskit text runs and painted text shapes stay within the `horizontal_wrapped` rect.
+#[test]
+pub fn horizontal_wrapped_text_should_not_overlap() {
+    struct State {
+        width: f32,
+        rect: egui::Rect,
+    }
+
+    let mut harness = Harness::builder()
+        .with_size(Vec2::new(300.0, 400.0))
+        .build_ui_state(
+            |ui, state: &mut State| {
+                ui.set_width(state.width);
+                state.rect = egui::Frame::popup(ui.style())
+                    .show(ui, |ui| {
+                        ui.horizontal_wrapped(|ui| {
+                            ui.set_width(ui.available_width());
+                            for i in 0..20 {
+                                ui.label(format!("Hello{i}"));
+                            }
+                        })
+                        .response
+                        .rect
+                    })
+                    .inner;
+            },
+            State {
+                width: 200.0,
+                rect: Rect::NAN,
+            },
+        );
+
+    let min_width = 50.0;
+
+    loop {
+        let width = harness.state().width - 1.0;
+        if width < min_width {
+            break;
+        }
+        harness.state_mut().width = width;
+        harness.step();
+
+        let container_rect = harness.state().rect.expand(1.0);
+
+        let runs: Vec<_> = harness
+            .query_all_by_role(accesskit::Role::TextRun)
+            .map(|node| (node.rect(), node.value().unwrap_or_default()))
+            .collect();
+
+        for (rect, text) in &runs {
+            assert!(
+                container_rect.contains_rect(*rect),
+                "TextRun rect at available width = {width} is outside horizontal_wrapped rect: \
+                 {text:?} {rect:?} outside {container_rect:?}"
+            );
+        }
+
+        for clipped in &harness.output().shapes {
+            if let egui::epaint::Shape::Text(text_shape) = &clipped.shape {
+                let shape_rect = text_shape.visual_bounding_rect();
+                assert!(
+                    container_rect.contains_rect(shape_rect),
+                    "TextShape rect at available width = {width} is outside horizontal_wrapped rect: \
+                     {:?} {shape_rect:?} outside {container_rect:?}",
+                    text_shape.galley.text()
+                );
+            }
+        }
+
+        for i in 0..runs.len() {
+            for j in (i + 1)..runs.len() {
+                let (a, ta) = &runs[i];
+                let (b, tb) = &runs[j];
+                let inter = a.intersect(*b);
+                // Allow tiny floating-point slop for rects that just touch.
+                let overlaps = inter.width() > 0.5 && inter.height() > 0.5;
+                assert!(
+                    !overlaps,
+                    "TextRun rects overlap at available width = {width}: \
+                     {ta:?} {a:?} vs {tb:?} {b:?} \
+                     (overlap = {}x{})",
+                    inter.width(),
+                    inter.height()
+                );
+            }
+        }
+    }
+}
+
+#[test]
+pub fn pointer_click_on_open_submenu_button_should_not_close_it() {
+    let mut harness = keyboard_submenu_harness();
+
+    harness.get_by_label("X").click();
+    harness.run();
+
+    harness.get_by_label_contains("Y").click();
+    harness.run();
+
+    assert!(
+        harness.query_by_label("Goal").is_some(),
+        "Expected submenu to remain open after pointer click on its button"
+    );
+
+    harness.get_by_label_contains("Y").click();
+    harness.run();
+
+    assert!(
+        harness.query_by_label("Goal").is_some(),
+        "Expected submenu to remain open on repeated pointer click"
+    );
+}
diff --git a/crates/egui_kittest/tests/snapshots/combobox_closed.png b/crates/egui_kittest/tests/snapshots/combobox_closed.png
index 073ae79a3..7df09f4bd 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:00fb02e0cc2c1454d3a3dc0635be24086234c2bc5e2c9fd73741b179622e16d6
-size 4514
+oid sha256:698d1e9ecf490e04fb58ebf81cf9c633be29712abe172a6e6adfdc7fe442732d
+size 4517
diff --git a/crates/egui_kittest/tests/snapshots/combobox_opened.png b/crates/egui_kittest/tests/snapshots/combobox_opened.png
index 78e1baaca..20dd3e232 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:d8757e2db9a3892d9347495ad59f14d2bd9164a9ba258375a53c9faf8176b597
-size 8016
+oid sha256:84e857521c20ea2458d9f9d724578e0495c06e75571c25104bf64a0be0be617d
+size 8028
diff --git a/crates/egui_kittest/tests/snapshots/menu/closed_hovered.png b/crates/egui_kittest/tests/snapshots/menu/closed_hovered.png
index a82442e1e..c498163ee 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:5f4a038f9acbb12880ba6b681ef7d3ae566045c4474aa31e7c6d746c39a649fc
-size 11108
+oid sha256:aac8c973f26d03c25155f0454185dc3ab27fffae1c63443e36f07c49fb0828bf
+size 11183
diff --git a/crates/egui_kittest/tests/snapshots/menu/opened.png b/crates/egui_kittest/tests/snapshots/menu/opened.png
index eb55bd894..4ef240cc9 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:2965482e0161b4ea99aa5b4ece32261dbe246f86fe43054a754fbd556c7a5896
-size 21666
+oid sha256:8dd0d91d0866848e7965e88223ff3ddae2231728197fbcd3fb5b1a6b034e179d
+size 21804
diff --git a/crates/egui_kittest/tests/snapshots/menu/submenu.png b/crates/egui_kittest/tests/snapshots/menu/submenu.png
index 0a78e4e6c..20c6bed89 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:7592ca6213497f686d105a2e686d0c5de364388ddd174cbe8abb425d27ddcab0
-size 28505
+oid sha256:11d0081c272986e6fbd00cde05c0931321bc9670d6a0fa3a650323cd7b56d795
+size 28667
diff --git a/crates/egui_kittest/tests/snapshots/menu/subsubmenu.png b/crates/egui_kittest/tests/snapshots/menu/subsubmenu.png
index 84e6ba152..01a316007 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:3a1adf0903f0fc50323c2d77bbc491c950ab0dae6593c004770ea7961c2c6273
-size 33270
+oid sha256:6fc08e05c0ab0e167503324fb7c82777afd5866384ae8bbacb9b933f717feb56
+size 33412
diff --git a/crates/egui_kittest/tests/snapshots/readme_example.png b/crates/egui_kittest/tests/snapshots/readme_example.png
index 050a4a43e..55a13d3e4 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:1dd1f5013587463f002b1becac1560876c462295dbe5dfbb1a9dbce58991e53d
-size 2209
+oid sha256:57211d5ac8021223ed288b9fd6f651ed901ec91599ed67d54ac540f3a2037937
+size 2205
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 9709e159e..461a2e695 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:ad75a0e568e04c20d0e3b823c7e4906c39dcd0a69a086d8e30714a9e4530d031
-size 2128
+oid sha256:4ae52d6761a4d0b95b38ca4ca34c10751eef1ab2a54a62786c55bee3a3522ba1
+size 2050
diff --git a/crates/egui_kittest/tests/snapshots/test_masking.png b/crates/egui_kittest/tests/snapshots/test_masking.png
index 5bf5dd6fa..6473e407e 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:be0bd449166878ced27eff4966d1741731e926f9baabe8b590375c20103036dd
-size 5527
+oid sha256:7ddac0bff10e6699c0ab2d9ea3679d5047d6099b7ba3540d1ebc144361f07d86
+size 5517
diff --git a/crates/egui_kittest/tests/snapshots/test_scroll_initial.png b/crates/egui_kittest/tests/snapshots/test_scroll_initial.png
index e61dc99a0..e03db834f 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:eb8737af84c3d3b0c054b7e2a8bcb04685243d84cb13b72a1372dc40dbfd14fb
-size 7267
+oid sha256:59939d3347679ff27c1de500a559cdc0e6387f633c86ec7ce51f2a36cd92547b
+size 7511
diff --git a/crates/egui_kittest/tests/snapshots/test_scroll_scrolled.png b/crates/egui_kittest/tests/snapshots/test_scroll_scrolled.png
index 0cc3d6d15..a87f09545 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:f1651bb1b9bbaa3c65ecd07c39c57527f4beb4c607581a5b2596a49dcf4c5db3
-size 7996
+oid sha256:df2578c198b29950254ec62c6cc615a4b1c003e7ae3ea027da22fc868b392c74
+size 8342
diff --git a/crates/egui_kittest/tests/snapshots/test_shrink.png b/crates/egui_kittest/tests/snapshots/test_shrink.png
index e4ff540f4..de27685a8 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:888f8a4d995d718a9a158e563d8ac1434775660b33aebb5f34feea54ffd12600
-size 2830
+oid sha256:db6f35e7dabe8f6d3766df022e5643f8461c3c2476959682622b793d59bf7c40
+size 2833
diff --git a/crates/egui_kittest/tests/snapshots/test_tooltip_hidden.png b/crates/egui_kittest/tests/snapshots/test_tooltip_hidden.png
index e4ff540f4..de27685a8 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:888f8a4d995d718a9a158e563d8ac1434775660b33aebb5f34feea54ffd12600
-size 2830
+oid sha256:db6f35e7dabe8f6d3766df022e5643f8461c3c2476959682622b793d59bf7c40
+size 2833
diff --git a/crates/egui_kittest/tests/snapshots/test_tooltip_shown.png b/crates/egui_kittest/tests/snapshots/test_tooltip_shown.png
index d6053700b..7396758ea 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:037f3e356d32e1a2c32767460399f919452bff0933e1db7aa113e7e2bdb083f0
-size 4927
+oid sha256:d785e2073627f33a2e7a23a47e0e0b8ca9570f45d4de3d8b545b473c1a9e75b5
+size 4940
diff --git a/crates/emath/CHANGELOG.md b/crates/emath/CHANGELOG.md
index f559265c4..bc7f428ba 100644
--- a/crates/emath/CHANGELOG.md
+++ b/crates/emath/CHANGELOG.md
@@ -6,6 +6,18 @@ 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.34.2 - 2026-05-04
+Nothing new
+
+
+## 0.34.1 - 2026-03-27
+Nothing new
+
+
+## 0.34.0 - 2026-03-26
+Nothing new
+
+
 ## 0.33.3 - 2025-12-11
 Nothing new
 
diff --git a/crates/emath/Cargo.toml b/crates/emath/Cargo.toml
index 416d32750..9895fffc6 100644
--- a/crates/emath/Cargo.toml
+++ b/crates/emath/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 repository = "https://github.com/emilk/egui/tree/main/crates/emath"
 categories = ["mathematics", "gui"]
 keywords = ["math", "gui"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
 
 [lints]
 workspace = true
diff --git a/crates/emath/src/history.rs b/crates/emath/src/history.rs
index 6aafd0af1..c25b94147 100644
--- a/crates/emath/src/history.rs
+++ b/crates/emath/src/history.rs
@@ -126,7 +126,10 @@ where
     /// Values must be added with a monotonically increasing time, or at least not decreasing.
     pub fn add(&mut self, now: f64, value: T) {
         if let Some((last_time, _)) = self.values.back() {
-            debug_assert!(*last_time <= now, "Time shouldn't move backwards");
+            debug_assert!(
+                *last_time <= now,
+                "Time shouldn't move backwards. Last time: {last_time}, new time: {now}"
+            );
         }
         self.total_count += 1;
         self.values.push_back((now, value));
diff --git a/crates/emath/src/pos2.rs b/crates/emath/src/pos2.rs
index fc26686b3..f67767e6b 100644
--- a/crates/emath/src/pos2.rs
+++ b/crates/emath/src/pos2.rs
@@ -119,6 +119,11 @@ impl Pos2 {
     /// Same as `Pos2::default()`.
     pub const ZERO: Self = Self { x: 0.0, y: 0.0 };
 
+    pub const NAN: Self = Self {
+        x: f32::NAN,
+        y: f32::NAN,
+    };
+
     #[inline(always)]
     pub const fn new(x: f32, y: f32) -> Self {
         Self { x, y }
diff --git a/crates/epaint/CHANGELOG.md b/crates/epaint/CHANGELOG.md
index dd6b4e2a5..e6ccb10a1 100644
--- a/crates/epaint/CHANGELOG.md
+++ b/crates/epaint/CHANGELOG.md
@@ -5,6 +5,33 @@ 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.34.2 - 2026-05-04
+* Fix text layout bugs in wrapped texts [#8137](https://github.com/emilk/egui/pull/8137) by [@lucasmerlin](https://github.com/lucasmerlin)
+
+
+## 0.34.1 - 2026-03-27
+Nothing new
+
+
+## 0.34.0 - 2026-03-26
+### ⭐ Added
+* Replace ab_glyph with Skrifa + vello_cpu; enable font hinting [#7694](https://github.com/emilk/egui/pull/7694) by [@valadaptive](https://github.com/valadaptive)
+* Add font variations API [#7859](https://github.com/emilk/egui/pull/7859) by [@valadaptive](https://github.com/valadaptive)
+* Allow rotation of rectangles and ellipses [#7682](https://github.com/emilk/egui/pull/7682) by [@RyanBluth](https://github.com/RyanBluth)
+
+### 🔧 Changed
+* Apply preferred font weight when loading variable fonts [#7790](https://github.com/emilk/egui/pull/7790) by [@pmnxis](https://github.com/pmnxis)
+* Make `Galley::pos_from_layout_cursor` `pub` [#7864](https://github.com/emilk/egui/pull/7864) by [@dionb](https://github.com/dionb)
+
+### 🐛 Fixed
+* Fixes the overly aggressive overflow elision in `truncate()` and similar for os scaling other than 100% [#7867](https://github.com/emilk/egui/pull/7867) by [@RndUsr123](https://github.com/RndUsr123)
+* Fix text color when selecting newline character [#7951](https://github.com/emilk/egui/pull/7951) by [@emilk](https://github.com/emilk)
+* Fix galley width calculation being off due to subpixel binning [#7972](https://github.com/emilk/egui/pull/7972) by [@lucasmerlin](https://github.com/lucasmerlin)
+
+### 🚀 Performance
+* Avoid cloning `Row`s during `Galley::concat` [#7649](https://github.com/emilk/egui/pull/7649) by [@afishhh](https://github.com/afishhh)
+
+
 ## 0.33.3 - 2025-12-11
 Nothing new
 
diff --git a/crates/epaint/Cargo.toml b/crates/epaint/Cargo.toml
index c8a05e4d7..f16903730 100644
--- a/crates/epaint/Cargo.toml
+++ b/crates/epaint/Cargo.toml
@@ -11,7 +11,7 @@ readme = "README.md"
 repository = "https://github.com/emilk/egui/tree/main/crates/epaint"
 categories = ["graphics", "gui"]
 keywords = ["graphics", "gui", "egui"]
-include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
+include = ["../../LICENSE-APACHE", "../../LICENSE-MIT", "**/*.rs", "Cargo.toml"]
 
 [lints]
 workspace = true
@@ -48,7 +48,14 @@ mint = ["emath/mint"]
 rayon = ["dep:rayon"]
 
 ## Allow serialization using [`serde`](https://docs.rs/serde).
-serde = ["dep:serde", "ahash/serde", "emath/serde", "ecolor/serde", "font-types/serde", "smallvec/serde"]
+serde = [
+  "dep:serde",
+  "ahash/serde",
+  "ecolor/serde",
+  "emath/serde",
+  "font-types/serde",
+  "smallvec/serde",
+]
 
 ## Change Vertex layout to be compatible with unity
 unity = []
@@ -63,6 +70,7 @@ ecolor.workspace = true
 
 ahash.workspace = true
 font-types.workspace = true
+harfrust.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.
@@ -70,6 +78,8 @@ profiling.workspace = true
 self_cell.workspace = true
 skrifa.workspace = true
 smallvec.workspace = true
+unicode-general-category.workspace = true
+unicode-segmentation.workspace = true
 vello_cpu.workspace = true
 
 #! ### Optional dependencies
diff --git a/crates/epaint/src/direction.rs b/crates/epaint/src/direction.rs
new file mode 100644
index 000000000..b2f317c37
--- /dev/null
+++ b/crates/epaint/src/direction.rs
@@ -0,0 +1,27 @@
+/// A cardinal direction, one of [`LeftToRight`](Direction::LeftToRight), [`RightToLeft`](Direction::RightToLeft), [`TopDown`](Direction::TopDown), [`BottomUp`](Direction::BottomUp).
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
+pub enum Direction {
+    LeftToRight,
+    RightToLeft,
+    TopDown,
+    BottomUp,
+}
+
+impl Direction {
+    #[inline(always)]
+    pub fn is_horizontal(self) -> bool {
+        match self {
+            Self::LeftToRight | Self::RightToLeft => true,
+            Self::TopDown | Self::BottomUp => false,
+        }
+    }
+
+    #[inline(always)]
+    pub fn is_vertical(self) -> bool {
+        match self {
+            Self::LeftToRight | Self::RightToLeft => false,
+            Self::TopDown | Self::BottomUp => true,
+        }
+    }
+}
diff --git a/crates/epaint/src/lib.rs b/crates/epaint/src/lib.rs
index 0042e0964..427dad181 100644
--- a/crates/epaint/src/lib.rs
+++ b/crates/epaint/src/lib.rs
@@ -27,6 +27,7 @@ mod brush;
 pub mod color;
 mod corner_radius;
 mod corner_radius_f32;
+mod direction;
 pub mod image;
 mod margin;
 mod margin_f32;
@@ -50,6 +51,7 @@ pub use self::{
     color::ColorMode,
     corner_radius::CornerRadius,
     corner_radius_f32::CornerRadiusF32,
+    direction::Direction,
     image::{AlphaFromCoverage, ColorImage, ImageData, ImageDelta},
     margin::Margin,
     margin_f32::*,
@@ -69,15 +71,9 @@ pub use self::{
     viewport::ViewportInPixels,
 };
 
-#[deprecated = "Renamed to CornerRadius"]
-pub type Rounding = CornerRadius;
-
 pub use ecolor::{Color32, Hsva, HsvaGamma, Rgba};
 pub use emath::{Pos2, Rect, Vec2, pos2, vec2};
 
-#[deprecated = "Use the ahash crate directly."]
-pub use ahash;
-
 pub use ecolor;
 pub use emath;
 
diff --git a/crates/epaint/src/margin_f32.rs b/crates/epaint/src/margin_f32.rs
index 22bc8b3d4..2a8c820a1 100644
--- a/crates/epaint/src/margin_f32.rs
+++ b/crates/epaint/src/margin_f32.rs
@@ -17,9 +17,6 @@ pub struct MarginF32 {
     pub bottom: f32,
 }
 
-#[deprecated = "Renamed to MarginF32"]
-pub type Marginf = MarginF32;
-
 impl From<Margin> for MarginF32 {
     #[inline]
     fn from(margin: Margin) -> Self {
@@ -97,18 +94,6 @@ impl MarginF32 {
     pub fn is_same(&self) -> bool {
         self.left == self.right && self.left == self.top && self.left == self.bottom
     }
-
-    #[deprecated = "Use `rect + margin` instead"]
-    #[inline]
-    pub fn expand_rect(&self, rect: Rect) -> Rect {
-        Rect::from_min_max(rect.min - self.left_top(), rect.max + self.right_bottom())
-    }
-
-    #[deprecated = "Use `rect - margin` instead"]
-    #[inline]
-    pub fn shrink_rect(&self, rect: Rect) -> Rect {
-        Rect::from_min_max(rect.min + self.left_top(), rect.max - self.right_bottom())
-    }
 }
 
 impl From<f32> for MarginF32 {
diff --git a/crates/epaint/src/mesh.rs b/crates/epaint/src/mesh.rs
index 5343fdace..d48c98bc2 100644
--- a/crates/epaint/src/mesh.rs
+++ b/crates/epaint/src/mesh.rs
@@ -23,6 +23,18 @@ pub struct Vertex {
     pub color: Color32, // 32 bit
 }
 
+impl Vertex {
+    /// An untextured vertex
+    #[inline]
+    pub fn untextured(pos: Pos2, color: Color32) -> Self {
+        Self {
+            pos,
+            uv: WHITE_UV,
+            color,
+        }
+    }
+}
+
 #[repr(C)]
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 #[cfg(all(feature = "unity", not(feature = "_override_unity")))]
@@ -159,11 +171,7 @@ impl Mesh {
             self.texture_id == TextureId::default(),
             "Mesh has an assigned texture"
         );
-        self.vertices.push(Vertex {
-            pos,
-            uv: WHITE_UV,
-            color,
-        });
+        self.vertices.push(Vertex::untextured(pos, color));
     }
 
     /// Add a triangle.
diff --git a/crates/epaint/src/shape_transform.rs b/crates/epaint/src/shape_transform.rs
index 8fce01f64..71cc1332e 100644
--- a/crates/epaint/src/shape_transform.rs
+++ b/crates/epaint/src/shape_transform.rs
@@ -57,6 +57,7 @@ pub fn adjust_colors(
             radius: _,
             fill,
             stroke,
+            angle: _,
         })
         | Shape::Rect(RectShape {
             rect: _,
@@ -67,6 +68,7 @@ pub fn adjust_colors(
             round_to_pixels: _,
             blur_width: _,
             brush: _,
+            angle: _,
         }) => {
             adjust_color(fill);
             adjust_color(&mut stroke.color);
diff --git a/crates/epaint/src/shapes/ellipse_shape.rs b/crates/epaint/src/shapes/ellipse_shape.rs
index 310638d0f..b436eb841 100644
--- a/crates/epaint/src/shapes/ellipse_shape.rs
+++ b/crates/epaint/src/shapes/ellipse_shape.rs
@@ -10,6 +10,9 @@ pub struct EllipseShape {
     pub radius: Vec2,
     pub fill: Color32,
     pub stroke: Stroke,
+
+    /// Rotate ellipse by this many radians clockwise around its center.
+    pub angle: f32,
 }
 
 impl EllipseShape {
@@ -20,6 +23,7 @@ impl EllipseShape {
             radius,
             fill: fill_color.into(),
             stroke: Default::default(),
+            angle: 0.0,
         }
     }
 
@@ -30,18 +34,38 @@ impl EllipseShape {
             radius,
             fill: Default::default(),
             stroke: stroke.into(),
+            angle: 0.0,
         }
     }
 
+    /// Set the rotation of the ellipse (in radians, clockwise).
+    /// The ellipse rotates around its center.
+    #[inline]
+    pub fn with_angle(mut self, angle: f32) -> Self {
+        self.angle = angle;
+        self
+    }
+
+    /// Set the rotation of the ellipse (in radians, clockwise) around a custom pivot point.
+    #[inline]
+    pub fn with_angle_and_pivot(mut self, angle: f32, pivot: Pos2) -> Self {
+        self.angle = angle;
+        let rot = emath::Rot2::from_angle(angle);
+        self.center = pivot + rot * (self.center - pivot);
+        self
+    }
+
     /// The visual bounding rectangle (includes stroke width)
     pub fn visual_bounding_rect(&self) -> Rect {
         if self.fill == Color32::TRANSPARENT && self.stroke.is_empty() {
             Rect::NOTHING
         } else {
-            Rect::from_center_size(
-                self.center,
+            let rect = Rect::from_center_size(
+                Pos2::ZERO,
                 self.radius * 2.0 + Vec2::splat(self.stroke.width),
-            )
+            );
+            rect.rotate_bb(emath::Rot2::from_angle(self.angle))
+                .translate(self.center.to_vec2())
         }
     }
 }
diff --git a/crates/epaint/src/shapes/rect_shape.rs b/crates/epaint/src/shapes/rect_shape.rs
index 2e855d369..e0c528377 100644
--- a/crates/epaint/src/shapes/rect_shape.rs
+++ b/crates/epaint/src/shapes/rect_shape.rs
@@ -54,13 +54,16 @@ pub struct RectShape {
     /// Since most rectangles do not have a texture, this is optional and in an `Arc`,
     /// so that [`RectShape`] is kept small..
     pub brush: Option<Arc<Brush>>,
+
+    /// Rotate rectangle by this many radians clockwise around its center.
+    pub angle: f32,
 }
 
 #[test]
 fn rect_shape_size() {
     assert_eq!(
         std::mem::size_of::<RectShape>(),
-        48,
+        56,
         "RectShape changed size! If it shrank - good! Update this test. If it grew - bad! Try to find a way to avoid it."
     );
     assert!(
@@ -88,6 +91,7 @@ impl RectShape {
             round_to_pixels: None,
             blur_width: 0.0,
             brush: Default::default(),
+            angle: 0.0,
         }
     }
 
@@ -157,6 +161,25 @@ impl RectShape {
         self
     }
 
+    /// Set the rotation of the rectangle (in radians, clockwise).
+    /// The rectangle rotates around its center.
+    #[inline]
+    pub fn with_angle(mut self, angle: f32) -> Self {
+        self.angle = angle;
+        self
+    }
+
+    /// Set the rotation of the rectangle (in radians, clockwise) around a custom pivot point.
+    #[inline]
+    pub fn with_angle_and_pivot(mut self, angle: f32, pivot: Pos2) -> Self {
+        self.angle = angle;
+        let rot = emath::Rot2::from_angle(angle);
+        let center = self.rect.center();
+        let new_center = pivot + rot * (center - pivot);
+        self.rect = self.rect.translate(new_center - center);
+        self
+    }
+
     /// The visual bounding rectangle (includes stroke width)
     #[inline]
     pub fn visual_bounding_rect(&self) -> Rect {
@@ -168,7 +191,17 @@ impl RectShape {
                 StrokeKind::Middle => self.stroke.width / 2.0,
                 StrokeKind::Outside => self.stroke.width,
             };
-            self.rect.expand(expand + self.blur_width / 2.0)
+            let expanded = self.rect.expand(expand + self.blur_width / 2.0);
+            if self.angle == 0.0 {
+                expanded
+            } else {
+                // Rotate around the rectangle's center and compute bounding box
+                let center = self.rect.center();
+                let rect_relative = Rect::from_center_size(Pos2::ZERO, expanded.size());
+                rect_relative
+                    .rotate_bb(emath::Rot2::from_angle(self.angle))
+                    .translate(center.to_vec2())
+            }
         }
     }
 
diff --git a/crates/epaint/src/shapes/shape.rs b/crates/epaint/src/shapes/shape.rs
index fa8a3e75c..5155fe0f5 100644
--- a/crates/epaint/src/shapes/shape.rs
+++ b/crates/epaint/src/shapes/shape.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 use emath::{Align2, Pos2, Rangef, Rect, TSTransform, Vec2, pos2};
 
 use crate::{
-    Color32, CornerRadius, Mesh, Stroke, StrokeKind, TextureId,
+    Color32, CornerRadius, Direction, Mesh, Stroke, StrokeKind, TextureId, Vertex,
     stroke::PathStroke,
     text::{FontId, FontsView, Galley},
 };
@@ -297,6 +297,32 @@ impl Shape {
         Self::Rect(RectShape::stroke(rect, corner_radius, stroke, stroke_kind))
     }
 
+    /// Paints a gradient rectangle that transitions from `color_from` to `color_to`
+    /// along the given `direction`.
+    ///
+    /// For example, [`Direction::TopDown`] paints `color_from` at the top edge fading
+    /// to `color_to` at the bottom edge.
+    #[inline]
+    pub fn gradient_rect(rect: Rect, direction: Direction, [from, to]: [Color32; 2]) -> Self {
+        let (left_top, right_top, left_bottom, right_bottom) = match direction {
+            Direction::TopDown => (from, from, to, to),
+            Direction::BottomUp => (to, to, from, from),
+            Direction::LeftToRight => (from, to, from, to),
+            Direction::RightToLeft => (to, from, to, from),
+        };
+
+        Self::from(Mesh {
+            indices: vec![0, 1, 2, 2, 1, 3],
+            vertices: vec![
+                Vertex::untextured(rect.left_top(), left_top),
+                Vertex::untextured(rect.right_top(), right_top),
+                Vertex::untextured(rect.left_bottom(), left_bottom),
+                Vertex::untextured(rect.right_bottom(), right_bottom),
+            ],
+            texture_id: Default::default(),
+        })
+    }
+
     #[expect(clippy::needless_pass_by_value)]
     pub fn text(
         fonts: &mut FontsView<'_>,
@@ -331,12 +357,6 @@ impl Shape {
             .into()
     }
 
-    #[inline]
-    #[deprecated = "Use `Shape::galley` or `Shape::galley_with_override_text_color` instead"]
-    pub fn galley_with_color(pos: Pos2, galley: Arc<Galley>, text_color: Color32) -> Self {
-        Self::galley_with_override_text_color(pos, galley, text_color)
-    }
-
     #[inline]
     pub fn mesh(mesh: impl Into<Arc<Mesh>>) -> Self {
         let mesh = mesh.into();
diff --git a/crates/epaint/src/stats.rs b/crates/epaint/src/stats.rs
index 1eef4f444..de8f275cf 100644
--- a/crates/epaint/src/stats.rs
+++ b/crates/epaint/src/stats.rs
@@ -135,10 +135,10 @@ impl AllocInfo {
                 what,
                 self.megabytes()
             )
-        } else if self.element_size != ElementSize::Heterogenous {
+        } else if self.element_size == ElementSize::Heterogenous {
             format!(
                 "{:6} {:16}  {}     {:3} allocations",
-                self.num_elements(),
+                "",
                 what,
                 self.megabytes(),
                 self.num_allocs()
@@ -146,7 +146,7 @@ impl AllocInfo {
         } else {
             format!(
                 "{:6} {:16}  {}     {:3} allocations",
-                "",
+                self.num_elements(),
                 what,
                 self.megabytes(),
                 self.num_allocs()
diff --git a/crates/epaint/src/tessellator.rs b/crates/epaint/src/tessellator.rs
index 9529765ac..9a90636a4 100644
--- a/crates/epaint/src/tessellator.rs
+++ b/crates/epaint/src/tessellator.rs
@@ -10,8 +10,8 @@ use emath::{GuiRounding as _, NumExt as _, Pos2, Rect, Rot2, Vec2, pos2, remap,
 use crate::{
     CircleShape, ClippedPrimitive, ClippedShape, Color32, CornerRadiusF32, CubicBezierShape,
     EllipseShape, Mesh, PathShape, Primitive, QuadraticBezierShape, RectShape, Shape, Stroke,
-    StrokeKind, TextShape, TextureId, Vertex, WHITE_UV, color::ColorMode, emath,
-    stroke::PathStroke, texture_atlas::PreparedDisc,
+    StrokeKind, TextShape, TextureId, Vertex, color::ColorMode, emath, stroke::PathStroke,
+    texture_atlas::PreparedDisc,
 };
 
 // ----------------------------------------------------------------------------
@@ -809,11 +809,8 @@ fn fill_closed_path(feathering: f32, path: &mut [PathPoint], fill_color: Color32
     } else {
         out.reserve_triangles(n as usize);
         let idx = out.vertices.len() as u32;
-        out.vertices.extend(path.iter().map(|p| Vertex {
-            pos: p.pos,
-            uv: WHITE_UV,
-            color: fill_color,
-        }));
+        out.vertices
+            .extend(path.iter().map(|p| Vertex::untextured(p.pos, fill_color)));
         for i in 2..n {
             out.add_triangle(idx, idx + i - 1, idx + i);
         }
@@ -1546,6 +1543,7 @@ impl Tessellator {
             radius,
             fill,
             stroke,
+            angle,
         } = shape;
 
         if radius.x <= 0.0 || radius.y <= 0.0 {
@@ -1596,6 +1594,14 @@ impl Tessellator {
         points.push(center + Vec2::new(0.0, -radius.y));
         points.extend(quarter.iter().rev().map(|p| center + Vec2::new(p.x, -p.y)));
 
+        // Apply rotation if angle is non-zero
+        if angle != 0.0 {
+            let rot = emath::Rot2::from_angle(angle);
+            for point in &mut points {
+                *point = center + rot * (*point - center);
+            }
+        }
+
         let path_stroke = PathStroke::from(stroke).outside();
         self.scratchpad_path.clear();
         self.scratchpad_path.add_line_loop(&points);
@@ -1697,16 +1703,6 @@ impl Tessellator {
             .stroke_open(self.feathering, &stroke.into(), out);
     }
 
-    #[deprecated = "Use `tessellate_line_segment` instead"]
-    pub fn tessellate_line(
-        &mut self,
-        points: [Pos2; 2],
-        stroke: impl Into<Stroke>,
-        out: &mut Mesh,
-    ) {
-        self.tessellate_line_segment(points, stroke, out);
-    }
-
     /// Tessellate a single [`PathShape`] into a [`Mesh`].
     ///
     /// * `path_shape`: the path to tessellate.
@@ -1773,6 +1769,7 @@ impl Tessellator {
             round_to_pixels,
             mut blur_width,
             brush: _, // brush is extracted on its own, because it is not Copy
+            angle,
         } = *rect_shape;
 
         let mut corner_radius = CornerRadiusF32::from(corner_radius);
@@ -1940,6 +1937,16 @@ impl Tessellator {
         let path = &mut self.scratchpad_path;
         path.clear();
         path::rounded_rectangle(&mut self.scratchpad_points, rect, corner_radius);
+
+        // Apply rotation if angle is non-zero
+        if angle != 0.0 {
+            let rot = emath::Rot2::from_angle(angle);
+            let center = rect.center();
+            for point in &mut self.scratchpad_points {
+                *point = center + rot * (*point - center);
+            }
+        }
+
         path.add_line_loop(&self.scratchpad_points);
 
         let path_stroke = PathStroke::from(stroke).with_kind(stroke_kind);
diff --git a/crates/epaint/src/text/font.rs b/crates/epaint/src/text/font.rs
index 61f9f9f2f..2d5edf1cf 100644
--- a/crates/epaint/src/text/font.rs
+++ b/crates/epaint/src/text/font.rs
@@ -2,10 +2,7 @@
 
 use emath::{GuiRounding as _, OrderedFloat, Vec2, vec2};
 use self_cell::self_cell;
-use skrifa::{
-    MetadataProvider as _,
-    raw::{TableProvider as _, tables::kern::SubtableKind},
-};
+use skrifa::{GlyphId, MetadataProvider as _};
 use std::collections::BTreeMap;
 use vello_cpu::{color, kurbo};
 
@@ -44,12 +41,10 @@ impl UvRect {
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
 pub struct GlyphInfo {
-    /// Used for pair-kerning.
-    ///
     /// Doesn't need to be unique.
     ///
     /// Is `None` for a special "invisible" glyph.
-    pub(crate) id: Option<skrifa::GlyphId>,
+    pub(crate) id: Option<GlyphId>,
 
     /// In [`skrifa`]s "unscaled" coordinate system.
     pub advance_width_unscaled: OrderedFloat<f32>,
@@ -124,17 +119,8 @@ impl SubpixelBin {
     }
 }
 
-#[derive(Clone, Copy, Debug, PartialEq, Default)]
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
 pub struct GlyphAllocation {
-    /// Used for pair-kerning.
-    ///
-    /// Doesn't need to be unique.
-    /// 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,
-
     /// UV rectangle for drawing.
     pub uv_rect: UvRect,
 }
@@ -145,7 +131,7 @@ struct GlyphCacheKey(u64);
 impl nohash_hasher::IsEnabled for GlyphCacheKey {}
 
 impl GlyphCacheKey {
-    fn new(glyph_id: skrifa::GlyphId, metrics: &StyledMetrics, bin: SubpixelBin) -> Self {
+    fn new(glyph_id: GlyphId, metrics: &StyledMetrics, bin: SubpixelBin) -> Self {
         let StyledMetrics {
             pixels_per_point,
             px_scale_factor,
@@ -198,12 +184,10 @@ impl FontCell {
         &mut self,
         atlas: &mut TextureAtlas,
         metrics: &StyledMetrics,
-        glyph_info: &GlyphInfo,
+        glyph_id: GlyphId,
         bin: SubpixelBin,
         location: skrifa::instance::LocationRef<'_>,
     ) -> Option<GlyphAllocation> {
-        let glyph_id = glyph_info.id?;
-
         debug_assert!(
             glyph_id != skrifa::GlyphId::NOTDEF,
             "Can't allocate glyph for id 0"
@@ -288,11 +272,7 @@ impl FontCell {
             }
         };
 
-        Some(GlyphAllocation {
-            id: glyph_id,
-            advance_width_px: glyph_info.advance_width_unscaled.0 * metrics.px_scale_factor,
-            uv_rect,
-        })
+        Some(GlyphAllocation { uv_rect })
     }
 }
 
@@ -336,6 +316,11 @@ pub struct FontFace {
     name: String,
     font: FontCell,
     tweak: FontTweak,
+    subpixel_binning: bool,
+
+    /// Cached `harfrust` shaper data (parsed GSUB/GPOS tables).
+    /// `ShaperData` is `Copy` — lives outside the `self_cell`.
+    shaper_data: harfrust::ShaperData,
 
     glyph_info_cache: ahash::HashMap<char, GlyphInfo>,
     glyph_alloc_cache: ahash::HashMap<GlyphCacheKey, GlyphAllocation>,
@@ -368,7 +353,7 @@ impl FontFace {
                 skrifa::instance::LocationRef::default(),
             );
 
-            let hinting_enabled = tweak.hinting_override.unwrap_or(options.font_hinting);
+            let hinting_enabled = tweak.hinting.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
@@ -393,10 +378,16 @@ impl FontFace {
             })
         })?;
 
+        let shaper_data = harfrust::ShaperData::new(&font.borrow_dependent().skrifa);
+
+        let subpixel_binning = tweak.subpixel_binning.unwrap_or(options.subpixel_binning);
+
         Ok(Self {
             name,
             font,
             tweak,
+            subpixel_binning,
+            shaper_data,
             glyph_info_cache: Default::default(),
             glyph_alloc_cache: Default::default(),
         })
@@ -445,8 +436,7 @@ impl FontFace {
             && let Some(space) = self.glyph_info(' ')
         {
             let glyph_info = GlyphInfo {
-                advance_width_unscaled: (crate::text::TAB_SIZE as f32
-                    * space.advance_width_unscaled.0)
+                advance_width_unscaled: (self.tweak.tab_size * space.advance_width_unscaled.0)
                     .into(),
                 ..space
             };
@@ -454,21 +444,18 @@ impl FontFace {
             return Some(glyph_info);
         }
 
-        if c == '\u{2009}' {
-            // Thin space, often used as thousands deliminator: 1 234 567 890
-            // https://www.compart.com/en/unicode/U+2009
-            // https://en.wikipedia.org/wiki/Thin_space
-
-            if let Some(space) = self.glyph_info(' ') {
-                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(),
-                    ..space
-                };
-                self.glyph_info_cache.insert(c, glyph_info);
-                return Some(glyph_info);
-            }
+        if (c == '\u{2009}' || c == '\u{202F}')
+            && let Some(space) = self.glyph_info(' ')
+        {
+            // Thin space (U+2009) and narrow no-break space (U+202F),
+            // often used as thousands separator: 1 234 567 890
+            let advance_width = self.tweak.thin_space_width * space.advance_width_unscaled.0;
+            let glyph_info = GlyphInfo {
+                advance_width_unscaled: advance_width.into(),
+                ..space
+            };
+            self.glyph_info_cache.insert(c, glyph_info);
+            return Some(glyph_info);
         }
 
         if invisible_char(c) {
@@ -483,7 +470,7 @@ impl FontFace {
         let glyph_id = font_data
             .charmap
             .map(c)
-            .filter(|id| *id != skrifa::GlyphId::NOTDEF)?;
+            .filter(|id| *id != GlyphId::NOTDEF)?;
 
         let glyph_info = GlyphInfo {
             id: Some(glyph_id),
@@ -497,38 +484,6 @@ impl FontFace {
         Some(glyph_info)
     }
 
-    #[inline]
-    pub(super) fn pair_kerning_pixels(
-        &self,
-        metrics: &StyledMetrics,
-        last_glyph_id: skrifa::GlyphId,
-        glyph_id: skrifa::GlyphId,
-    ) -> f32 {
-        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: &StyledMetrics,
-        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 styled_metrics(
         &self,
@@ -571,51 +526,67 @@ impl FontFace {
         }
     }
 
+    pub(crate) fn skrifa_font_ref(&self) -> &skrifa::FontRef<'_> {
+        &self.font.borrow_dependent().skrifa
+    }
+
+    pub(crate) fn tweak(&self) -> &FontTweak {
+        &self.tweak
+    }
+
+    pub(crate) fn shaper_data(&self) -> &harfrust::ShaperData {
+        &self.shaper_data
+    }
+
     pub fn allocate_glyph(
         &mut self,
         atlas: &mut TextureAtlas,
         metrics: &StyledMetrics,
-        glyph_info: GlyphInfo,
-        chr: char,
-        h_pos: f32,
+        shaped: &ShapedGlyph,
     ) -> (GlyphAllocation, i32) {
-        let advance_width_px = glyph_info.advance_width_unscaled.0 * metrics.px_scale_factor;
+        let ShapedGlyph {
+            glyph_id,
+            h_pos,
+            is_cjk,
+        } = *shaped;
 
-        let Some(glyph_id) = glyph_info.id else {
-            // Invisible.
-            return (GlyphAllocation::default(), h_pos as i32);
-        };
+        if glyph_id == GlyphId::NOTDEF {
+            // invisible
+            return (GlyphAllocation::default(), h_pos.round() as i32);
+        }
 
-        // CJK scripts contain a lot of characters and could hog the glyph atlas if we stored 4 subpixel offsets per
-        // glyph.
-        let (h_pos_round, bin) = if is_cjk(chr) {
-            (h_pos.round() as i32, SubpixelBin::Zero)
-        } else {
+        let (h_pos_round, bin) = if self.subpixel_binning && !is_cjk {
             SubpixelBin::new(h_pos)
+        } else {
+            // CJK scripts contain a lot of characters and could hog the glyph atlas
+            // if we stored 4 subpixel offsets per glyph.
+            (h_pos.round() as i32, SubpixelBin::Zero)
         };
 
-        let entry = match self
-            .glyph_alloc_cache
-            .entry(GlyphCacheKey::new(glyph_id, metrics, bin))
-        {
-            std::collections::hash_map::Entry::Occupied(glyph_alloc) => {
-                let mut glyph_alloc = *glyph_alloc.get();
-                glyph_alloc.advance_width_px = advance_width_px; // Hack to get `\t` and thin space to work, since they use the same glyph id as ` ` (space).
-                return (glyph_alloc, h_pos_round);
-            }
-            std::collections::hash_map::Entry::Vacant(entry) => entry,
-        };
+        let cache_key = GlyphCacheKey::new(glyph_id, metrics, bin);
 
-        let allocation = self
-            .font
-            .allocate_glyph_uncached(atlas, metrics, &glyph_info, bin, (&metrics.location).into())
-            .unwrap_or_default();
+        let alloc = *self.glyph_alloc_cache.entry(cache_key).or_insert_with(|| {
+            self.font
+                .allocate_glyph_uncached(atlas, metrics, glyph_id, bin, (&metrics.location).into())
+                .unwrap_or_default()
+        });
 
-        entry.insert(allocation);
-        (allocation, h_pos_round)
+        (alloc, h_pos_round)
     }
 }
 
+/// Positioning info for a single glyph, ready for atlas allocation.
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct ShapedGlyph {
+    pub glyph_id: GlyphId,
+
+    /// Horizontal position of the glyph origin, in physical pixels.
+    pub h_pos: f32,
+
+    /// CJK glyphs skip subpixel positioning to save atlas space.
+    pub is_cjk: bool,
+}
+
 // TODO(emilk): rename?
 /// Wrapper over multiple [`FontFace`] (e.g. a primary + fallbacks for emojis)
 pub struct Font<'a> {
diff --git a/crates/epaint/src/text/fonts.rs b/crates/epaint/src/text/fonts.rs
index 5099e0085..44b68f5b2 100644
--- a/crates/epaint/src/text/fonts.rs
+++ b/crates/epaint/src/text/fonts.rs
@@ -188,11 +188,29 @@ pub struct FontTweak {
 
     /// Override the global font hinting setting for this specific font.
     ///
-    /// `None` means use the global setting.
-    pub hinting_override: Option<bool>,
+    /// `None` means use the global setting in [`TextOptions::font_hinting`].
+    pub hinting: Option<bool>,
+
+    /// Override the global sub-pixel binning setting for this specific font.
+    ///
+    /// `None` means use the global setting in [`TextOptions::subpixel_binning`].
+    pub subpixel_binning: Option<bool>,
 
     /// Override the font's default variation coordinates.
     pub coords: VariationCoords,
+
+    /// Width of a thin space (`\u{2009}`) and narrow no-break space (`\u{202F}`),
+    /// as a fraction of the normal space width.
+    ///
+    /// Thin space is often used as a thousands separator: `1 234 567`.
+    ///
+    /// Default: `0.5` (half a normal space).
+    pub thin_space_width: f32,
+
+    /// Width of a tab character (`\t`), measured in number of space widths.
+    ///
+    /// Default: `4.0`.
+    pub tab_size: f32,
 }
 
 impl Default for FontTweak {
@@ -201,8 +219,11 @@ impl Default for FontTweak {
             scale: 1.0,
             y_offset_factor: 0.0,
             y_offset: 0.0,
-            hinting_override: None,
+            hinting: None,
+            subpixel_binning: None,
             coords: VariationCoords::default(),
+            thin_space_width: 0.5,
+            tab_size: 4.0,
         }
     }
 }
@@ -765,6 +786,9 @@ pub struct FontsImpl {
     fonts_by_id: nohash_hasher::IntMap<FontFaceKey, FontFace>,
     fonts_by_name: ahash::HashMap<String, FontFaceKey>,
     family_cache: ahash::HashMap<FontFamily, CachedFamily>,
+
+    /// Recycled `harfrust` shaping buffer to avoid per-layout allocations.
+    shape_buffer: Option<harfrust::UnicodeBuffer>,
 }
 
 impl FontsImpl {
@@ -798,6 +822,7 @@ impl FontsImpl {
             fonts_by_id,
             fonts_by_name,
             family_cache: Default::default(),
+            shape_buffer: Some(harfrust::UnicodeBuffer::new()),
         }
     }
 
@@ -805,6 +830,16 @@ impl FontsImpl {
         self.atlas.options()
     }
 
+    /// Take the recycled shaping buffer (or create a new one if already taken).
+    pub fn take_shape_buffer(&mut self) -> harfrust::UnicodeBuffer {
+        self.shape_buffer.take().unwrap_or_default()
+    }
+
+    /// Return a shaping buffer for reuse.
+    pub fn return_shape_buffer(&mut self, buffer: harfrust::UnicodeBuffer) {
+        self.shape_buffer = Some(buffer);
+    }
+
     /// 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(|| {
@@ -1000,6 +1035,7 @@ impl GalleyCache {
                     0.0
                 },
                 round_output_to_gui: job.round_output_to_gui,
+                keep_trailing_whitespace: job.keep_trailing_whitespace,
             };
 
             // Add overlapping sections:
diff --git a/crates/epaint/src/text/mod.rs b/crates/epaint/src/text/mod.rs
index b40ba45b8..6d2d783c2 100644
--- a/crates/epaint/src/text/mod.rs
+++ b/crates/epaint/src/text/mod.rs
@@ -6,9 +6,6 @@ mod fonts;
 mod text_layout;
 mod text_layout_types;
 
-/// One `\t` character is this many spaces wide.
-pub const TAB_SIZE: usize = 4;
-
 pub use {
     fonts::{
         FontData, FontDefinitions, FontFamily, FontId, FontInsert, FontPriority, FontTweak, Fonts,
@@ -37,6 +34,20 @@ pub struct TextOptions {
     ///
     /// Default is `true`.
     pub font_hinting: bool,
+
+    /// Enable sub-pixel binning for glyphs.
+    ///
+    /// Sub-pixel binning renders each glyph at up to four fractional horizontal offsets,
+    /// giving more even kerning at the cost of more atlas space.
+    ///
+    /// It also lead to text looking more blurry.
+    ///
+    /// This is always disabled for CJK characters (which have too many unique glyphs).
+    ///
+    /// Can be overridden per font with [`FontTweak::subpixel_binning`].
+    ///
+    /// Default: `true`.
+    pub subpixel_binning: bool,
 }
 
 impl Default for TextOptions {
@@ -45,6 +56,7 @@ impl Default for TextOptions {
             max_texture_side: 2048, // Small but portable
             alpha_from_coverage: crate::AlphaFromCoverage::default(),
             font_hinting: true,
+            subpixel_binning: true,
         }
     }
 }
diff --git a/crates/epaint/src/text/text_layout.rs b/crates/epaint/src/text/text_layout.rs
index 0233c1c58..35859b095 100644
--- a/crates/epaint/src/text/text_layout.rs
+++ b/crates/epaint/src/text/text_layout.rs
@@ -1,5 +1,6 @@
 #![expect(clippy::unwrap_used)] // TODO(emilk): remove unwraps
 
+use std::ops::Range;
 use std::sync::Arc;
 
 use emath::{Align, GuiRounding as _, NumExt as _, Pos2, Rect, Vec2, pos2, vec2};
@@ -8,15 +9,34 @@ use crate::{
     Color32, Mesh, Stroke, Vertex,
     stroke::PathStroke,
     text::{
-        font::{StyledMetrics, is_cjk, is_cjk_break_allowed},
+        font::{StyledMetrics, UvRect, is_cjk, is_cjk_break_allowed},
         fonts::FontFaceKey,
     },
 };
 
-use super::{FontsImpl, Galley, Glyph, LayoutJob, LayoutSection, PlacedRow, Row, RowVisuals};
+use super::{
+    FontsImpl, Galley, Glyph, LayoutJob, LayoutSection, PlacedRow, Row, RowVisuals,
+    VariationCoords,
+    font::{Font, FontFace, ShapedGlyph},
+};
 
 // ----------------------------------------------------------------------------
 
+/// Returns `true` if the character is a Unicode combining mark (categories Mn, Mc, Me).
+///
+/// These characters modify the preceding base character and should not be
+/// rendered as standalone replacement glyphs when the shaper can't handle them.
+#[inline]
+fn is_combining_mark(c: char) -> bool {
+    use unicode_general_category::{GeneralCategory, get_general_category};
+    matches!(
+        get_general_category(c),
+        GeneralCategory::NonspacingMark
+            | GeneralCategory::SpacingMark
+            | GeneralCategory::EnclosingMark
+    )
+}
+
 /// Represents GUI scale and convenience methods for rounding to pixels.
 #[derive(Clone, Copy)]
 struct PointScale {
@@ -98,15 +118,21 @@ pub fn layout(fonts: &mut FontsImpl, pixels_per_point: f32, job: Arc<LayoutJob>)
     // For most of this we ignore the y coordinate:
 
     let mut paragraphs = vec![Paragraph::from_section_index(0)];
-    for (section_index, section) in job.sections.iter().enumerate() {
-        layout_section(
-            fonts,
-            pixels_per_point,
-            &job,
-            section_index as u32,
-            section,
-            &mut paragraphs,
-        );
+    {
+        let mut shape_buffer = fonts.take_shape_buffer();
+        for (section_index, section) in job.sections.iter().enumerate() {
+            let mut font = fonts.font(&section.format.font_id.family);
+            shape_buffer = layout_section(
+                &mut font,
+                shape_buffer,
+                pixels_per_point,
+                &job,
+                section_index as u32,
+                section,
+                &mut paragraphs,
+            );
+        }
+        fonts.return_shape_buffer(shape_buffer);
     }
 
     let point_scale = PointScale::new(pixels_per_point);
@@ -136,6 +162,7 @@ pub fn layout(fonts: &mut FontsImpl, pixels_per_point: f32, job: Arc<LayoutJob>)
                 job.halign,
                 job.wrap.max_width,
                 justify_row,
+                job.keep_trailing_whitespace,
             );
         }
     }
@@ -144,21 +171,276 @@ pub fn layout(fonts: &mut FontsImpl, pixels_per_point: f32, job: Arc<LayoutJob>)
     galley_from_rows(point_scale, job, rows, elided, intrinsic_size)
 }
 
+/// Shared context for emitting shaped glyphs into a [`Paragraph`].
+struct ShapingContext {
+    pixels_per_point: f32,
+    font_size: f32,
+    line_height: f32,
+    extra_letter_spacing: f32,
+    section_index: u32,
+    font_metrics: StyledMetrics,
+    is_first_glyph_in_section: bool,
+    prev_cluster: Option<u32>,
+}
+
+impl ShapingContext {
+    fn glyph(
+        &self,
+        chr: char,
+        physical_x: i32,
+        advance_width_px: f32,
+        face_metrics: &StyledMetrics,
+        uv_rect: UvRect,
+    ) -> Glyph {
+        Glyph {
+            chr,
+            pos: pos2(physical_x as f32 / self.pixels_per_point, f32::NAN),
+            advance_width: advance_width_px / self.pixels_per_point,
+            line_height: self.line_height,
+            font_face_height: face_metrics.row_height,
+            font_face_ascent: face_metrics.ascent,
+            font_height: self.font_metrics.row_height,
+            font_ascent: self.font_metrics.ascent,
+            uv_rect,
+            section_index: self.section_index,
+            first_vertex: 0,
+        }
+    }
+}
+
+/// Produced by [`segment_into_runs`] for text shaping.
+#[derive(Debug)]
+struct TextRun {
+    /// Which font face should shape this run.
+    font_key: FontFaceKey,
+
+    /// Byte range within the section text.
+    byte_range: std::ops::Range<usize>,
+}
+
+/// Emit shaped glyphs from a [`harfrust::GlyphBuffer`] into a [`Paragraph`].
+///
+/// When a cluster maps multiple characters to fewer glyphs (e.g. flag emojis,
+/// ligatures), zero-width "continuation" glyphs are emitted for the extra
+/// characters so that `glyphs.len() == char_count` — an invariant that all
+/// cursor and selection code relies on.
+fn layout_shaped_run(
+    font: &mut Font<'_>,
+    run: &TextRun,
+    run_text: &str,
+    glyph_buffer: &harfrust::GlyphBuffer,
+    face_metrics: &StyledMetrics,
+    ctx: &mut ShapingContext,
+    paragraph: &mut Paragraph,
+) {
+    let px_scale = face_metrics.px_scale_factor;
+
+    // Reset cluster tracking — cluster values are byte offsets within run_text,
+    // so they are not comparable across runs.
+    ctx.prev_cluster = None;
+
+    // Track how many glyphs we emit per cluster so we can add zero-width
+    // continuation glyphs when a cluster has more chars than glyphs.
+    let mut cluster_start_byte: usize = 0;
+    let mut cluster_glyph_count: usize = 0;
+
+    for (info, pos) in glyph_buffer
+        .glyph_infos()
+        .iter()
+        .zip(glyph_buffer.glyph_positions())
+    {
+        let glyph_id = skrifa::GlyphId::new(info.glyph_id);
+        let cluster = info.cluster;
+        let mut advance_width_px = pos.x_advance as f32 * px_scale;
+        let x_offset_px = pos.x_offset as f32 * px_scale;
+        let y_offset_px = -(pos.y_offset as f32 * px_scale); // harfrust Y+ up → screen Y+ down
+
+        let chr = run_text
+            .get(cluster as usize..)
+            .and_then(|s| s.chars().next())
+            .unwrap_or('\u{FFFD}'); // Unicode Replacement Character
+
+        // Tab is a layout concept, not a glyph — the shaper doesn't know about tab stops.
+        // Override the advance width using the font's configured tab size.
+        if chr == '\t' {
+            let tweak = font.fonts_by_id.get(&run.font_key).map(|ff| ff.tweak());
+            let tab_size = tweak.map_or(4.0, |t| t.tab_size);
+            let (_, space_info) = font.glyph_info(' ');
+            let space_width_px = space_info.advance_width_unscaled.0 * px_scale;
+            advance_width_px = tab_size * space_width_px;
+        }
+
+        // Thin space (U+2009) and narrow no-break space (U+202F):
+        // override the shaper's advance width with the configured fraction of a space.
+        if chr == '\u{2009}' || chr == '\u{202F}' {
+            let tweak = font.fonts_by_id.get(&run.font_key).map(|ff| ff.tweak());
+            let thin_space_width = tweak.map_or(0.5, |t| t.thin_space_width);
+            let (_, space_info) = font.glyph_info(' ');
+            let space_width_px = space_info.advance_width_unscaled.0 * px_scale;
+            advance_width_px = thin_space_width * space_width_px;
+        }
+
+        // Apply extra_letter_spacing only at cluster boundaries,
+        // never between glyphs within the same cluster (e.g. base + mark).
+        let is_new_cluster = ctx.prev_cluster.is_none_or(|pc| pc != cluster);
+        if is_new_cluster {
+            if ctx.prev_cluster.is_some() {
+                emit_continuation_glyphs(
+                    ctx,
+                    paragraph,
+                    run_text,
+                    cluster_start_byte..cluster as usize,
+                    cluster_glyph_count,
+                    face_metrics,
+                );
+            }
+            if !ctx.is_first_glyph_in_section {
+                paragraph.cursor_x_px += ctx.extra_letter_spacing * ctx.pixels_per_point;
+            }
+            cluster_start_byte = cluster as usize;
+            cluster_glyph_count = 0;
+            ctx.is_first_glyph_in_section = false;
+        }
+        ctx.prev_cluster = Some(cluster);
+
+        let glyph = if glyph_id == skrifa::GlyphId::NOTDEF {
+            // The shaper couldn't map this character. Drop combining marks
+            // (Unicode category M) and duplicate NOTDEF glyphs within the same
+            // cluster — only the first base character gets a replacement glyph.
+            if is_combining_mark(chr) || !is_new_cluster {
+                continue;
+            }
+
+            // Use the fallback font face (not run.font_key which returned NOTDEF).
+            let (fallback_key, glyph_info) = font.glyph_info(chr);
+            let fallback_metrics = font
+                .fonts_by_id
+                .get(&fallback_key)
+                .map(|ff| {
+                    ff.styled_metrics(ctx.pixels_per_point, ctx.font_size, &Default::default())
+                })
+                .unwrap_or_default();
+            let advance_width_px =
+                glyph_info.advance_width_unscaled.0 * fallback_metrics.px_scale_factor;
+            let (glyph_alloc, physical_x) =
+                if let Some(ff) = font.fonts_by_id.get_mut(&fallback_key) {
+                    ff.allocate_glyph(
+                        font.atlas,
+                        &fallback_metrics,
+                        &ShapedGlyph {
+                            glyph_id: glyph_info.id.unwrap_or(skrifa::GlyphId::NOTDEF),
+                            h_pos: paragraph.cursor_x_px,
+                            is_cjk: is_cjk(chr),
+                        },
+                    )
+                } else {
+                    Default::default()
+                };
+
+            paragraph.cursor_x_px += advance_width_px;
+
+            ctx.glyph(
+                chr,
+                physical_x,
+                advance_width_px,
+                &fallback_metrics,
+                glyph_alloc.uv_rect,
+            )
+        } else {
+            let (mut glyph_alloc, physical_x) =
+                if let Some(ff) = font.fonts_by_id.get_mut(&run.font_key) {
+                    ff.allocate_glyph(
+                        font.atlas,
+                        face_metrics,
+                        &ShapedGlyph {
+                            glyph_id,
+                            h_pos: paragraph.cursor_x_px + x_offset_px,
+                            is_cjk: is_cjk(chr),
+                        },
+                    )
+                } else {
+                    Default::default()
+                };
+
+            // Apply shaper y_offset — this varies per glyph instance so it
+            // is not part of the cached ShapedGlyph / GlyphAllocation.
+            glyph_alloc.uv_rect.offset.y += y_offset_px / ctx.pixels_per_point;
+
+            paragraph.cursor_x_px += advance_width_px;
+
+            ctx.glyph(
+                chr,
+                physical_x,
+                advance_width_px,
+                face_metrics,
+                glyph_alloc.uv_rect,
+            )
+        };
+        paragraph.glyphs.push(glyph);
+        cluster_glyph_count += 1;
+    }
+
+    // Emit continuation glyphs for the last cluster in the run.
+    if ctx.prev_cluster.is_some() {
+        emit_continuation_glyphs(
+            ctx,
+            paragraph,
+            run_text,
+            cluster_start_byte..run_text.len(),
+            cluster_glyph_count,
+            face_metrics,
+        );
+    }
+}
+
+/// Emit zero-width continuation glyphs when a cluster has more characters than
+/// shaped glyphs.
+///
+/// This preserves the invariant `glyphs.len() == char_count` that all cursor
+/// and text-selection code depends on. Continuation glyphs have
+/// [`UvRect::default()`] so [`tessellate_glyphs`] skips them entirely.
+fn emit_continuation_glyphs(
+    ctx: &ShapingContext,
+    paragraph: &mut Paragraph,
+    run_text: &str,
+    cluster_bytes: Range<usize>,
+    cluster_glyph_count: usize,
+    face_metrics: &StyledMetrics,
+) {
+    let Some(cluster_text) = run_text.get(cluster_bytes) else {
+        return;
+    };
+    let char_count = cluster_text.chars().count();
+    if char_count <= cluster_glyph_count {
+        return;
+    }
+
+    let physical_x = paragraph.cursor_x_px.round() as i32;
+
+    for chr in cluster_text.chars().skip(cluster_glyph_count) {
+        paragraph
+            .glyphs
+            .push(ctx.glyph(chr, physical_x, 0.0, face_metrics, UvRect::default()));
+    }
+}
+
 // Ignores the Y coordinate.
+#[must_use]
 fn layout_section(
-    fonts: &mut FontsImpl,
+    font: &mut Font<'_>,
+    mut shape_buffer: harfrust::UnicodeBuffer,
     pixels_per_point: f32,
     job: &LayoutJob,
     section_index: u32,
     section: &LayoutSection,
     out_paragraphs: &mut Vec<Paragraph>,
-) {
+) -> harfrust::UnicodeBuffer {
     let LayoutSection {
         leading_space,
         byte_range,
         format,
     } = section;
-    let mut font = fonts.font(&format.font_id.family);
+
     let font_size = format.font_id.size;
     let font_metrics = font.styled_metrics(pixels_per_point, font_size, &format.coords);
     let line_height = section
@@ -169,76 +451,100 @@ fn layout_section(
 
     let mut paragraph = out_paragraphs.last_mut().unwrap();
     if paragraph.glyphs.is_empty() {
-        paragraph.empty_paragraph_height = line_height; // TODO(emilk): replace this hack with actually including `\n` in the glyphs?
+        paragraph.empty_paragraph_height = line_height;
     }
-
     paragraph.cursor_x_px += leading_space * pixels_per_point;
 
-    let mut last_glyph_id = None;
+    let section_text = &job.text[byte_range.clone()];
+    let mut ctx = ShapingContext {
+        pixels_per_point,
+        font_size,
+        line_height,
+        extra_letter_spacing,
+        section_index,
+        font_metrics,
+        is_first_glyph_in_section: paragraph.glyphs.is_empty(),
+        prev_cluster: None,
+    };
+    let mut runs = Vec::new();
 
-    // Optimization: only recompute `ScaledMetrics` when the concrete `FontImpl` changes.
-    let mut current_font = FontFaceKey::INVALID;
-    let mut current_font_face_metrics = StyledMetrics::default();
-
-    for chr in job.text[byte_range.clone()].chars() {
-        if job.break_on_newline && chr == '\n' {
+    // Process each paragraph segment (split on newlines — the shaper can't handle them).
+    for (seg_idx, segment) in SplitOrWhole::new(section_text, job.break_on_newline).enumerate() {
+        if 0 < seg_idx {
             out_paragraphs.push(Paragraph::from_section_index(section_index));
             paragraph = out_paragraphs.last_mut().unwrap();
-            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_face = font.fonts_by_id.get_mut(&font_id);
-            if current_font != font_id {
-                current_font = font_id;
-                current_font_face_metrics = font_face
-                    .as_ref()
-                    .map(|font_face| {
-                        font_face.styled_metrics(pixels_per_point, font_size, &format.coords)
-                    })
-                    .unwrap_or_default();
-            }
+            paragraph.empty_paragraph_height = line_height;
+            ctx.is_first_glyph_in_section = true;
+        }
 
-            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_face.pair_kerning_pixels(
-                    &current_font_face_metrics,
-                    last_glyph_id,
-                    glyph_id,
-                );
+        if segment.is_empty() {
+            continue;
+        }
 
-                // Only apply extra_letter_spacing to glyphs after the first one:
-                paragraph.cursor_x_px += extra_letter_spacing * pixels_per_point;
-            }
+        segment_into_runs(font, segment, &mut runs);
 
-            let (glyph_alloc, physical_x) = if let Some(font_face) = font_face.as_mut() {
-                font_face.allocate_glyph(
-                    font.atlas,
-                    &current_font_face_metrics,
-                    glyph_info,
-                    chr,
-                    paragraph.cursor_x_px,
-                )
-            } else {
-                Default::default()
+        let num_runs = runs.len();
+        for (run_idx, run) in runs.iter().enumerate() {
+            let run_text = &segment[run.byte_range.clone()];
+            let Some(font_face) = font.fonts_by_id.get(&run.font_key) else {
+                continue;
             };
 
-            paragraph.glyphs.push(Glyph {
-                chr,
-                pos: pos2(physical_x as f32 / pixels_per_point, f32::NAN),
-                advance_width: glyph_alloc.advance_width_px / pixels_per_point,
-                line_height,
-                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,
-                section_index,
-                first_vertex: 0, // filled in later
-            });
+            let face_metrics =
+                font_face.styled_metrics(pixels_per_point, font_size, &format.coords);
 
-            paragraph.cursor_x_px += glyph_alloc.advance_width_px;
-            last_glyph_id = Some(glyph_alloc.id);
+            // Set buffer flags for paragraph boundary context.
+            let mut flags = harfrust::BufferFlags::empty();
+            if run_idx == 0 {
+                flags |= harfrust::BufferFlags::BEGINNING_OF_TEXT;
+            }
+            if run_idx + 1 == num_runs {
+                flags |= harfrust::BufferFlags::END_OF_TEXT;
+            }
+
+            let glyph_buffer = shape_text(font_face, run_text, &format.coords, shape_buffer, flags);
+
+            layout_shaped_run(
+                font,
+                run,
+                run_text,
+                &glyph_buffer,
+                &face_metrics,
+                &mut ctx,
+                paragraph,
+            );
+
+            shape_buffer = glyph_buffer.clear();
+        }
+    }
+
+    shape_buffer
+}
+
+/// Iterator that either splits on `'\n'` or yields the whole string once.
+/// Avoids `Box<dyn Iterator>` and `Vec<&str>` allocation.
+enum SplitOrWhole<'a> {
+    Split(std::str::Split<'a, char>),
+    Whole(std::iter::Once<&'a str>),
+}
+
+impl<'a> SplitOrWhole<'a> {
+    fn new(text: &'a str, split: bool) -> Self {
+        if split {
+            Self::Split(text.split('\n'))
+        } else {
+            Self::Whole(std::iter::once(text))
+        }
+    }
+}
+
+impl<'a> Iterator for SplitOrWhole<'a> {
+    type Item = &'a str;
+
+    fn next(&mut self) -> Option<&'a str> {
+        match self {
+            Self::Split(iter) => iter.next(),
+            Self::Whole(iter) => iter.next(),
         }
     }
 }
@@ -420,18 +726,19 @@ fn line_break(
         if job.wrap.max_rows <= out_rows.len() {
             *elided = true; // can't fit another row
         } else {
+            let paragraph_min_x = paragraph.glyphs[row_start_idx].pos.x - row_start_x;
+            let paragraph_max_x = paragraph.glyphs.last().unwrap().max_x() - row_start_x;
+
             let glyphs: Vec<Glyph> = paragraph.glyphs[row_start_idx..]
                 .iter()
                 .copied()
                 .map(|mut glyph| {
-                    glyph.pos.x -= row_start_x;
+                    glyph.pos.x -= row_start_x + paragraph_min_x;
                     glyph
                 })
                 .collect();
 
             let section_index_at_start = glyphs[0].section_index;
-            let paragraph_min_x = glyphs[0].pos.x;
-            let paragraph_max_x = glyphs.last().unwrap().max_x();
 
             out_rows.push(PlacedRow {
                 pos: pos2(paragraph_min_x, 0.0),
@@ -479,33 +786,14 @@ fn replace_last_glyph_with_overflow_character(
             .unwrap_or_default();
 
         let overflow_glyph_x = if let Some(prev_glyph) = row.glyphs.last() {
-            // Kern the overflow character properly
-            let pair_kerning = font_face
-                .as_mut()
-                .map(|font_face| {
-                    if let (Some(prev_glyph_id), Some(overflow_glyph_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_face.pair_kerning(&font_face_metrics, prev_glyph_id, overflow_glyph_id)
-                    } else {
-                        0.0
-                    }
-                })
-                .unwrap_or_default();
-
-            prev_glyph.max_x() + extra_letter_spacing + pair_kerning
+            prev_glyph.max_x() + extra_letter_spacing
         } else {
             0.0 // TODO(emilk): heed paragraph leading_space 😬
         };
 
-        let replacement_glyph_width = font_face
-            .as_mut()
-            .and_then(|f| f.glyph_info(overflow_character))
-            .map(|i| {
-                i.advance_width_unscaled.0 * font_face_metrics.px_scale_factor / pixels_per_point
-            })
-            .unwrap_or_default();
+        let advance_width_px =
+            glyph_info.advance_width_unscaled.0 * font_face_metrics.px_scale_factor;
+        let replacement_glyph_width = advance_width_px / pixels_per_point;
 
         // Check if we're within width budget:
         if overflow_glyph_x + replacement_glyph_width <= job.effective_wrap_width()
@@ -519,9 +807,11 @@ fn replace_last_glyph_with_overflow_character(
                     f.allocate_glyph(
                         font.atlas,
                         &font_face_metrics,
-                        glyph_info,
-                        overflow_character,
-                        overflow_glyph_x * pixels_per_point,
+                        &ShapedGlyph {
+                            glyph_id: glyph_info.id.unwrap_or(skrifa::GlyphId::NOTDEF),
+                            h_pos: overflow_glyph_x * pixels_per_point,
+                            is_cjk: is_cjk(overflow_character),
+                        },
                     )
                 })
                 .unwrap_or_default();
@@ -536,7 +826,7 @@ fn replace_last_glyph_with_overflow_character(
             row.glyphs.push(Glyph {
                 chr: overflow_character,
                 pos: pos2(physical_x as f32 / pixels_per_point, f32::NAN),
-                advance_width: replacement_glyph_alloc.advance_width_px / pixels_per_point,
+                advance_width: advance_width_px / pixels_per_point,
                 line_height,
                 font_face_height: font_face_metrics.row_height,
                 font_face_ascent: font_face_metrics.ascent,
@@ -567,6 +857,7 @@ fn halign_and_justify_row(
     halign: Align,
     wrap_width: f32,
     justify: bool,
+    keep_trailing_whitespace: bool,
 ) {
     #![expect(clippy::useless_let_if_seq)] // False positive
 
@@ -585,6 +876,8 @@ fn halign_and_justify_row(
     let glyph_range = if num_leading_spaces == row.glyphs.len() {
         // There is only whitespace
         (0, row.glyphs.len())
+    } else if keep_trailing_whitespace {
+        (num_leading_spaces, row.glyphs.len())
     } else {
         let num_trailing_spaces = row
             .glyphs
@@ -1060,10 +1353,95 @@ impl RowBreakCandidates {
 
 // ----------------------------------------------------------------------------
 
+/// Segment text into runs where each run uses a single font face.
+///
+/// Grapheme clusters are never split across runs: if a combining mark
+/// falls back to a different font than its base character, it stays
+/// with the base character's font (the shaper will handle it).
+///
+/// NOTE: Segmentation is by font face, not by Unicode script. A run may
+/// mix scripts (e.g. Latin + Cyrillic) when they share the same font.
+/// This is acceptable for scripts with similar shaping rules, but would
+/// need script-aware splitting once RTL/bidi support is added.
+///
+/// Results are appended to `out` (which is cleared first) to allow
+/// the caller to reuse the allocation across calls.
+fn segment_into_runs(font: &mut Font<'_>, text: &str, out: &mut Vec<TextRun>) {
+    use unicode_segmentation::UnicodeSegmentation as _;
+
+    out.clear();
+
+    for (byte_offset, grapheme_str) in text.grapheme_indices(true) {
+        let byte_end = byte_offset + grapheme_str.len();
+
+        let base_char = grapheme_str.chars().next().unwrap_or(' ');
+        let (font_key, _) = font.glyph_info(base_char);
+
+        if let Some(last_run) = out.last_mut()
+            && last_run.font_key == font_key
+        {
+            last_run.byte_range.end = byte_end;
+            continue;
+        }
+        out.push(TextRun {
+            font_key,
+            byte_range: byte_offset..byte_end,
+        });
+    }
+}
+
+/// Shape a text run and return the raw [`harfrust::GlyphBuffer`].
+///
+/// The caller should iterate `glyph_infos()` / `glyph_positions()` (both
+/// `Copy` slices) and convert font units to pixels using `metrics.px_scale_factor`.
+/// After iteration, recycle the buffer via `glyph_buffer.clear()`.
+fn shape_text(
+    font_face: &FontFace,
+    text: &str,
+    coords: &VariationCoords,
+    mut buffer: harfrust::UnicodeBuffer,
+    flags: harfrust::BufferFlags,
+) -> harfrust::GlyphBuffer {
+    let font_ref = font_face.skrifa_font_ref();
+    let tweak = font_face.tweak();
+
+    // Build shaper with variable font instance if variation coordinates are set.
+    let variations: Vec<harfrust::Variation> = tweak
+        .coords
+        .as_ref()
+        .iter()
+        .chain(coords.as_ref().iter())
+        .map(|&(tag, value)| harfrust::Variation { tag, value })
+        .collect();
+
+    let instance = if variations.is_empty() {
+        None
+    } else {
+        Some(harfrust::ShaperInstance::from_variations(
+            font_ref, variations,
+        ))
+    };
+
+    let shaper = font_face
+        .shaper_data()
+        .shaper(font_ref)
+        .instance(instance.as_ref())
+        .build();
+
+    buffer.set_flags(flags);
+    buffer.push_str(text);
+    buffer.guess_segment_properties();
+
+    shaper.shape(buffer, &[])
+}
+
+// ----------------------------------------------------------------------------
+
 #[cfg(test)]
 mod tests {
 
     use super::{super::*, *};
+    use crate::text::cursor::CCursor;
 
     #[test]
     fn test_zero_max_width() {
@@ -1277,4 +1655,284 @@ mod tests {
             "Unexpected intrinsic size"
         );
     }
+
+    #[test]
+    fn test_combining_diacritics() {
+        // ɔ̃ = U+0254 (LATIN SMALL LETTER OPEN O) + U+0303 (COMBINING TILDE)
+        // With text shaping, the combining tilde should NOT produce a separate
+        // advance — it should be positioned above ɔ via GPOS anchors.
+        // Note: the default fonts don't contain U+0254, so the replacement glyph
+        // is used. The key test is that the combining mark does NOT add extra width.
+        let pixels_per_point = 1.0;
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
+
+        let job_combined = LayoutJob::simple(
+            "ɔ\u{0303}".to_owned(),
+            FontId::proportional(14.0),
+            Color32::WHITE,
+            f32::INFINITY,
+        );
+        let galley_combined = layout(&mut fonts, pixels_per_point, job_combined.into());
+
+        let job_base = LayoutJob::simple(
+            "ɔ".to_owned(),
+            FontId::proportional(14.0),
+            Color32::WHITE,
+            f32::INFINITY,
+        );
+        let galley_base = layout(&mut fonts, pixels_per_point, job_base.into());
+
+        let width_combined = galley_combined.size().x;
+        let width_base = galley_base.size().x;
+
+        assert!(
+            (width_combined - width_base).abs() < 2.0,
+            "Combining diacritic should not add significant width. \
+             Base width: {width_base}, Combined width: {width_combined}"
+        );
+
+        let glyphs = &galley_combined.rows[0].row.glyphs;
+        assert!(!glyphs.is_empty(), "Expected at least 1 glyph for ɔ̃");
+    }
+
+    #[test]
+    fn test_shaping_basic_latin() {
+        // Basic test: shaped Latin text should produce the same number of glyphs as characters.
+        let pixels_per_point = 1.0;
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
+
+        let job = LayoutJob::simple(
+            "Hello".to_owned(),
+            FontId::proportional(14.0),
+            Color32::WHITE,
+            f32::INFINITY,
+        );
+        let galley = layout(&mut fonts, pixels_per_point, job.into());
+
+        assert_eq!(galley.rows.len(), 1);
+        assert_eq!(galley.rows[0].row.glyphs.len(), 5);
+        assert!(galley.size().x > 0.0);
+    }
+
+    #[test]
+    fn test_shaping_empty_string() {
+        let pixels_per_point = 1.0;
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
+
+        let job = LayoutJob::simple(
+            String::new(),
+            FontId::proportional(14.0),
+            Color32::WHITE,
+            f32::INFINITY,
+        );
+        let galley = layout(&mut fonts, pixels_per_point, job.into());
+
+        assert_eq!(galley.rows.len(), 1);
+        assert_eq!(galley.rows[0].row.glyphs.len(), 0);
+    }
+
+    #[test]
+    fn test_shaping_multiple_newlines() {
+        let pixels_per_point = 1.0;
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
+
+        let job = LayoutJob::simple(
+            "A\n\nB".to_owned(),
+            FontId::proportional(14.0),
+            Color32::WHITE,
+            f32::INFINITY,
+        );
+        let galley = layout(&mut fonts, pixels_per_point, job.into());
+
+        assert_eq!(galley.rows.len(), 3, "Expected 3 rows for 'A\\n\\nB'");
+        assert_eq!(galley.rows[0].row.glyphs.len(), 1); // "A"
+        assert_eq!(galley.rows[1].row.glyphs.len(), 0); // empty line
+        assert_eq!(galley.rows[2].row.glyphs.len(), 1); // "B"
+    }
+
+    #[test]
+    fn test_shaping_mixed_font_fallback() {
+        // Text with both Latin and emoji should work without panicking,
+        // even though they use different font faces.
+        let pixels_per_point = 1.0;
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
+
+        let job = LayoutJob::simple(
+            "Hi 🎉 bye".to_owned(),
+            FontId::proportional(14.0),
+            Color32::WHITE,
+            f32::INFINITY,
+        );
+        let galley = layout(&mut fonts, pixels_per_point, job.into());
+
+        assert_eq!(galley.rows.len(), 1);
+        // "Hi " (3) + "🎉" (1) + " bye" (4) = at least 8 glyphs
+        assert!(
+            galley.rows[0].row.glyphs.len() >= 8,
+            "Expected >= 8 glyphs, got {}",
+            galley.rows[0].row.glyphs.len()
+        );
+    }
+
+    #[test]
+    fn test_gpos_kerning() {
+        // GPOS kerning: pairs like "AV", "VA", "AT" should be tighter than
+        // the sum of individual character widths. Without text shaping, egui
+        // only uses the legacy `kern` table, so these pairs had diff ≈ 0.
+        // With harfrust, GPOS kerning applies proper negative adjustments.
+        let pixels_per_point = 1.0;
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
+        let font_id = FontId::proportional(14.0);
+
+        for pair in ["AV", "VA", "AT"] {
+            let (pair_w, _, _) = measure_text(&mut fonts, pair, &font_id, pixels_per_point);
+            let chars: Vec<char> = pair.chars().collect();
+            let (w1, _, _) = measure_text(
+                &mut fonts,
+                &chars[0].to_string(),
+                &font_id,
+                pixels_per_point,
+            );
+            let (w2, _, _) = measure_text(
+                &mut fonts,
+                &chars[1].to_string(),
+                &font_id,
+                pixels_per_point,
+            );
+            let sum = w1 + w2;
+            let kern_adjustment = sum - pair_w;
+
+            assert!(
+                kern_adjustment > 0.5,
+                "GPOS kerning for '{pair}': expected pair to be noticeably tighter \
+                 than sum of individuals. pair_width={pair_w:.2}, sum={sum:.2}, \
+                 kern_adjustment={kern_adjustment:.2} (should be > 0.5)",
+            );
+        }
+    }
+
+    /// Regression test for <https://github.com/emilk/egui/issues/8087>.
+    ///
+    /// Multi-codepoint grapheme clusters (flag emojis, combining marks) must
+    /// produce exactly as many glyphs as characters so that cursor positioning
+    /// and text selection remain correct.
+    #[test]
+    fn test_grapheme_cluster_glyph_count() {
+        let pixels_per_point = 1.0;
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
+        let font_id = FontId::default();
+
+        // Each test case: (input text, expected char count)
+        let cases: &[(&str, usize)] = &[
+            // Flag emoji: two Regional Indicator codepoints → one visual glyph
+            ("\u{1F1EF}\u{1F1F5}", 2), // 🇯🇵
+            // Flag surrounded by ASCII
+            ("A\u{1F1EB}\u{1F1F7}B", 4), // A🇫🇷B
+            // Base char + combining acute accent
+            ("e\u{0301}", 2), // é as decomposed
+            // Multiple combining marks
+            ("o\u{0302}\u{0323}", 3), // ộ
+            // Plain ASCII (sanity check)
+            ("Hello", 5),
+        ];
+
+        for &(text, expected_chars) in cases {
+            let job = LayoutJob::simple(
+                text.to_owned(),
+                font_id.clone(),
+                Color32::WHITE,
+                f32::INFINITY,
+            );
+            let galley = layout(&mut fonts, pixels_per_point, job.into());
+
+            let total_glyphs: usize = galley.rows.iter().map(|r| r.row.glyphs.len()).sum();
+
+            assert_eq!(
+                total_glyphs,
+                expected_chars,
+                "Glyph count mismatch for {text:?}: \
+                 expected {expected_chars} glyphs (one per char), got {total_glyphs}. \
+                 Glyphs: {:?}",
+                galley.rows[0]
+                    .row
+                    .glyphs
+                    .iter()
+                    .map(|g| (g.chr, g.advance_width))
+                    .collect::<Vec<_>>(),
+            );
+
+            // Verify that Row::text() reconstructs the input text.
+            let row_text: String = galley.rows.iter().map(|r| r.text()).collect();
+            assert_eq!(row_text, text, "Row::text() mismatch for {text:?}",);
+
+            // Verify cursor round-trip: end cursor index == char count.
+            assert_eq!(
+                galley.end().index,
+                expected_chars,
+                "Galley::end().index mismatch for {text:?}",
+            );
+        }
+    }
+
+    /// Verify that cursor positioning round-trips correctly for text
+    /// containing multi-codepoint grapheme clusters (regression test for #8087).
+    #[test]
+    fn test_grapheme_cluster_cursor_roundtrip() {
+        let pixels_per_point = 1.0;
+        let mut fonts = FontsImpl::new(TextOptions::default(), FontDefinitions::default());
+        let font_id = FontId::default();
+
+        // "A" + flag emoji (2 codepoints) + "B" = 4 chars
+        let text = "A\u{1F1EF}\u{1F1F5}B";
+        let job = LayoutJob::simple(
+            text.to_owned(),
+            font_id.clone(),
+            Color32::WHITE,
+            f32::INFINITY,
+        );
+        let galley = layout(&mut fonts, pixels_per_point, job.into());
+
+        // Walking through every cursor index should produce valid positions.
+        for i in 0..=galley.end().index {
+            let cursor = CCursor {
+                index: i,
+                prefer_next_row: false,
+            };
+            let rect = galley.pos_from_cursor(cursor);
+            assert!(
+                rect.is_finite(),
+                "pos_from_cursor returned non-finite rect for index {i}",
+            );
+
+            // Round-trip: position → cursor → position should be stable.
+            let cursor2 = galley.cursor_from_pos(Vec2::new(rect.center().x, rect.center().y));
+            let rect2 = galley.pos_from_cursor(cursor2);
+            assert!(
+                (rect.min.x - rect2.min.x).abs() < 1.0,
+                "Cursor round-trip unstable at index {i}: \
+                 first={}, second={}, cursor2.index={}",
+                rect.min.x,
+                rect2.min.x,
+                cursor2.index,
+            );
+        }
+    }
+
+    fn measure_text(
+        fonts: &mut FontsImpl,
+        text: &str,
+        font_id: &FontId,
+        pixels_per_point: f32,
+    ) -> (f32, usize, Vec<(char, f32)>) {
+        let job = LayoutJob::simple(
+            text.to_owned(),
+            font_id.clone(),
+            Color32::WHITE,
+            f32::INFINITY,
+        );
+        let galley = layout(fonts, pixels_per_point, job.into());
+        let glyphs = &galley.rows[0].row.glyphs;
+        let details: Vec<_> = glyphs.iter().map(|g| (g.chr, g.advance_width)).collect();
+        (galley.size().x, glyphs.len(), details)
+    }
 }
diff --git a/crates/epaint/src/text/text_layout_types.rs b/crates/epaint/src/text/text_layout_types.rs
index d887fb13a..bce2fa48f 100644
--- a/crates/epaint/src/text/text_layout_types.rs
+++ b/crates/epaint/src/text/text_layout_types.rs
@@ -79,6 +79,14 @@ pub struct LayoutJob {
 
     /// Round output sizes using [`emath::GuiRounding`], to avoid rounding errors in layout code.
     pub round_output_to_gui: bool,
+
+    /// If `false` (default), trailing whitespace is ignored when computing
+    /// horizontal alignment ([`Self::halign`]).
+    /// This is desirable for labels so that e.g. "Hello " centers the same as "Hello".
+    ///
+    /// If `true`, trailing whitespace is included in the row width used for alignment.
+    /// This is desirable for text editors where the user expects to see their spaces.
+    pub keep_trailing_whitespace: bool,
 }
 
 impl Default for LayoutJob {
@@ -93,6 +101,7 @@ impl Default for LayoutJob {
             halign: Align::LEFT,
             justify: false,
             round_output_to_gui: true,
+            keep_trailing_whitespace: false,
         }
     }
 }
@@ -216,6 +225,7 @@ impl std::hash::Hash for LayoutJob {
             halign,
             justify,
             round_output_to_gui,
+            keep_trailing_whitespace,
         } = self;
 
         text.hash(state);
@@ -226,6 +236,7 @@ impl std::hash::Hash for LayoutJob {
         halign.hash(state);
         justify.hash(state);
         round_output_to_gui.hash(state);
+        keep_trailing_whitespace.hash(state);
     }
 }
 
@@ -696,9 +707,12 @@ impl PlacedRow {
 
     /// Same as [`Self::rect`] but excluding the `LayoutSection::leading_space`.
     pub fn rect_without_leading_space(&self) -> Rect {
-        let x = self.glyphs.first().map_or(self.pos.x, |g| g.pos.x);
-        let size_x = self.size.x - x;
-        Rect::from_min_size(Pos2::new(x, self.pos.y), Vec2::new(size_x, self.size.y))
+        let x = self.pos.x + self.glyphs.first().map_or(0.0, |g| g.pos.x);
+        let right = self.pos.x + self.size.x;
+        Rect::from_min_max(
+            Pos2::new(x, self.pos.y),
+            Pos2::new(right, self.pos.y + self.size.y),
+        )
     }
 }
 
@@ -1047,7 +1061,7 @@ impl Galley {
             return self.end_pos();
         };
 
-        let x = row.x_offset(layout_cursor.column);
+        let x = row.x_offset(layout_cursor.column) + row.pos.x;
         Rect::from_min_max(pos2(x, row.min_y()), pos2(x, row.max_y()))
     }
 
@@ -1244,7 +1258,8 @@ impl Galley {
 
             let new_layout_cursor = {
                 // keep same X coord
-                let column = self.rows[new_row].char_at(h_pos);
+                // char_at is Row-relative, so subtract the row's position
+                let column = self.rows[new_row].char_at(h_pos - self.rows[new_row].pos.x);
                 LayoutCursor {
                     row: new_row,
                     column,
@@ -1266,7 +1281,8 @@ impl Galley {
 
             let new_layout_cursor = {
                 // keep same X coord
-                let column = self.rows[new_row].char_at(h_pos);
+                // char_at is Row-relative, so subtract the row's position
+                let column = self.rows[new_row].char_at(h_pos - self.rows[new_row].pos.x);
                 LayoutCursor {
                     row: new_row,
                     column,
diff --git a/crates/epaint_default_fonts/CHANGELOG.md b/crates/epaint_default_fonts/CHANGELOG.md
index 58fd310f4..ee3a39e22 100644
--- a/crates/epaint_default_fonts/CHANGELOG.md
+++ b/crates/epaint_default_fonts/CHANGELOG.md
@@ -5,6 +5,18 @@ 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.34.2 - 2026-05-04
+Nothing new
+
+
+## 0.34.1 - 2026-03-27
+Nothing new
+
+
+## 0.34.0 - 2026-03-26
+* Fix emoji icon font [#7940](https://github.com/emilk/egui/pull/7940) by [@Jhynjhiruu](https://github.com/Jhynjhiruu)
+
+
 ## 0.33.3 - 2025-12-11
 Nothing new
 
diff --git a/crates/epaint_default_fonts/Cargo.toml b/crates/epaint_default_fonts/Cargo.toml
index 588719871..43f6fedfe 100644
--- a/crates/epaint_default_fonts/Cargo.toml
+++ b/crates/epaint_default_fonts/Cargo.toml
@@ -12,8 +12,8 @@ repository = "https://github.com/emilk/egui/tree/main/crates/epaint_default_font
 categories = ["graphics", "gui"]
 keywords = ["graphics", "gui", "egui"]
 include = [
-  "../LICENSE-APACHE",
-  "../LICENSE-MIT",
+  "../../LICENSE-APACHE",
+  "../../LICENSE-MIT",
   "**/*.rs",
   "Cargo.toml",
   "fonts/*.ttf",
diff --git a/deny.toml b/deny.toml
index 01377b90b..fb6d88e66 100644
--- a/deny.toml
+++ b/deny.toml
@@ -52,12 +52,12 @@ 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 = "jni-sys" }, # 0.3.1 depends on 0.4
   { name = "kurbo" }, # Old version because of resvg
   { name = "redox_syscall" }, # old version via winit
   { name = "rustc-hash" }, # Small enough
   { name = "thiserror" }, # ecosystem is in the process of migrating from 1.x to 2.x
   { name = "thiserror-impl" }, # same as above
-  { name = "toml_datetime" }, # required while eco-system updates to toml 1.0
 ]
 skip-tree = [
   { name = "hashbrown" }, # wgpu's naga depends on 0.16, accesskit depends on 0.15
@@ -79,6 +79,7 @@ allow = [
   "BSD-3-Clause", # https://tldrlegal.com/license/bsd-3-clause-license-(revised)
   "BSL-1.0", # https://tldrlegal.com/license/boost-software-license-1.0-explained
   "CC0-1.0", # https://creativecommons.org/publicdomain/zero/1.0/
+  "CDLA-Permissive-2.0", # https://spdx.org/licenses/CDLA-Permissive-2.0.html
   "ISC", # https://www.tldrlegal.com/license/isc-license
   "MIT-0", # https://choosealicense.com/licenses/mit-0/
   "MIT", # https://tldrlegal.com/license/mit-license
diff --git a/examples/custom_3d_glow/src/main.rs b/examples/custom_3d_glow/src/main.rs
index 6b804ed1c..e0a3e3dd2 100644
--- a/examples/custom_3d_glow/src/main.rs
+++ b/examples/custom_3d_glow/src/main.rs
@@ -106,7 +106,7 @@ impl RotatingTriangle {
             let program = gl.create_program().expect("Cannot create program");
 
             let (vertex_shader_source, fragment_shader_source) = (
-                r#"
+                "
                     const vec2 verts[3] = vec2[3](
                         vec2(0.0, 1.0),
                         vec2(-1.0, -1.0),
@@ -124,15 +124,15 @@ impl RotatingTriangle {
                         gl_Position = vec4(verts[gl_VertexID], 0.0, 1.0);
                         gl_Position.x *= cos(u_angle);
                     }
-                "#,
-                r#"
+                ",
+                "
                     precision mediump float;
                     in vec4 v_color;
                     out vec4 out_color;
                     void main() {
                         out_color = v_color;
                     }
-                "#,
+                ",
             );
 
             let shader_sources = [
diff --git a/examples/custom_style/Cargo.toml b/examples/custom_style/Cargo.toml
index 83174df40..3352aa474 100644
--- a/examples/custom_style/Cargo.toml
+++ b/examples/custom_style/Cargo.toml
@@ -10,8 +10,8 @@ publish = false
 workspace = true
 
 
-[package.metadata.cargo-machete]
-ignored = ["image"] # We need the .png feature
+[package.metadata.cargo-shear]
+ignored = ["image"] # We need the png feature
 
 
 [dependencies]
diff --git a/examples/file_dialog/src/main.rs b/examples/file_dialog/src/main.rs
index 63e7bb0a8..a2cef84e7 100644
--- a/examples/file_dialog/src/main.rs
+++ b/examples/file_dialog/src/main.rs
@@ -50,10 +50,10 @@ impl eframe::App for MyApp {
                     for file in &self.dropped_files {
                         let mut info = if let Some(path) = &file.path {
                             path.display().to_string()
-                        } else if !file.name.is_empty() {
-                            file.name.clone()
-                        } else {
+                        } else if file.name.is_empty() {
                             "???".to_owned()
+                        } else {
+                            file.name.clone()
                         };
 
                         let mut additional_info = vec![];
@@ -64,7 +64,8 @@ impl eframe::App for MyApp {
                             additional_info.push(format!("{} bytes", bytes.len()));
                         }
                         if !additional_info.is_empty() {
-                            info += &format!(" ({})", additional_info.join(", "));
+                            use std::fmt::Write as _;
+                            write!(info, " ({})", additional_info.join(", ")).ok();
                         }
 
                         ui.label(info);
@@ -95,10 +96,10 @@ fn preview_files_being_dropped(ctx: &egui::Context) {
             for file in &i.raw.hovered_files {
                 if let Some(path) = &file.path {
                     write!(text, "\n{}", path.display()).ok();
-                } else if !file.mime.is_empty() {
-                    write!(text, "\n{}", file.mime).ok();
-                } else {
+                } else if file.mime.is_empty() {
                     text += "\n???";
+                } else {
+                    write!(text, "\n{}", file.mime).ok();
                 }
             }
             text
diff --git a/examples/hello_android/Cargo.toml b/examples/hello_android/Cargo.toml
index 7c8444f99..ae484783c 100644
--- a/examples/hello_android/Cargo.toml
+++ b/examples/hello_android/Cargo.toml
@@ -22,7 +22,7 @@ eframe = { workspace = true, default-features = false, features = [
   "glow",
   "android-native-activity",
 ] }
-egui_demo_lib = { workspace = true, features = ["chrono"] }
+egui_demo_lib = { workspace = true, features = ["jiff"] }
 
 # For image support:
 egui_extras = { workspace = true, features = ["default", "image"] }
diff --git a/examples/hello_android/README.md b/examples/hello_android/README.md
index 6ad26348a..5c754b54f 100644
--- a/examples/hello_android/README.md
+++ b/examples/hello_android/README.md
@@ -1,24 +1,31 @@
-Hello world example for Android.
+# Hello world example for Android.
 
-Use `cargo-apk` to build and run. Requires a patch to workaround [an upstream bug](https://github.com/rust-mobile/cargo-subcommand/issues/29).
+## Desktop pre-requisites
 
-One-time setup:
+Android application require you to have toolchains and Android SDK installed:
 
-```sh
-cargo install \
-    --git https://github.com/parasyte/cargo-apk.git \
-    --rev 282639508eeed7d73f2e1eaeea042da2716436d5 \
-    cargo-apk
-```
+1. `rustup target add armv7-linux-androideabi aarch64-linux-android` - install targets for android
+2. Set environment variables (these variables are required each time for `cargo apk`):
+  ```sh
+  export ANDROID_HOME="$HOME/tools/android"
+  export ANDROID_NDK_ROOT="${ANDROID_HOME}/ndk/29.0.14206865"
+  export PATH="$PATH:${ANDROID_NDK_ROOT}:${ANDROID_HOME}/build-tools/${BUILDTOOLS_VERSION}:${ANDROID_HOME}/cmdline-tools/bin"
+  ```
+3. Install command line tools:
+  ```sh
+  mkdir -p "${ANDROID_HOME}/cmdline-tools"
+  curl -sLo /tmp/clt.zip https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip
+  unzip -d "${ANDROID_HOME}" /tmp/clt.zip
+  ```
+4. Install SDK components: `sdkmanager --sdk_root="${ANDROID_HOME}" --install "build-tools;36.0.0" "ndk;29.0.14206865" "platforms;android-35"`
+  > You may need to change SDK versions
+5. Install cargo-apk: `cargo install --git https://github.com/parasyte/cargo-apk.git --rev 282639508eeed7d73f2e1eaeea042da2716436d5 cargo-apk`
+  > There was a [bug](https://github.com/rust-mobile/cargo-subcommand/issues/29) in the upstream, so the above installs a patched version. 
 
-Build and run:
+## Build & run
 
-```sh
-# Run on android
-cargo apk run -p hello_android --lib
-
-# Run on your desktop
-cargo run -p hello_android
-```
+Use `cargo-apk` to build and run:
+1. On android: `cargo apk run -p hello_android --lib`
+2. On desktop: `cargo run -p hello_android`
 
 ![](screenshot.png)
diff --git a/examples/hello_android/src/lib.rs b/examples/hello_android/src/lib.rs
index 2ab777ea7..042e6eda6 100644
--- a/examples/hello_android/src/lib.rs
+++ b/examples/hello_android/src/lib.rs
@@ -3,7 +3,7 @@
 use eframe::{CreationContext, egui};
 
 #[cfg(target_os = "android")]
-#[no_mangle]
+#[unsafe(no_mangle)]
 fn android_main(app: winit::platform::android::activity::AndroidApp) {
     // Log to android output
     android_logger::init_once(
diff --git a/examples/hello_world_par/Cargo.toml b/examples/hello_world_par/Cargo.toml
index ef719b742..04a3c0e25 100644
--- a/examples/hello_world_par/Cargo.toml
+++ b/examples/hello_world_par/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 workspace = true
 
 
-[package.metadata.cargo-machete]
+[package.metadata.cargo-shear]
 ignored = ["winit"] # Just enable some features of it; see below
 
 
diff --git a/examples/images/Cargo.toml b/examples/images/Cargo.toml
index 7c3b77b7c..adac2a540 100644
--- a/examples/images/Cargo.toml
+++ b/examples/images/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 workspace = true
 
 
-[package.metadata.cargo-machete]
+[package.metadata.cargo-shear]
 ignored = ["image"] # We only use the dependency to add more features to it
 
 
diff --git a/examples/puffin_profiler/Cargo.toml b/examples/puffin_profiler/Cargo.toml
index 49e6598db..ed8ce3aa0 100644
--- a/examples/puffin_profiler/Cargo.toml
+++ b/examples/puffin_profiler/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2024"
 rust-version = "1.92"
 publish = false
 
-[package.metadata.cargo-machete]
+[package.metadata.cargo-shear]
 ignored = ["profiling"]
 
 [lints]
diff --git a/scripts/check.sh b/scripts/check.sh
index 71dc38386..ce0b3b8d5 100755
--- a/scripts/check.sh
+++ b/scripts/check.sh
@@ -29,7 +29,6 @@ cargo check --quiet  --all-targets
 cargo check --quiet  --all-targets --all-features
 cargo check --quiet  -p egui_demo_app --lib --target wasm32-unknown-unknown
 cargo check --quiet  -p egui_demo_app --lib --target wasm32-unknown-unknown --all-features
-# TODO(#5297) re-enable --all-features once the tests work with the unity feature
 cargo test  --quiet --all-targets --all-features
 cargo test  --quiet --doc # slow - checks all doc-tests
 
diff --git a/scripts/setup_web.sh b/scripts/setup_web.sh
index f51258855..5ba11b665 100755
--- a/scripts/setup_web.sh
+++ b/scripts/setup_web.sh
@@ -10,6 +10,6 @@ rustup target add wasm32-unknown-unknown
 
 # For generating JS bindings:
 # Keep wasm-bindgen version in sync in: setup_web.sh, Cargo.toml, Cargo.lock, rust.yml
-if ! cargo install --list | grep -q 'wasm-bindgen-cli v0.2.100'; then
-    cargo install --force --quiet wasm-bindgen-cli --version 0.2.100
+if ! cargo install --list | grep -q 'wasm-bindgen-cli v0.2.108'; then
+    cargo install --force --quiet wasm-bindgen-cli --version 0.2.108 --locked
 fi
diff --git a/tests/egui_tests/Cargo.toml b/tests/egui_tests/Cargo.toml
index 8c09042b1..44a7b9c8f 100644
--- a/tests/egui_tests/Cargo.toml
+++ b/tests/egui_tests/Cargo.toml
@@ -5,6 +5,9 @@ license.workspace = true
 rust-version.workspace = true
 version.workspace = true
 
+[package.metadata.cargo-shear]
+ignored = ["image"] # We need the png feature
+
 [dev-dependencies]
 egui = { workspace = true, default-features = true }
 egui_kittest = { workspace = true, features = ["snapshot", "wgpu"] }
diff --git a/tests/egui_tests/tests/regression_tests.rs b/tests/egui_tests/tests/regression_tests.rs
index 9e76394cb..f32ff7ff3 100644
--- a/tests/egui_tests/tests/regression_tests.rs
+++ b/tests/egui_tests/tests/regression_tests.rs
@@ -1,5 +1,14 @@
+use std::sync::Arc;
+
+use egui::ScrollArea;
 use egui::accesskit::Role;
-use egui::{Align, Color32, Image, Label, Layout, RichText, Sense, TextWrapMode, include_image};
+use egui::epaint::Shape;
+use egui::style::ScrollAnimation;
+use egui::text::{LayoutJob, TextWrapping};
+use egui::{
+    Align, Color32, FontFamily, FontId, Image, Label, Layout, RichText, Sense, TextBuffer,
+    TextFormat, TextWrapMode, Ui, include_image, vec2,
+};
 use egui_kittest::Harness;
 use egui_kittest::kittest::Queryable as _;
 
@@ -62,6 +71,114 @@ fn text_edit_rtl() {
     }
 }
 
+#[test]
+fn text_edit_halign() {
+    let mut harness = Harness::builder().with_size((212.0, 212.0)).build_ui(|ui| {
+        ui.spacing_mut().item_spacing = vec2(2.0, 2.0);
+
+        fn layouter(halign: Align) -> impl FnMut(&Ui, &dyn TextBuffer, f32) -> Arc<egui::Galley> {
+            move |ui: &egui::Ui, buf: &dyn egui::TextBuffer, wrap_width: f32| {
+                let mut job = LayoutJob {
+                    wrap: TextWrapping {
+                        max_rows: 4,
+                        max_width: wrap_width,
+                        ..Default::default()
+                    },
+                    halign,
+                    ..Default::default()
+                };
+                job.append(
+                    buf.as_str(),
+                    0.0,
+                    TextFormat::simple(FontId::new(13.0, FontFamily::Proportional), Color32::GRAY),
+                );
+                ui.fonts_mut(|f| f.layout_job(job))
+            }
+        }
+
+        for widget_alignment in [Align::Min, Align::Center, Align::Max] {
+            ui.horizontal(|ui| {
+                for text_alignment in [Align::LEFT, Align::Center, Align::RIGHT] {
+                    ui.add_sized(
+                        vec2(64.0, 64.0),
+                        egui::TextEdit::multiline(&mut format!(
+                            "{widget_alignment:?}\n+\n{text_alignment:?}",
+                        ))
+                        .layouter(&mut layouter(text_alignment))
+                        .vertical_align(widget_alignment)
+                        .horizontal_align(widget_alignment),
+                    );
+                }
+            });
+        }
+    });
+
+    harness.get_by_value("Center\n+\nCenter").focus();
+    harness.step();
+    harness.snapshot("text_edit_halign");
+}
+
+#[test]
+fn text_edit_delay() {
+    let mut text = String::new();
+    let mut harness = Harness::builder().with_size((200.0, 50.0)).build_ui(|ui| {
+        ui.style_mut().scroll_animation = ScrollAnimation::none();
+        ui.add(egui::TextEdit::singleline(&mut text).hint_text("Write something"));
+    });
+
+    harness.get_by_role(Role::TextInput).focus();
+    harness.step();
+    harness.snapshot("text_edit_delay_0_empty");
+
+    harness.get_by_role(Role::TextInput).type_text("h");
+
+    // When the text is empty, and we show the hint text, there is a frame delay.
+    harness.step();
+    harness.snapshot("text_edit_delay_1_h_invisible");
+
+    // Now it should be visible
+    harness.step();
+    harness.snapshot("text_edit_delay_2_h_visible");
+
+    harness.get_by_role(Role::TextInput).type_text("i");
+
+    // The "i" should immediately be visible without a delay
+    harness.step();
+    harness.snapshot("text_edit_delay_3_i_visible");
+
+    // The next frame should exactly match the previous one
+    harness.step();
+    harness.snapshot("text_edit_delay_4_i_visible");
+}
+
+#[test]
+fn text_edit_scroll() {
+    let mut text = "1\n2\n3\n4\n".to_owned();
+    let mut harness = Harness::builder().build_ui(|ui| {
+        ScrollArea::vertical().max_height(40.0).show(ui, |ui| {
+            ui.add(
+                egui::TextEdit::multiline(&mut text)
+                    .desired_rows(2)
+                    .hint_text("Write something"),
+            );
+        });
+    });
+
+    harness.fit_contents();
+
+    harness.get_by_role(Role::MultilineTextInput).focus();
+    harness.step();
+    harness.snapshot("text_edit_scroll_0_focus");
+
+    harness
+        .get_by_role(Role::MultilineTextInput)
+        .type_text("5\n");
+
+    // When the text is empty, and we show the hint text, there is a frame delay.
+    harness.run();
+    harness.snapshot("text_edit_scroll_1_5");
+}
+
 #[test]
 fn combobox_should_have_value() {
     let harness = Harness::new_ui(|ui| {
@@ -118,3 +235,175 @@ fn interact_on_ui_response_should_be_stable() {
     drop(harness);
     assert_eq!(click_count, 10, "We missed some clicks!");
 }
+
+fn has_red_warning_rect(output: &egui::FullOutput) -> bool {
+    output.shapes.iter().any(|clipped| {
+        matches!(
+            &clipped.shape,
+            Shape::Rect(rect_shape)
+                if rect_shape.stroke.color == Color32::RED
+        )
+    })
+}
+
+/// A button that changes its text on hover, with the Id derived from the text.
+/// This is a plausible bug: the widget keeps the same rect, but its Id changes
+/// between frames because the label (and thus the Id salt) changes on hover.
+/// The `warn_if_rect_changes_id` debug check should catch this.
+#[test]
+fn warn_if_rect_changes_id() {
+    let button_rect = egui::Rect::from_min_size(egui::pos2(10.0, 10.0), egui::vec2(100.0, 30.0));
+
+    let mut harness = Harness::builder().with_size((200.0, 50.0)).build_ui(|ui| {
+        // Simulate a buggy widget whose Id depends on its label text,
+        // and the label changes on hover:
+        let is_hovered = ui.rect_contains_pointer(button_rect);
+        let label = if is_hovered { "Hovering!" } else { "Click me" };
+        let id = ui.id().with(label);
+        let _response = ui.interact(button_rect, id, Sense::click());
+    });
+
+    // no hover — establishes stable prev_pass
+    harness.step();
+    assert!(
+        !has_red_warning_rect(harness.output()),
+        "Should not warn without hover"
+    );
+
+    // Move the pointer over the button
+    harness.hover_at(button_rect.center());
+
+    harness.step();
+    assert!(
+        has_red_warning_rect(harness.output()),
+        "Should warn when a widget rect changes Id between passes"
+    );
+}
+
+/// When a parent Ui's id changes (e.g. via `push_id` with a dynamic value),
+/// all child widget ids shift too. This should NOT trigger `warn_if_rect_changes_id` because the
+/// `parent_id` also changed — it's a cascading id shift, not a widget bug.
+#[test]
+fn warn_if_rect_changes_id_false_positive_parent_shift() {
+    use std::cell::Cell;
+
+    let counter = Cell::new(0);
+    let button_rect = egui::Rect::from_min_size(egui::pos2(10.0, 10.0), egui::vec2(100.0, 30.0));
+
+    let mut harness = Harness::builder().with_size((200.0, 100.0)).build_ui(|ui| {
+        // push_id with a changing value causes the child Ui's id to shift,
+        // which in turn shifts all widget ids inside it.
+        ui.push_id(counter.get(), |ui| {
+            let id = ui.id().with("my_widget");
+            let _response = ui.interact(button_rect, id, Sense::click());
+        });
+    });
+
+    // Frame 1: counter=0 — establishes prev_pass
+    harness.step();
+    assert!(
+        !has_red_warning_rect(harness.output()),
+        "Should not warn on first frame"
+    );
+
+    // Frame 2: counter=0 — prev_pass == this_pass
+    harness.step();
+    assert!(
+        !has_red_warning_rect(harness.output()),
+        "Should not warn when nothing changed"
+    );
+
+    // Now change the parent id, shifting all child widget ids
+    counter.set(1);
+    harness.step();
+
+    assert!(
+        !has_red_warning_rect(harness.output()),
+        "Should NOT warn when parent Ui's id shifted (cascading id change)"
+    );
+}
+
+#[test]
+fn horizontal_wrapped_multiline_row_height() {
+    let mut harness = Harness::builder().with_size((350.0, 300.0)).build_ui(|ui| {
+        ui.style_mut().interaction.tooltip_delay = 0.0;
+        ui.style_mut().interaction.show_tooltips_only_when_still = false;
+
+        let mut string = String::new();
+
+        ui.horizontal_wrapped(|ui| {
+            ui.monospace("| ");
+            let _ = ui.button("A");
+            let _ = ui.button("B");
+            ui.end_row();
+
+            ui.monospace("| ");
+            let _ = ui.button("C");
+            let _ = ui.button("D");
+            let _ = ui.button("E");
+            ui.end_row();
+
+            ui.monospace("| ");
+            ui.text_edit_multiline(&mut string);
+            ui.end_row();
+
+            ui.monospace("| ");
+            let _ = ui.button("F");
+            let _ = ui.button("G");
+            ui.end_row();
+
+            ui.monospace("| ");
+            let _ = ui.button("H");
+            let _ = ui.button("I");
+            let _ = ui.button("K");
+            ui.end_row();
+        });
+    });
+
+    harness.snapshot("horizontal_wrapped_multiline_row_height");
+}
+
+#[test]
+fn horizontal_wrapped_multiline_row_height_reference() {
+    let mut harness = Harness::builder().with_size((350.0, 300.0)).build_ui(|ui| {
+        ui.style_mut().interaction.tooltip_delay = 0.0;
+        ui.style_mut().interaction.show_tooltips_only_when_still = false;
+
+        let mut string = String::new();
+
+        ui.vertical(|ui| {
+            ui.horizontal(|ui| {
+                ui.monospace("| ");
+                let _ = ui.button("A");
+                let _ = ui.button("B");
+            });
+
+            ui.horizontal(|ui| {
+                ui.monospace("| ");
+                let _ = ui.button("C");
+                let _ = ui.button("D");
+                let _ = ui.button("E");
+            });
+
+            ui.horizontal(|ui| {
+                ui.monospace("| ");
+                ui.text_edit_multiline(&mut string);
+            });
+
+            ui.horizontal(|ui| {
+                ui.monospace("| ");
+                let _ = ui.button("F");
+                let _ = ui.button("G");
+            });
+
+            ui.horizontal(|ui| {
+                ui.monospace("| ");
+                let _ = ui.button("H");
+                let _ = ui.button("I");
+                let _ = ui.button("K");
+            });
+        });
+    });
+
+    harness.snapshot("horizontal_wrapped_multiline_row_height_reference");
+}
diff --git a/tests/egui_tests/tests/snapshots/atom_letter_spacing.png b/tests/egui_tests/tests/snapshots/atom_letter_spacing.png
index 89fba254e..8a022896b 100644
--- a/tests/egui_tests/tests/snapshots/atom_letter_spacing.png
+++ b/tests/egui_tests/tests/snapshots/atom_letter_spacing.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4aaf541ed0245777c802d31f01edb0cc4e53ebd2f4444e094336c180b98091d3
-size 2221
+oid sha256:14a8e05b81da82b086fe1ba006a39951a8bca3ff7a2b05c5385a425383b30961
+size 2207
diff --git a/tests/egui_tests/tests/snapshots/button_shortcut.png b/tests/egui_tests/tests/snapshots/button_shortcut.png
index de7d64b4d..6ee227fca 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:cbf68b6934dae0868bc9cf0891baf5acf110284d297cfa348e756237fca64a28
-size 1564
+oid sha256:1cdfd5e248b3a1f2053f038a4e45c68f085ddbc085a6e1719b1c4c43b18f8d6c
+size 1566
diff --git a/tests/egui_tests/tests/snapshots/grow_all.png b/tests/egui_tests/tests/snapshots/grow_all.png
index 89b96aba7..9771b6ef1 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:83c3e19004462b793a5929f60f8b81a795c57529bfc74c6e87890aa4b9b8d939
-size 13930
+oid sha256:d74498e867f1ede9fa5e8769afeb24d7cfdd464db7accf0e4770aa94c7860bbc
+size 13929
diff --git a/tests/egui_tests/tests/snapshots/horizontal_wrapped_multiline_row_height.png b/tests/egui_tests/tests/snapshots/horizontal_wrapped_multiline_row_height.png
new file mode 100644
index 000000000..277c93280
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/horizontal_wrapped_multiline_row_height.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1bf4b21569bb28659808ee668be82ac89275dfbbbefba3237560aa2bcbc986b2
+size 5339
diff --git a/tests/egui_tests/tests/snapshots/horizontal_wrapped_multiline_row_height_reference.png b/tests/egui_tests/tests/snapshots/horizontal_wrapped_multiline_row_height_reference.png
new file mode 100644
index 000000000..60aede644
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/horizontal_wrapped_multiline_row_height_reference.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b2a7bfced8ffd7d0002e52f98a01585c9667bc9821bc392e00fb890fb317696
+size 5376
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 672418f84..845dfb4ad 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:3a5669c2c354c6ea42d8eaeb2eb39b65130a87807cbba8382dcc24d59790e794
-size 12181
+oid sha256:78daa3415e3012c0834819de8338dc380e262c5199f0e477b8796b6d11fe606f
+size 12212
diff --git a/tests/egui_tests/tests/snapshots/layout/atoms_image.png b/tests/egui_tests/tests/snapshots/layout/atoms_image.png
index acfdb810c..9bde044b4 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:0f65b7221ac74991c526b68ad2469f42801f6083c9acead5bc923fd856a6311d
-size 368614
+oid sha256:c6f941a45026d7842292366b70cfa3824fe16a9f78fd745b6fcd44c48e046a36
+size 369410
diff --git a/tests/egui_tests/tests/snapshots/layout/atoms_minimal.png b/tests/egui_tests/tests/snapshots/layout/atoms_minimal.png
index 3e37969f7..6d77c9127 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:97b26c9abaf655fa5ef0625b8bc61042291a8ea18ecc89ea16abd3be6368c006
-size 367314
+oid sha256:a9ec7559bb6f57f446fd32f1fc342907ad4b888688195a5c147a2faaeaf5cd7a
+size 369296
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 54a8a3e1c..350194332 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:47b09261afe84892cdb169cb99ae59c49f671e68b3e99fc170e304de9b2bf526
-size 290633
+oid sha256:f0402dcf47b05586a9792d4583a7b7c76072b2f147a57b94bc7f3ba2b3471b26
+size 291012
diff --git a/tests/egui_tests/tests/snapshots/layout/button.png b/tests/egui_tests/tests/snapshots/layout/button.png
index 635858aba..464daa5de 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:3cbc6f95073cbbb26729d287e5fe073c76e8bddee7eef95b431a873522234297
-size 313244
+oid sha256:1bafb447c177f2bd94980c1d146a2826ecf62070fb6ee18e63e6a925e2741210
+size 314478
diff --git a/tests/egui_tests/tests/snapshots/layout/button_image.png b/tests/egui_tests/tests/snapshots/layout/button_image.png
index 79cda64a2..ce2844f8f 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:f89cc5b17821c9f30f7a086bb37668e4e7913705d42c0678fb0f42c527abb868
-size 334498
+oid sha256:eadf74cc7f7e10be804df0e7df65c232ecaed7d77c2c89197548ab7206706843
+size 351669
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 b244a86dc..3a8d09f95 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:b7f87fb417453a98e7059535cb68b12549d65f8da7cedf7a48e7154686931e16
-size 419858
+oid sha256:60739a18972a5e866610ae2c8f5af719a1bbaeffcdd8c6319e783c37e28d3107
+size 435108
diff --git a/tests/egui_tests/tests/snapshots/layout/checkbox.png b/tests/egui_tests/tests/snapshots/layout/checkbox.png
index 766aedaca..1f958fd57 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:2f17fe1f7b2cccaa8991559218a7f13f61e459dc8443cf0fe2d24df7e9bd2eea
-size 388959
+oid sha256:46d28fc14a4fb8e4a5fb962b17f6a1ad9b8c952453df62d49f846fda9945b409
+size 389363
diff --git a/tests/egui_tests/tests/snapshots/layout/checkbox_checked.png b/tests/egui_tests/tests/snapshots/layout/checkbox_checked.png
index 8f79ec659..3a2676aba 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:552a4d4933768ea1ee2323e7946f74f9ddd7e2f7b7c6d9f94bb92c8e7dd230a4
-size 416630
+oid sha256:2fb6db99b4dfa1b0c6f97799ffd72c264c02eefd803eee5737075231760c80bd
+size 417925
diff --git a/tests/egui_tests/tests/snapshots/layout/drag_value.png b/tests/egui_tests/tests/snapshots/layout/drag_value.png
index bfe289a61..105cd3453 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:339772a7974a2136b222697af2dd6e0202295d78e0720645204feb3c291481af
-size 263181
+oid sha256:f54f444c25fbd1def8d0f11d03e1fd8bde6745a2593d0029e346cbaafa584ed3
+size 264007
diff --git a/tests/egui_tests/tests/snapshots/layout/radio.png b/tests/egui_tests/tests/snapshots/layout/radio.png
index 2fbd917a8..043e6b1a7 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:275c5358d3cfcbae7dfbeae4eac6606e2f394023837da492adc85934a972203e
-size 325936
+oid sha256:5be1a82841c5d9916ad0c69eb08ca782797e42ee6f085a50ce2f5bcaa1ec917d
+size 328013
diff --git a/tests/egui_tests/tests/snapshots/layout/radio_checked.png b/tests/egui_tests/tests/snapshots/layout/radio_checked.png
index e95932c0d..6ef9b7b05 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:8bde6a904873ec2ffd7a194b820f3d76db5cacb3c266f3cb99f1c77ca2bd69fb
-size 346473
+oid sha256:0cd7790301453097e1109a2f6600a986a12e0b02406471f12d8c1984395870e4
+size 347530
diff --git a/tests/egui_tests/tests/snapshots/layout/selectable_value.png b/tests/egui_tests/tests/snapshots/layout/selectable_value.png
index fd2daeeb0..b66e2e68a 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:e0b87d78fce32144f1c694beb637461cb70b9127346c90d0276a877db0700291
-size 387935
+oid sha256:fd2d4946dcff38c5fbb1c3af64faa9686f93bd163f54eef0aef9c92084527671
+size 388797
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 8ce768dae..a52c4de9a 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:77d4dd1a05771c25af933398d4f118e5e21a31b2e4db66161cf054fb1d7ebe24
-size 400911
+oid sha256:97c2f56dad8d6aa45385901f9b23a13c49c21fc5aa811ab50dcf7c8451b177dd
+size 401596
diff --git a/tests/egui_tests/tests/snapshots/layout/slider.png b/tests/egui_tests/tests/snapshots/layout/slider.png
index 83da462b7..306d2a97f 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:b4071301c08f980ee26d914e4a4724b3f46f1113c62495483d9b0df980d8cbcd
-size 274770
+oid sha256:619139eb166d383cc9b35653c8c4a97c55cd21b171a24e253d923558cc0d35e1
+size 275512
diff --git a/tests/egui_tests/tests/snapshots/layout/text_edit.png b/tests/egui_tests/tests/snapshots/layout/text_edit.png
index cfbaefd41..5936c68a7 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:30de3e9f9645206e33fa1edd841b48228e154d0ceae962c64c060a66eecd73ba
-size 220452
+oid sha256:260b2f77cfa51fbc5a948725d1219cfee8723362f228eb768255ee3f271faa39
+size 221505
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 8ea5d0b7a..251ecc9ea 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:a9f36b8623d2d9c35e337e973f547166f62a5daae757c462b1482babdd42c941
-size 383051
+oid sha256:35342ae9a83bcd19ba169c762f21f1667d9fcc781e6370b939e1781ff5a4e477
+size 372996
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 e65f04b1c..8adc7676b 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:aed677ddda9544258ddc58ed602655f6a62ab2d1d8342accd025593bbcb25e2f
-size 506926
+oid sha256:01795b279efc5c680d77817f7d0e6e9f18dc3969ec964d8d3419d0175b0f4d87
+size 512262
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 0a84f42db..900845aff 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:1a2734644b2fbb6f42ddab6c65a1f5d073f1f002900bbd814c1edb6184e0a9c0
-size 362521
+oid sha256:263f38d4053119d3b5104575ceaba749d29582f6f021b7b9089054ecba4b22a0
+size 330923
diff --git a/tests/egui_tests/tests/snapshots/layout/text_edit_prefix_suffix.png b/tests/egui_tests/tests/snapshots/layout/text_edit_prefix_suffix.png
new file mode 100644
index 000000000..642a8c5fd
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/layout/text_edit_prefix_suffix.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9f298f8ea6692e7ccbddbe182a91824ce262913d50e9a7df104a6c63d39d8a0
+size 372564
diff --git a/tests/egui_tests/tests/snapshots/max_width.png b/tests/egui_tests/tests/snapshots/max_width.png
index be50f81db..cc1d4f913 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:df3c1ba38afa30d22106d21a54621c28a0de2b98f77f4d7e398f09089286ef3e
-size 8367
+oid sha256:67a7d4da3fd41cae45abc5c0dbc0257de64c8d136291b92a6885ab4d9589ff6e
+size 8388
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 d49489c41..abb0ceb28 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:f5919c35a3d736e0c432b3a94d6ab2a2f936f71852b94f2f95475fa6ab5281ad
-size 8369
+oid sha256:e15a6273a919fe06f7f096f0f7f4ef23eec739841cae58c9b27bd948ea025fef
+size 8390
diff --git a/tests/egui_tests/tests/snapshots/rotated_ellipse.png b/tests/egui_tests/tests/snapshots/rotated_ellipse.png
new file mode 100644
index 000000000..55a51d681
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/rotated_ellipse.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7591c9001a1b4b8cf1f19d7b3efa3bb1f43f7a695c1818b602e3c1f19b179a69
+size 17299
diff --git a/tests/egui_tests/tests/snapshots/rotated_rect.png b/tests/egui_tests/tests/snapshots/rotated_rect.png
new file mode 100644
index 000000000..d09ee268f
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/rotated_rect.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:816105d33ea4233c62a577377a1bf447bf5022ce4df553480924aee97fc374c1
+size 14153
diff --git a/tests/egui_tests/tests/snapshots/shrink_first_text.png b/tests/egui_tests/tests/snapshots/shrink_first_text.png
index a623d8b3b..7b9ef4003 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:73b1cc01da110554dd41f4e5134f5d6d34b7e2079d5ac776f40980d616481ffc
-size 11448
+oid sha256:224d55c987c8528bb6f9d051893572fbbb36e82bb5acec8b9614784d25093af1
+size 11383
diff --git a/tests/egui_tests/tests/snapshots/shrink_last_text.png b/tests/egui_tests/tests/snapshots/shrink_last_text.png
index cda1a2add..f1fa64de7 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:00e129a40ea9815472ab9d823a1801fbdd268bd58745cad1c1c3dd91309c61fc
-size 12010
+oid sha256:cee1c5d11e895f997b95606bf2f7c789dbff11e3e95327ab6e958586c334f5b0
+size 11932
diff --git a/tests/egui_tests/tests/snapshots/sides/default_long.png b/tests/egui_tests/tests/snapshots/sides/default_long.png
index ae862c32d..695e679fc 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:9c970aab8c09558b806c81f57fc1d695992cb9f6e735a3fb2be75997c106a141
-size 8214
+oid sha256:a1ebcf48076404bf375d9cb66fed752fab48e83adcaa3a08372340f5e68caf2f
+size 8111
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 534b55d92..308a273d6 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:7d7c49df327cdea8cc7d6a0b7278a831574a38e8998dba0733fcae2fd44256a9
-size 8833
+oid sha256:b844510cda2e4ba73adf0fb711299d268eedbd05e8a84ea04ce73451093a3b63
+size 8786
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 ebf7424c3..451859fa0 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:46bca727290bb0fc5a9a28137385e7ee4821390d1594704ce5e0ea089f28dacf
-size 7079
+oid sha256:140fe4f323fbcd752d1f091c3095674e5392c9de72bfc43ee7032546aca5ce8a
+size 7035
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 534b55d92..308a273d6 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:7d7c49df327cdea8cc7d6a0b7278a831574a38e8998dba0733fcae2fd44256a9
-size 8833
+oid sha256:b844510cda2e4ba73adf0fb711299d268eedbd05e8a84ea04ce73451093a3b63
+size 8786
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 d1cfeb533..2fa858ad9 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:841f69878a4b9331f8ab4730d212384a82a9de14b9fba0d6964cd3010900132a
-size 6939
+oid sha256:059ea9c691e07377307aca905d2ad70797362138228c6bd173e80951d2170ff0
+size 6833
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 534b55d92..308a273d6 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:7d7c49df327cdea8cc7d6a0b7278a831574a38e8998dba0733fcae2fd44256a9
-size 8833
+oid sha256:b844510cda2e4ba73adf0fb711299d268eedbd05e8a84ea04ce73451093a3b63
+size 8786
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 be67eaf7a..757d74fb5 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:602bc370e3929995c9b17415b513b412e0e12433f2c2b9120c58ea63c747ed79
-size 9184
+oid sha256:b35bec0c6bd97d9941fc4ffd1072869a8875eef0080f6348b036e885c37ceeb1
+size 9073
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 534b55d92..308a273d6 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:7d7c49df327cdea8cc7d6a0b7278a831574a38e8998dba0733fcae2fd44256a9
-size 8833
+oid sha256:b844510cda2e4ba73adf0fb711299d268eedbd05e8a84ea04ce73451093a3b63
+size 8786
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 cb31d61e1..0e6711016 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:b9165daef8acd038a1527192ded0b7cd5d03f235be737308ade467df33b6c8a0
-size 9192
+oid sha256:6e478664951aa3561e74573a0e28a977c00e43db8730b086299fd33c5b4c52da
+size 9099
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 534b55d92..308a273d6 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:7d7c49df327cdea8cc7d6a0b7278a831574a38e8998dba0733fcae2fd44256a9
-size 8833
+oid sha256:b844510cda2e4ba73adf0fb711299d268eedbd05e8a84ea04ce73451093a3b63
+size 8786
diff --git a/tests/egui_tests/tests/snapshots/size_max_size.png b/tests/egui_tests/tests/snapshots/size_max_size.png
index 499259fd4..d157d2053 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:11a987f7376f8a3174958a8c21bece8bfb7ec284077940d87038271717d2c397
-size 8655
+oid sha256:64287f55195452d41eb94729ab39ea7667abeec7cfd53c4c7e92235dbcd03bf9
+size 8675
diff --git a/tests/egui_tests/tests/snapshots/text_edit_delay_0_empty.png b/tests/egui_tests/tests/snapshots/text_edit_delay_0_empty.png
new file mode 100644
index 000000000..7f85cf977
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/text_edit_delay_0_empty.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:570216d6ffa3cc278705582d95b96200bc3ef1608b8f2983a6ed3f8b2ee7276c
+size 2280
diff --git a/tests/egui_tests/tests/snapshots/text_edit_delay_1_h_invisible.png b/tests/egui_tests/tests/snapshots/text_edit_delay_1_h_invisible.png
new file mode 100644
index 000000000..66ad3f4a4
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/text_edit_delay_1_h_invisible.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e74e32fb12decf36c8685274226c29c4e748b2bf276bf6b47ba19ac9a3def66a
+size 2290
diff --git a/tests/egui_tests/tests/snapshots/text_edit_delay_2_h_visible.png b/tests/egui_tests/tests/snapshots/text_edit_delay_2_h_visible.png
new file mode 100644
index 000000000..bc1ffcd08
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/text_edit_delay_2_h_visible.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ab120260212d0f41d2956ea2d679cfed648cb188badcca7fa82e0dec9c87ec1a
+size 714
diff --git a/tests/egui_tests/tests/snapshots/text_edit_delay_3_i_visible.png b/tests/egui_tests/tests/snapshots/text_edit_delay_3_i_visible.png
new file mode 100644
index 000000000..324946e10
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/text_edit_delay_3_i_visible.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2ea9d6bef26f1dbd7dc272b4331012ad6fd1a43fded150d33ba4762d404dbde
+size 775
diff --git a/tests/egui_tests/tests/snapshots/text_edit_delay_4_i_visible.png b/tests/egui_tests/tests/snapshots/text_edit_delay_4_i_visible.png
new file mode 100644
index 000000000..324946e10
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/text_edit_delay_4_i_visible.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c2ea9d6bef26f1dbd7dc272b4331012ad6fd1a43fded150d33ba4762d404dbde
+size 775
diff --git a/tests/egui_tests/tests/snapshots/text_edit_halign.png b/tests/egui_tests/tests/snapshots/text_edit_halign.png
new file mode 100644
index 000000000..2f81509e6
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/text_edit_halign.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:48114ad6d116fb9288ce9fe3b173017bda317f69753e7ac03a090b8d02d6cb4d
+size 13258
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 3b87786e8..796a1e3b5 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:ce357224c2e1cf32f96b3d075dc070c4d14e9aaca1b8165d0ba98603dff19c1b
-size 2324
+oid sha256:ed3665dfb232b8f0b1483802bfafb4605e8361d7eb977de5a58862e52ab724fa
+size 2296
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 5d9aada78..cd6d5a621 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:d91c715ac66be329cac42ff7c7726348b0ac79d897c414bbde26bb0115781577
-size 2289
+oid sha256:5cfdd6255aba92f0253571bde4f22afc8e0fb5fe3cb882946459d623c0a5d89c
+size 2982
diff --git a/tests/egui_tests/tests/snapshots/text_edit_scroll_0_focus.png b/tests/egui_tests/tests/snapshots/text_edit_scroll_0_focus.png
new file mode 100644
index 000000000..019154ba6
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/text_edit_scroll_0_focus.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f2a57ad8dbdd121cb181e74d76db68d800aba8fdc980d8de4e962e1e85fe8f6
+size 1803
diff --git a/tests/egui_tests/tests/snapshots/text_edit_scroll_1_5.png b/tests/egui_tests/tests/snapshots/text_edit_scroll_1_5.png
new file mode 100644
index 000000000..6c1ee1d81
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/text_edit_scroll_1_5.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43dc457cac18107772dbb7e5773961cf502dd685ce1cb4e94338e6b7daedaa77
+size 1861
diff --git a/tests/egui_tests/tests/snapshots/visuals/button.png b/tests/egui_tests/tests/snapshots/visuals/button.png
index e6978c70f..4978b5a3b 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:9ed487544a84f9f128af550030bc7fe8a960bc70897b38f7c858440a42b6ce44
-size 11197
+oid sha256:2eb21d7b99171d249127377698225f0b2e103733864f6809785dfba169e133bf
+size 11213
diff --git a/tests/egui_tests/tests/snapshots/visuals/button_image.png b/tests/egui_tests/tests/snapshots/visuals/button_image.png
index eca582ec0..9d3669597 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:a2a017c2b93d1920ae85792c13eafa2fd43f93b2e3bbaa5981ed3a43050c0995
-size 11808
+oid sha256:3322b616a292f685f6051d2bf9be0df28ca7472e8fc3c982cd094ca44dc47ff8
+size 12117
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 4848b0781..41d88992d 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:42cbc8f8740f56ce45c356262d9b872e3973844ce552c6c09e3c07425c3f86b6
-size 14835
+oid sha256:2021446525a7b1090aaa6b3f12fdd9295c67cde00de61c7f0d36838b6dfc2593
+size 15148
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 8c30d3145..3bb097aeb 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:11fdd4bde01102e7998defcaa80c1105ec9418152314c74ee028b692b26c6be8
-size 14407
+oid sha256:e341f6d3fb3d9d09bd573584f68e4ada4e9af0dcb27cf1bc164797f62865c398
+size 14734
diff --git a/tests/egui_tests/tests/snapshots/visuals/checkbox.png b/tests/egui_tests/tests/snapshots/visuals/checkbox.png
index 29f33406f..e45ea9fb3 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:929d06a271e98f0c0a2a72fc63648693b22885f80beda0a7baa5858ceb6f952b
-size 13507
+oid sha256:9fd43ec4633a59798d2077d9fd3ad8292d5da66678a2d75d33c957a062d7848a
+size 13218
diff --git a/tests/egui_tests/tests/snapshots/visuals/checkbox_checked.png b/tests/egui_tests/tests/snapshots/visuals/checkbox_checked.png
index 145020884..31f84dbeb 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:880881761251b70d2c841b8aef3895e95a5eea499d2ff554d3f68b888fb167f9
-size 14571
+oid sha256:3e2252dbe6b26cc6b484d09c57a47f4ecd0d75df88f2279a7dd95ca43b597e9d
+size 14282
diff --git a/tests/egui_tests/tests/snapshots/visuals/drag_value.png b/tests/egui_tests/tests/snapshots/visuals/drag_value.png
index 8be9c5e9f..b327692cb 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:71daf8a33d277075012bf1130d7820574fe0286080154810d8d398c005a65127
-size 9037
+oid sha256:75e5610bd64f6beda7abb005344eff1f5ee23220272077d3b6ee5345baa616aa
+size 9095
diff --git a/tests/egui_tests/tests/snapshots/visuals/radio.png b/tests/egui_tests/tests/snapshots/visuals/radio.png
index b35eb2d51..d8d6a052a 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:4502cc58a4085d1e0f9945d0bd1d25adeefe71094ce94a210c57f113727f3a5a
-size 11806
+oid sha256:bceb25ddc48567a79389d8333eeffa3db4f083d47488a05772602d6145faf2ea
+size 11830
diff --git a/tests/egui_tests/tests/snapshots/visuals/radio_checked.png b/tests/egui_tests/tests/snapshots/visuals/radio_checked.png
index 7bdae8cf1..c746c028e 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:cdedec6788b1a5026603322db9dd9f5fa398813d8aa2c56bc60acad390110501
-size 12499
+oid sha256:30e17cfb5c21e3fd6f850e022f301787bd04d1e6453e3bd30ff695de1f61b8c1
+size 12524
diff --git a/tests/egui_tests/tests/snapshots/visuals/selectable_value.png b/tests/egui_tests/tests/snapshots/visuals/selectable_value.png
index 2f3192a74..bb2b2a32b 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:23d1cddf87ea10d6735403ea0b2a16811d4f92246415633d393c991c3bfab2a1
-size 13716
+oid sha256:b42c8d774d1ecb50f5bde1aa358a37cbb669b59d934786fb1cc4c6f0c3400701
+size 13711
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 66f3df875..87163dd91 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:e8ac8bbdf9331dbe4244aa2964adf9f49ab8981b899aee9f3200b2799cdf7bc0
-size 13731
+oid sha256:7037f694fef1211f2ea9d8e7e60836d8eb97c9242c7b396efeb8390eaf0852f1
+size 13730
diff --git a/tests/egui_tests/tests/snapshots/visuals/slider.png b/tests/egui_tests/tests/snapshots/visuals/slider.png
index 8a1b9cf30..8b758e108 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:ff67666113e08d60f1d2310a3a5fca30316953cdabfcc4b259ee816eb498f209
-size 9900
+oid sha256:2d09706e0dbbbf6d07e39470285dc8bcd1b3c6d09bedd91cd20d86c96dba1131
+size 9911
diff --git a/tests/egui_tests/tests/snapshots/visuals/text_edit.png b/tests/egui_tests/tests/snapshots/visuals/text_edit.png
index 4de5e3bd0..2cd2c737a 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:8d259d113aa23089992b04f19e71c743272dda3fc9baa9612565158f15ace57e
-size 8159
+oid sha256:bf723b58802e9cf5aefb0a06689ed2bfaa45afff9f0fc48d37e742244da097e6
+size 8149
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 192fa8f74..666364d68 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:a1e56f1b6970c14830d8869f4d8cacfed821ec2b3aab7033b1bfd213a864da79
-size 10959
+oid sha256:e900a4004a1fc808bf74bef7b1ece7c98e16582c40155e222c04f759d229fc70
+size 10125
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 f02b65693..fff21ac13 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:f6cf861a5c1682add50f9bdee4672e5fcaf882329566097faecab5312ac509b7
-size 21419
+oid sha256:2119fd3aa9aefe8198e7b79968f7fafc4aa93294ba4c2577dc55929302067996
+size 21827
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 decd09bf9..0fb7a4708 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:493649ea09351835147aa6cc800858939dd44beafe37adc488b63b291d58e3b3
-size 10302
+oid sha256:02a333af5e58c53a89d436c4540579d3ea0c1e99c1cad4c019db1da34ff9de10
+size 8840
diff --git a/tests/egui_tests/tests/snapshots/visuals/text_edit_prefix_suffix.png b/tests/egui_tests/tests/snapshots/visuals/text_edit_prefix_suffix.png
new file mode 100644
index 000000000..e00868b1f
--- /dev/null
+++ b/tests/egui_tests/tests/snapshots/visuals/text_edit_prefix_suffix.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a37ed30425967301ffa7dda3fdc8f316dfd7f4665c731b17778e3e5942783e81
+size 10534
diff --git a/tests/egui_tests/tests/test_atoms.rs b/tests/egui_tests/tests/test_atoms.rs
index f6e9df14a..f7e0a4af1 100644
--- a/tests/egui_tests/tests/test_atoms.rs
+++ b/tests/egui_tests/tests/test_atoms.rs
@@ -92,17 +92,17 @@ fn test_intrinsic_size() {
                     if let Some(current_intrinsic_size) = intrinsic_size {
                         assert_eq!(
                             Some(current_intrinsic_size),
-                            response.intrinsic_size,
+                            response.intrinsic_size(),
                             "For wrapping: {wrapping:?}"
                         );
                     }
                     assert!(
-                        response.intrinsic_size.is_some(),
+                        response.intrinsic_size().is_some(),
                         "intrinsic_size should be set for `Button`"
                     );
-                    intrinsic_size = response.intrinsic_size;
+                    intrinsic_size = response.intrinsic_size();
                     if wrapping == TextWrapMode::Extend {
-                        assert_eq!(Some(response.rect.size()), response.intrinsic_size);
+                        assert_eq!(Some(response.rect.size()), response.intrinsic_size());
                     }
                 });
         }
diff --git a/tests/egui_tests/tests/test_rotation.rs b/tests/egui_tests/tests/test_rotation.rs
new file mode 100644
index 000000000..03c9a8664
--- /dev/null
+++ b/tests/egui_tests/tests/test_rotation.rs
@@ -0,0 +1,117 @@
+use egui::epaint::{EllipseShape, RectShape, StrokeKind};
+use egui::{Color32, Grid, Pos2, Rect, Shape, Stroke, Vec2};
+use egui_kittest::Harness;
+
+const SHAPE_COLOR: Color32 = Color32::from_rgb(255, 165, 0);
+const GHOST_COLOR: Color32 = Color32::from_rgb(0, 255, 255);
+const PIVOT_COLOR: Color32 = Color32::from_rgb(255, 0, 255);
+const CELL_SIZE: Vec2 = Vec2::new(180.0, 180.0);
+
+#[test]
+fn rotated_rect() {
+    let shape_stroke = Stroke::new(2.0, Color32::BLACK);
+    let ghost_stroke = Stroke::new(1.0, GHOST_COLOR);
+
+    let mut harness = Harness::new_ui(|ui| {
+        ui.ctx().set_pixels_per_point(1.0);
+
+        let rect_size = Vec2::new(100.0, 60.0);
+        let cell_center = Pos2::new(90.0, 90.0);
+        let cell_rect = Rect::from_center_size(cell_center, rect_size);
+
+        Grid::new("rotated_rect_grid")
+            .spacing(Vec2::new(30.0, 30.0))
+            .show(ui, |ui| {
+                for (label, angle, pivot) in [
+                    ("0°", 0.0, None),
+                    ("Center 45°", 45.0f32.to_radians(), None),
+                    (
+                        "Top-Left 45°",
+                        45.0f32.to_radians(),
+                        Some(cell_rect.left_top()),
+                    ),
+                ] {
+                    paint_case(ui, label, |offset| {
+                        let rect = cell_rect.translate(offset);
+                        let pivot = pivot.map(|p| p + offset);
+                        let pivot_pos = pivot.unwrap_or_else(|| rect.center());
+
+                        let ghost = RectShape::stroke(rect, 0.0, ghost_stroke, StrokeKind::Outside);
+                        let shape = RectShape::new(
+                            rect,
+                            0.0,
+                            SHAPE_COLOR,
+                            shape_stroke,
+                            StrokeKind::Outside,
+                        )
+                        .with_angle_and_pivot(angle, pivot_pos);
+
+                        (ghost.into(), shape.into(), pivot_pos)
+                    });
+                }
+            });
+    });
+
+    harness.fit_contents();
+    harness.try_snapshot("rotated_rect").unwrap();
+}
+
+#[test]
+fn rotated_ellipse() {
+    let shape_stroke = Stroke::new(2.0, Color32::BLACK);
+    let ghost_stroke = Stroke::new(1.0, GHOST_COLOR);
+
+    let mut harness = Harness::new_ui(|ui| {
+        ui.ctx().set_pixels_per_point(1.0);
+
+        let rect_size = Vec2::new(100.0, 60.0);
+        let cell_center = Pos2::new(90.0, 90.0);
+        let radius = rect_size / 2.0;
+
+        Grid::new("rotated_ellipse_grid")
+            .spacing(Vec2::new(30.0, 30.0))
+            .show(ui, |ui| {
+                for (label, angle, pivot) in [
+                    ("0°", 0.0, None),
+                    ("Center 45°", 45.0f32.to_radians(), None),
+                    (
+                        "Top-Left 45°",
+                        45.0f32.to_radians(),
+                        Some(cell_center - radius),
+                    ),
+                ] {
+                    paint_case(ui, label, |offset| {
+                        let center = cell_center + offset;
+                        let pivot = pivot.map(|p| p + offset);
+                        let pivot_pos = pivot.unwrap_or(center);
+
+                        let ghost = EllipseShape::stroke(center, radius, ghost_stroke);
+                        let mut shape = EllipseShape::filled(center, radius, SHAPE_COLOR);
+                        shape.stroke = shape_stroke;
+                        let shape = shape.with_angle_and_pivot(angle, pivot_pos);
+
+                        (ghost.into(), shape.into(), pivot_pos)
+                    });
+                }
+            });
+    });
+
+    harness.fit_contents();
+    harness.try_snapshot("rotated_ellipse").unwrap();
+}
+
+fn paint_case<F>(ui: &mut egui::Ui, label: &str, make_shapes: F)
+where
+    F: FnOnce(Vec2) -> (Shape, Shape, Pos2),
+{
+    ui.vertical(|ui| {
+        ui.label(label);
+        let (response, painter) = ui.allocate_painter(CELL_SIZE, egui::Sense::hover());
+        let offset = response.rect.min.to_vec2();
+
+        let (ghost, shape, pivot) = make_shapes(offset);
+        painter.add(ghost);
+        painter.add(shape);
+        painter.circle_filled(pivot, 3.0, PIVOT_COLOR);
+    });
+}
diff --git a/tests/egui_tests/tests/test_widgets.rs b/tests/egui_tests/tests/test_widgets.rs
index 5ef98c8a8..5283b21d4 100644
--- a/tests/egui_tests/tests/test_widgets.rs
+++ b/tests/egui_tests/tests/test_widgets.rs
@@ -122,6 +122,18 @@ fn widget_tests() {
         },
         &mut results,
     );
+    test_widget(
+        "text_edit_prefix_suffix",
+        |ui| {
+            ui.spacing_mut().text_edit_width = 45.0;
+            TextEdit::singleline(&mut "Hello World".to_owned())
+                .prefix("🔎")
+                .suffix("!")
+                .clip_text(true)
+                .ui(ui)
+        },
+        &mut results,
+    );
 
     test_widget(
         "slider",
diff --git a/tests/test_background_logic/src/main.rs b/tests/test_background_logic/src/main.rs
index ea80cfa9e..b1c559916 100644
--- a/tests/test_background_logic/src/main.rs
+++ b/tests/test_background_logic/src/main.rs
@@ -56,7 +56,8 @@ fn viewport_info(ctx: &egui::Context) -> String {
         ];
         for (name, value) in flags {
             if let Some(value) = value {
-                s += &format!(" {name}={value}");
+                use std::fmt::Write as _;
+                write!(s, " {name}={value}").ok();
             }
         }
         s
diff --git a/tests/test_egui_extras_compilation/Cargo.toml b/tests/test_egui_extras_compilation/Cargo.toml
index 3598362a9..3e1d166f7 100644
--- a/tests/test_egui_extras_compilation/Cargo.toml
+++ b/tests/test_egui_extras_compilation/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [lints]
 workspace = true
 
-[package.metadata.cargo-machete]
+[package.metadata.cargo-shear]
 ignored = ["eframe", "egui_extras"] # We don't use them, just check that things compile
 
 [dependencies]
diff --git a/tests/test_inline_glow_paint/Cargo.toml b/tests/test_inline_glow_paint/Cargo.toml
index 090ccae4c..6aa9428e4 100644
--- a/tests/test_inline_glow_paint/Cargo.toml
+++ b/tests/test_inline_glow_paint/Cargo.toml
@@ -13,7 +13,8 @@ workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-eframe = { workspace = true, features = [
+eframe = { workspace = true, default_features = false, features = [
+  "glow",
   "default",
   "__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
 ] }
diff --git a/tests/test_inline_glow_paint/src/main.rs b/tests/test_inline_glow_paint/src/main.rs
index 576934bf3..fd4abc35f 100644
--- a/tests/test_inline_glow_paint/src/main.rs
+++ b/tests/test_inline_glow_paint/src/main.rs
@@ -30,6 +30,10 @@ struct MyTestApp {}
 
 impl eframe::App for MyTestApp {
     fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
+        egui::Panel::top("top").show_inside(ui, |ui| {
+            ui.label("This is a test of painting directly with glow.");
+        });
+
         use glow::HasContext as _;
         let gl = frame.gl().unwrap();
 
@@ -43,6 +47,21 @@ impl eframe::App for MyTestApp {
 
         egui::Window::new("Floating Window").show(ui.ctx(), |ui| {
             ui.label("The background should be purple.");
+            ui.label(format!(
+                "is_pointer_over_egui: {}",
+                ui.is_pointer_over_egui()
+            ));
+            ui.label(format!(
+                "egui_wants_pointer_input: {}",
+                ui.egui_wants_pointer_input()
+            ));
+            ui.label(format!(
+                "egui_is_using_pointer: {}",
+                ui.egui_is_using_pointer()
+            ));
+            if let Some(pos) = ui.pointer_latest_pos() {
+                ui.label(format!("layer_id_at: {:?}", ui.layer_id_at(pos)));
+            }
         });
     }
 }
diff --git a/tests/test_viewports/src/main.rs b/tests/test_viewports/src/main.rs
index 3330c1313..25787c912 100644
--- a/tests/test_viewports/src/main.rs
+++ b/tests/test_viewports/src/main.rs
@@ -416,16 +416,7 @@ fn drag_source<R>(
 ) -> InnerResponse<R> {
     let is_being_dragged = ui.ctx().is_being_dragged(id);
 
-    if !is_being_dragged {
-        let res = ui.scope(body);
-
-        // Check for drags:
-        let response = ui.interact(res.response.rect, id, egui::Sense::drag());
-        if response.hovered() {
-            ui.set_cursor_icon(egui::CursorIcon::Grab);
-        }
-        res
-    } else {
+    if is_being_dragged {
         ui.set_cursor_icon(egui::CursorIcon::Grabbing);
 
         // Paint the body to a new layer:
@@ -440,6 +431,15 @@ fn drag_source<R>(
             );
         }
 
+        res
+    } else {
+        let res = ui.scope(body);
+
+        // Check for drags:
+        let response = ui.interact(res.response.rect, id, egui::Sense::drag());
+        if response.hovered() {
+            ui.set_cursor_icon(egui::CursorIcon::Grab);
+        }
         res
     }
 }
diff --git a/web_demo/favicon.ico b/web_demo/favicon.ico
old mode 100755
new mode 100644
index 61ad031aa..59a822c61
Binary files a/web_demo/favicon.ico and b/web_demo/favicon.ico differ