From a34e42a770cf16e13b225d477fa9e722c47cba79 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Wed, 17 Jun 2026 13:18:58 -0700
Subject: [PATCH 1/5] Fix sharpness, sampling, gradients, etc on low-res
 screens

See: <https://github.com/makepad/makepad/pull/1127>

Also make the dock tab gradient a bit darker for more contrast

Fixes #926
---
 Cargo.lock                    | 170 +++++++++++++++++-----------------
 Cargo.toml                    |   4 +-
 src/home/light_themed_dock.rs |   7 +-
 3 files changed, 93 insertions(+), 88 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f85ed0b4c..d08782892 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "accessory"
@@ -610,7 +610,7 @@ dependencies = [
 [[package]]
 name = "bitflags"
 version = "2.10.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "bitmaps"
@@ -728,7 +728,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "byteorder"
@@ -739,7 +739,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "bytes"
@@ -1954,9 +1954,9 @@ dependencies = [
 [[package]]
 name = "fxhash"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
- "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
 ]
 
 [[package]]
@@ -2944,7 +2944,7 @@ dependencies = [
 [[package]]
 name = "makepad-apple-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-objc-sys",
 ]
@@ -2952,12 +2952,12 @@ dependencies = [
 [[package]]
 name = "makepad-byteorder-lite"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "makepad-code-editor"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-widgets",
 ]
@@ -2965,7 +2965,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -2973,7 +2973,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -2982,7 +2982,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -2999,15 +2999,15 @@ dependencies = [
  "rustybuzz",
  "sdfer",
  "serde",
- "unicode-bidi 0.3.18 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "unicode-bidi 0.3.18 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "unicode-linebreak",
- "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
 ]
 
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3015,22 +3015,22 @@ dependencies = [
 [[package]]
 name = "makepad-filesystem-watcher"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "makepad-futures"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "makepad-gif"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "weezl",
 ]
@@ -3038,7 +3038,7 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-live-id",
 ]
@@ -3052,7 +3052,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-latex-math"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "ttf-parser",
 ]
@@ -3060,7 +3060,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-live-id-macros",
  "serde",
@@ -3069,7 +3069,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3077,7 +3077,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-reload-core"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-filesystem-watcher",
 ]
@@ -3085,7 +3085,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3093,12 +3093,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -3107,7 +3107,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3115,7 +3115,7 @@ dependencies = [
 [[package]]
 name = "makepad-network"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-apple-sys",
  "makepad-error-log",
@@ -3129,15 +3129,15 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "makepad-platform"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "ash",
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "ctrlc",
  "hilog-sys",
  "makepad-android-state",
@@ -3159,7 +3159,7 @@ dependencies = [
  "napi-derive-ohos",
  "napi-ohos",
  "ohos-sys",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "wayland-client",
  "wayland-egl",
  "wayland-protocols",
@@ -3171,12 +3171,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -3184,13 +3184,13 @@ dependencies = [
  "makepad-math",
  "makepad-regex",
  "makepad-script-derive",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
 ]
 
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3198,7 +3198,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-std"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-network",
  "makepad-script",
@@ -3207,14 +3207,14 @@ dependencies = [
 [[package]]
 name = "makepad-shared-bytes"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "makepad-studio-protocol"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "makepad-error-log",
  "makepad-live-id",
  "makepad-micro-serde",
@@ -3224,7 +3224,7 @@ dependencies = [
 [[package]]
 name = "makepad-svg"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-html",
  "makepad-live-id",
@@ -3233,7 +3233,7 @@ dependencies = [
 [[package]]
 name = "makepad-tsdf"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-math",
  "makepad-micro-serde",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -3251,7 +3251,7 @@ dependencies = [
 [[package]]
 name = "makepad-webp"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-byteorder-lite",
 ]
@@ -3259,7 +3259,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -3268,13 +3268,13 @@ dependencies = [
  "pulldown-cmark 0.12.2",
  "serde",
  "ttf-parser",
- "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
 ]
 
 [[package]]
 name = "makepad-zune-bmp"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "log",
  "makepad-zune-core",
@@ -3283,7 +3283,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "log",
 ]
@@ -3291,7 +3291,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "simd-adler32",
 ]
@@ -3299,7 +3299,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.5.15"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3307,7 +3307,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -3316,7 +3316,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-qoi"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3702,7 +3702,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 [[package]]
 name = "memchr"
 version = "2.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "mime"
@@ -4495,10 +4495,10 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
 version = "0.12.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
- "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
+ "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "unicase 2.9.0",
 ]
 
@@ -5383,12 +5383,12 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 [[package]]
 name = "rustybuzz"
 version = "0.18.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
- "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "bytemuck",
  "makepad-error-log",
- "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview)",
+ "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "ttf-parser",
  "unicode-bidi-mirroring",
  "unicode-ccc",
@@ -5483,7 +5483,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdfer"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "sealed"
@@ -5782,7 +5782,7 @@ dependencies = [
 [[package]]
 name = "simd-adler32"
 version = "0.3.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "siphasher"
@@ -5808,7 +5808,7 @@ dependencies = [
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "socket2"
@@ -6589,7 +6589,7 @@ dependencies = [
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "tungstenite"
@@ -6641,7 +6641,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 [[package]]
 name = "unicase"
 version = "2.9.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "unicode-bidi"
@@ -6652,17 +6652,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "unicode-bidi-mirroring"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "unicode-ident"
@@ -6673,7 +6673,7 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.5"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "unicode-normalization"
@@ -6693,12 +6693,12 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 [[package]]
 name = "unicode-properties"
 version = "0.1.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "unicode-script"
 version = "0.5.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6709,7 +6709,7 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "unicode-width"
@@ -7041,7 +7041,7 @@ dependencies = [
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "downcast-rs",
  "libc",
@@ -7053,7 +7053,7 @@ dependencies = [
 [[package]]
 name = "wayland-client"
 version = "0.31.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc",
@@ -7063,7 +7063,7 @@ dependencies = [
 [[package]]
 name = "wayland-egl"
 version = "0.32.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "wayland-backend",
  "wayland-sys",
@@ -7072,7 +7072,7 @@ dependencies = [
 [[package]]
 name = "wayland-protocols"
 version = "0.32.10"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-backend",
@@ -7082,7 +7082,7 @@ dependencies = [
 [[package]]
 name = "wayland-sys"
 version = "0.31.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "log",
  "pkg-config",
@@ -7142,7 +7142,7 @@ dependencies = [
 [[package]]
 name = "weezl"
 version = "0.1.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "whoami"
@@ -7195,7 +7195,7 @@ dependencies = [
 [[package]]
 name = "windows"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "windows-collections 0.3.2",
  "windows-core 0.62.2",
@@ -7214,7 +7214,7 @@ dependencies = [
 [[package]]
 name = "windows-collections"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7247,7 +7247,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "windows-link 0.2.1",
  "windows-result 0.4.1",
@@ -7268,7 +7268,7 @@ dependencies = [
 [[package]]
 name = "windows-future"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7332,7 +7332,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
 [[package]]
 name = "windows-link"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 
 [[package]]
 name = "windows-numerics"
@@ -7376,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "windows-result"
 version = "0.4.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -7393,7 +7393,7 @@ dependencies = [
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=ime_composition_preview#873593b6b2bbedfda0bc6ea444b78f0579c0264b"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
 dependencies = [
  "windows-link 0.2.1",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index cb18276af..c0e5756a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,8 +17,8 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 # makepad-widgets = { git = "https://github.com/makepad/makepad", branch = "dev", features = ["serde"] }
 # makepad-code-editor = { git = "https://github.com/makepad/makepad", branch = "dev" }
 
-makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "ime_composition_preview", features = ["serde"] }
-makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "ime_composition_preview" }
+makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "gl_sampling_fallback", features = ["serde"] }
+makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "gl_sampling_fallback" }
 
 
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
diff --git a/src/home/light_themed_dock.rs b/src/home/light_themed_dock.rs
index 8b2e03334..0ee9c7ed5 100644
--- a/src/home/light_themed_dock.rs
+++ b/src/home/light_themed_dock.rs
@@ -149,9 +149,14 @@ script_mod! {
         draw_bg +: {
             // Light blue-ish color, de-saturated from COLOR_ACTIVE_PRIMARY
             color: #E1EEFA
+            color_2: #E1EEFA
             // A slightly darker shade of the tab color for hover visibility
             color_hover: #C8DDEF
-            color_active: COLOR_ACTIVE_PRIMARY
+            color_2_hover: #C8DDEF
+            // Active (selected) tabs are a deeper blue, with a vertical gradient
+            // to a slightly lighter blue.
+            color_active: #0660FE
+            color_2_active: #398CFE
             // Remove the border and rounded corners from the default Tab style
             border_size: 0.0
             border_radius: 3.0

From 7e7f93aa10b9fc7705eb1259cd7f97a7831ce09d Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Tue, 23 Jun 2026 12:17:01 -0700
Subject: [PATCH 2/5] fix perf issues surrounding unnecessary redraws (see
 `new_batch` usage)

tweak icons to look better with the new SVG rendering functionality
that we added to makepad
---
 Cargo.lock                     | 148 ++++++++++++++++-----------------
 Cargo.toml                     |   4 +-
 resources/icons/add.svg        |   8 +-
 resources/icons/upload.svg     |  10 +--
 src/home/navigation_tab_bar.rs |   6 +-
 src/home/room_screen.rs        |   1 +
 src/room/room_input_bar.rs     |   1 +
 src/utils.rs                   |   6 +-
 8 files changed, 96 insertions(+), 88 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d08782892..9b92fbc79 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "accessory"
@@ -610,7 +610,7 @@ dependencies = [
 [[package]]
 name = "bitflags"
 version = "2.10.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "bitmaps"
@@ -728,7 +728,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "byteorder"
@@ -739,7 +739,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "bytes"
@@ -1954,7 +1954,7 @@ dependencies = [
 [[package]]
 name = "fxhash"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
 ]
@@ -2797,7 +2797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.53.4",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -2944,7 +2944,7 @@ dependencies = [
 [[package]]
 name = "makepad-apple-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-objc-sys",
 ]
@@ -2952,12 +2952,12 @@ dependencies = [
 [[package]]
 name = "makepad-byteorder-lite"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "makepad-code-editor"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-widgets",
 ]
@@ -2965,7 +2965,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -2973,7 +2973,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -2982,7 +2982,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -3007,7 +3007,7 @@ dependencies = [
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3015,22 +3015,22 @@ dependencies = [
 [[package]]
 name = "makepad-filesystem-watcher"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "makepad-futures"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "makepad-gif"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "weezl",
 ]
@@ -3038,7 +3038,7 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-live-id",
 ]
@@ -3052,7 +3052,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-latex-math"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "ttf-parser",
 ]
@@ -3060,7 +3060,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-live-id-macros",
  "serde",
@@ -3069,7 +3069,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3077,7 +3077,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-reload-core"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-filesystem-watcher",
 ]
@@ -3085,7 +3085,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3093,12 +3093,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -3107,7 +3107,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3115,7 +3115,7 @@ dependencies = [
 [[package]]
 name = "makepad-network"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-apple-sys",
  "makepad-error-log",
@@ -3129,12 +3129,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "makepad-platform"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "ash",
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
@@ -3171,12 +3171,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -3190,7 +3190,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3198,7 +3198,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-std"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-network",
  "makepad-script",
@@ -3207,12 +3207,12 @@ dependencies = [
 [[package]]
 name = "makepad-shared-bytes"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "makepad-studio-protocol"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "makepad-error-log",
@@ -3224,7 +3224,7 @@ dependencies = [
 [[package]]
 name = "makepad-svg"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-html",
  "makepad-live-id",
@@ -3233,7 +3233,7 @@ dependencies = [
 [[package]]
 name = "makepad-tsdf"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-math",
  "makepad-micro-serde",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -3251,7 +3251,7 @@ dependencies = [
 [[package]]
 name = "makepad-webp"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-byteorder-lite",
 ]
@@ -3259,7 +3259,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -3274,7 +3274,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-bmp"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "log",
  "makepad-zune-core",
@@ -3283,7 +3283,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "log",
 ]
@@ -3291,7 +3291,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "simd-adler32",
 ]
@@ -3299,7 +3299,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.5.15"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3307,7 +3307,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -3316,7 +3316,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-qoi"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3702,7 +3702,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 [[package]]
 name = "memchr"
 version = "2.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "mime"
@@ -4495,7 +4495,7 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
 version = "0.12.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
@@ -5383,7 +5383,7 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 [[package]]
 name = "rustybuzz"
 version = "0.18.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "bytemuck",
@@ -5483,7 +5483,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdfer"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "sealed"
@@ -5782,7 +5782,7 @@ dependencies = [
 [[package]]
 name = "simd-adler32"
 version = "0.3.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "siphasher"
@@ -5808,7 +5808,7 @@ dependencies = [
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "socket2"
@@ -6589,7 +6589,7 @@ dependencies = [
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "tungstenite"
@@ -6641,7 +6641,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 [[package]]
 name = "unicase"
 version = "2.9.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "unicode-bidi"
@@ -6652,17 +6652,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "unicode-bidi-mirroring"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "unicode-ident"
@@ -6673,7 +6673,7 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.5"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "unicode-normalization"
@@ -6693,12 +6693,12 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 [[package]]
 name = "unicode-properties"
 version = "0.1.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "unicode-script"
 version = "0.5.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6709,7 +6709,7 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "unicode-width"
@@ -7041,7 +7041,7 @@ dependencies = [
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "downcast-rs",
  "libc",
@@ -7053,7 +7053,7 @@ dependencies = [
 [[package]]
 name = "wayland-client"
 version = "0.31.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc",
@@ -7063,7 +7063,7 @@ dependencies = [
 [[package]]
 name = "wayland-egl"
 version = "0.32.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "wayland-backend",
  "wayland-sys",
@@ -7072,7 +7072,7 @@ dependencies = [
 [[package]]
 name = "wayland-protocols"
 version = "0.32.10"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-backend",
@@ -7082,7 +7082,7 @@ dependencies = [
 [[package]]
 name = "wayland-sys"
 version = "0.31.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "log",
  "pkg-config",
@@ -7142,7 +7142,7 @@ dependencies = [
 [[package]]
 name = "weezl"
 version = "0.1.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "whoami"
@@ -7195,7 +7195,7 @@ dependencies = [
 [[package]]
 name = "windows"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "windows-collections 0.3.2",
  "windows-core 0.62.2",
@@ -7214,7 +7214,7 @@ dependencies = [
 [[package]]
 name = "windows-collections"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7247,7 +7247,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "windows-link 0.2.1",
  "windows-result 0.4.1",
@@ -7268,7 +7268,7 @@ dependencies = [
 [[package]]
 name = "windows-future"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7332,7 +7332,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
 [[package]]
 name = "windows-link"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 
 [[package]]
 name = "windows-numerics"
@@ -7376,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "windows-result"
 version = "0.4.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -7393,7 +7393,7 @@ dependencies = [
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#b86dd2f7f23348b442b80a9db7840570dc0dad44"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
 dependencies = [
  "windows-link 0.2.1",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index c0e5756a9..207e9a0e6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -181,8 +181,8 @@ winresource = "0.1"
 all-features = true
 
 [profile.release]
-debug = false
-strip = "symbols"
+debug = true
+# strip = "symbols"
 
 ## An optimized profile for development, with full debug info and assertions.
 [profile.debug-opt]
diff --git a/resources/icons/add.svg b/resources/icons/add.svg
index d9b0c3644..17adbcd92 100644
--- a/resources/icons/add.svg
+++ b/resources/icons/add.svg
@@ -1,4 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
-  <path d="M12 5v14"/>
-  <path d="M5 12h14"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <!-- Rounded-cap "+" (Feather/Lucide style). Renders crisp now that the stroke AA fringe is
+       device-aware; round caps give the rounded stroke ends the toolbar/nav icons share. -->
+  <path d="M12 5 V19"/>
+  <path d="M5 12 H19"/>
 </svg>
diff --git a/resources/icons/upload.svg b/resources/icons/upload.svg
index 07226e4d9..6664005db 100644
--- a/resources/icons/upload.svg
+++ b/resources/icons/upload.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.5535 2.49392C12.4114 2.33852 12.2106 2.25 12 2.25C11.7894 2.25 11.5886 2.33852 11.4465 2.49392L7.44648 6.86892C7.16698 7.17462 7.18822 7.64902 7.49392 7.92852C7.79963 8.20802 8.27402 8.18678 8.55352 7.88108L11.25 4.9318V16C11.25 16.4142 11.5858 16.75 12 16.75C12.4142 16.75 12.75 16.4142 12.75 16V4.9318L15.4465 7.88108C15.726 8.18678 16.2004 8.20802 16.5061 7.92852C16.8118 7.64902 16.833 7.17462 16.5535 6.86892L12.5535 2.49392Z" fill="#1C274C"/>
-<path d="M3.75 15C3.75 14.5858 3.41422 14.25 3 14.25C2.58579 14.25 2.25 14.5858 2.25 15V15.0549C2.24998 16.4225 2.24996 17.5248 2.36652 18.3918C2.48754 19.2919 2.74643 20.0497 3.34835 20.6516C3.95027 21.2536 4.70814 21.5125 5.60825 21.6335C6.47522 21.75 7.57754 21.75 8.94513 21.75H15.0549C16.4225 21.75 17.5248 21.75 18.3918 21.6335C19.2919 21.5125 20.0497 21.2536 20.6517 20.6516C21.2536 20.0497 21.5125 19.2919 21.6335 18.3918C21.75 17.5248 21.75 16.4225 21.75 15.0549V15C21.75 14.5858 21.4142 14.25 21 14.25C20.5858 14.25 20.25 14.5858 20.25 15C20.25 16.4354 20.2484 17.4365 20.1469 18.1919C20.0482 18.9257 19.8678 19.3142 19.591 19.591C19.3142 19.8678 18.9257 20.0482 18.1919 20.1469C17.4365 20.2484 16.4354 20.25 15 20.25H9C7.56459 20.25 6.56347 20.2484 5.80812 20.1469C5.07435 20.0482 4.68577 19.8678 4.40901 19.591C4.13225 19.3142 3.9518 18.9257 3.85315 18.1919C3.75159 17.4365 3.75 16.4354 3.75 15Z" fill="#1C274C"/>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8"?>
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.5535 2.49392C12.4114 2.33852 12.2106 2.25 12 2.25C11.7894 2.25 11.5886 2.33852 11.4465 2.49392L7.44648 6.86892C7.16698 7.17462 7.18822 7.64902 7.49392 7.92852C7.79963 8.20802 8.27402 8.18678 8.55352 7.88108L11.25 4.9318V16C11.25 16.4142 11.5858 16.75 12 16.75C12.4142 16.75 12.75 16.4142 12.75 16V4.9318L15.4465 7.88108C15.726 8.18678 16.2004 8.20802 16.5061 7.92852C16.8118 7.64902 16.833 7.17462 16.5535 6.86892L12.5535 2.49392Z" fill="#1C274C" stroke="#1C274C" stroke-width="1.0" stroke-linejoin="round"/>
+<path d="M3.75 15C3.75 14.5858 3.41422 14.25 3 14.25C2.58579 14.25 2.25 14.5858 2.25 15V15.0549C2.24998 16.4225 2.24996 17.5248 2.36652 18.3918C2.48754 19.2919 2.74643 20.0497 3.34835 20.6516C3.95027 21.2536 4.70814 21.5125 5.60825 21.6335C6.47522 21.75 7.57754 21.75 8.94513 21.75H15.0549C16.4225 21.75 17.5248 21.75 18.3918 21.6335C19.2919 21.5125 20.0497 21.2536 20.6517 20.6516C21.2536 20.0497 21.5125 19.2919 21.6335 18.3918C21.75 17.5248 21.75 16.4225 21.75 15.0549V15C21.75 14.5858 21.4142 14.25 21 14.25C20.5858 14.25 20.25 14.5858 20.25 15C20.25 16.4354 20.2484 17.4365 20.1469 18.1919C20.0482 18.9257 19.8678 19.3142 19.591 19.591C19.3142 19.8678 18.9257 20.0482 18.1919 20.1469C17.4365 20.2484 16.4354 20.25 15 20.25H9C7.56459 20.25 6.56347 20.2484 5.80812 20.1469C5.07435 20.0482 4.68577 19.8678 4.40901 19.591C4.13225 19.3142 3.9518 18.9257 3.85315 18.1919C3.75159 17.4365 3.75 16.4354 3.75 15Z" fill="#1C274C" stroke="#1C274C" stroke-width="1.0" stroke-linejoin="round"/>
+</svg>
diff --git a/src/home/navigation_tab_bar.rs b/src/home/navigation_tab_bar.rs
index 037c8988d..d3b80357e 100644
--- a/src/home/navigation_tab_bar.rs
+++ b/src/home/navigation_tab_bar.rs
@@ -140,8 +140,8 @@ script_mod! {
             margin: 0,
             icon_walk: Walk {
                 margin: 0,
-                width: 30,
-                height: 30
+                width: 27,
+                height: 27
             }
             draw_icon +: {
                 color: (COLOR_NAVIGATION_TAB_FG)
@@ -173,6 +173,7 @@ script_mod! {
 
     mod.widgets.NavigationTabBar = #(NavigationTabBar::register_widget(vm)) {
         Desktop := RoundedView {
+            new_batch: true,
             flow: Down,
             align: Align{x: 0.5}
             padding: Inset{
@@ -206,6 +207,7 @@ script_mod! {
         }
 
         Mobile := RoundedView {
+            new_batch: true,
             flow: Right
             align: Align{x: 0.5, y: 0.5}
             width: Fill,
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index fb9842e9c..b205fb046 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -618,6 +618,7 @@ script_mod! {
         height: Fill,
         align: Align{x: 0.5, y: 0.0} // center horizontally, align to top vertically
         flow: Overlay,
+        new_batch: true
 
         list := PortalList {
             height: Fill,
diff --git a/src/room/room_input_bar.rs b/src/room/room_input_bar.rs
index 374e014e9..589cce8ee 100644
--- a/src/room/room_input_bar.rs
+++ b/src/room/room_input_bar.rs
@@ -35,6 +35,7 @@ script_mod! {
         width: Fill,
         height: Fit{max: FitBound.Rel{base: Base.Full, factor: 0.75}}
         flow: Down,
+        new_batch: true
 
         // These margins are a hack to make the borders of the RoomInputBar
         // line up with the boundaries of its parent widgets.
diff --git a/src/utils.rs b/src/utils.rs
index abfd3efde..b7aeb70e1 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -511,8 +511,10 @@ impl From<MediaThumbnailSettingsConst> for MediaThumbnailSettings {
 pub const AVATAR_THUMBNAIL_FORMAT: MediaFormatConst = MediaFormatConst::Thumbnail(
     MediaThumbnailSettingsConst {
         method: Method::Scale,
-        width: 40,
-        height: 40,
+        // while we typically show avatars at around 40x40,
+        // fetching a higher quality one is needed for good downscaling.
+        width: 192,
+        height: 192,
         animated: false,
     }
 );

From f90c29b4f9b418b7ea93a6c3c878b01dfae8c351 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Thu, 25 Jun 2026 15:08:22 -0700
Subject: [PATCH 3/5] Try to adjust the unread badge to look good on low-res
 screens

---
 Cargo.lock                   | 148 +++++++++++++++++------------------
 Cargo.toml                   |   1 -
 src/home/rooms_list_entry.rs |   8 ++
 src/shared/unread_badge.rs   |  67 ++++++++++++----
 4 files changed, 134 insertions(+), 90 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9b92fbc79..838c814fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "accessory"
@@ -610,7 +610,7 @@ dependencies = [
 [[package]]
 name = "bitflags"
 version = "2.10.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "bitmaps"
@@ -728,7 +728,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "byteorder"
@@ -739,7 +739,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "bytes"
@@ -1954,7 +1954,7 @@ dependencies = [
 [[package]]
 name = "fxhash"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
 ]
@@ -2797,7 +2797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.53.4",
 ]
 
 [[package]]
@@ -2944,7 +2944,7 @@ dependencies = [
 [[package]]
 name = "makepad-apple-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-objc-sys",
 ]
@@ -2952,12 +2952,12 @@ dependencies = [
 [[package]]
 name = "makepad-byteorder-lite"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "makepad-code-editor"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-widgets",
 ]
@@ -2965,7 +2965,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -2973,7 +2973,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -2982,7 +2982,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -3007,7 +3007,7 @@ dependencies = [
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3015,22 +3015,22 @@ dependencies = [
 [[package]]
 name = "makepad-filesystem-watcher"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "makepad-futures"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "makepad-gif"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "weezl",
 ]
@@ -3038,7 +3038,7 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-live-id",
 ]
@@ -3052,7 +3052,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-latex-math"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "ttf-parser",
 ]
@@ -3060,7 +3060,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-live-id-macros",
  "serde",
@@ -3069,7 +3069,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3077,7 +3077,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-reload-core"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-filesystem-watcher",
 ]
@@ -3085,7 +3085,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3093,12 +3093,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -3107,7 +3107,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3115,7 +3115,7 @@ dependencies = [
 [[package]]
 name = "makepad-network"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-apple-sys",
  "makepad-error-log",
@@ -3129,12 +3129,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "makepad-platform"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "ash",
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
@@ -3171,12 +3171,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -3190,7 +3190,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3198,7 +3198,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-std"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-network",
  "makepad-script",
@@ -3207,12 +3207,12 @@ dependencies = [
 [[package]]
 name = "makepad-shared-bytes"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "makepad-studio-protocol"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "makepad-error-log",
@@ -3224,7 +3224,7 @@ dependencies = [
 [[package]]
 name = "makepad-svg"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-html",
  "makepad-live-id",
@@ -3233,7 +3233,7 @@ dependencies = [
 [[package]]
 name = "makepad-tsdf"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-math",
  "makepad-micro-serde",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -3251,7 +3251,7 @@ dependencies = [
 [[package]]
 name = "makepad-webp"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-byteorder-lite",
 ]
@@ -3259,7 +3259,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -3274,7 +3274,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-bmp"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "log",
  "makepad-zune-core",
@@ -3283,7 +3283,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "log",
 ]
@@ -3291,7 +3291,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "simd-adler32",
 ]
@@ -3299,7 +3299,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.5.15"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3307,7 +3307,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -3316,7 +3316,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-qoi"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3702,7 +3702,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 [[package]]
 name = "memchr"
 version = "2.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "mime"
@@ -4495,7 +4495,7 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
 version = "0.12.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
@@ -5383,7 +5383,7 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 [[package]]
 name = "rustybuzz"
 version = "0.18.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "bytemuck",
@@ -5483,7 +5483,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdfer"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "sealed"
@@ -5782,7 +5782,7 @@ dependencies = [
 [[package]]
 name = "simd-adler32"
 version = "0.3.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "siphasher"
@@ -5808,7 +5808,7 @@ dependencies = [
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "socket2"
@@ -6589,7 +6589,7 @@ dependencies = [
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "tungstenite"
@@ -6641,7 +6641,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 [[package]]
 name = "unicase"
 version = "2.9.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "unicode-bidi"
@@ -6652,17 +6652,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "unicode-bidi-mirroring"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "unicode-ident"
@@ -6673,7 +6673,7 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.5"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "unicode-normalization"
@@ -6693,12 +6693,12 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 [[package]]
 name = "unicode-properties"
 version = "0.1.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "unicode-script"
 version = "0.5.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6709,7 +6709,7 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "unicode-width"
@@ -7041,7 +7041,7 @@ dependencies = [
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "downcast-rs",
  "libc",
@@ -7053,7 +7053,7 @@ dependencies = [
 [[package]]
 name = "wayland-client"
 version = "0.31.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc",
@@ -7063,7 +7063,7 @@ dependencies = [
 [[package]]
 name = "wayland-egl"
 version = "0.32.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "wayland-backend",
  "wayland-sys",
@@ -7072,7 +7072,7 @@ dependencies = [
 [[package]]
 name = "wayland-protocols"
 version = "0.32.10"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-backend",
@@ -7082,7 +7082,7 @@ dependencies = [
 [[package]]
 name = "wayland-sys"
 version = "0.31.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "log",
  "pkg-config",
@@ -7142,7 +7142,7 @@ dependencies = [
 [[package]]
 name = "weezl"
 version = "0.1.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "whoami"
@@ -7195,7 +7195,7 @@ dependencies = [
 [[package]]
 name = "windows"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "windows-collections 0.3.2",
  "windows-core 0.62.2",
@@ -7214,7 +7214,7 @@ dependencies = [
 [[package]]
 name = "windows-collections"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7247,7 +7247,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "windows-link 0.2.1",
  "windows-result 0.4.1",
@@ -7268,7 +7268,7 @@ dependencies = [
 [[package]]
 name = "windows-future"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7332,7 +7332,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
 [[package]]
 name = "windows-link"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 
 [[package]]
 name = "windows-numerics"
@@ -7376,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "windows-result"
 version = "0.4.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -7393,7 +7393,7 @@ dependencies = [
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#1c7e83476dac3e47bb79623d0cf1ee8f2a1bb9bb"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
 dependencies = [
  "windows-link 0.2.1",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 207e9a0e6..14096ccec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,6 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "gl_sampling_fallback", features = ["serde"] }
 makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "gl_sampling_fallback" }
 
-
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
 robius-use-makepad = "0.1.1"
 robius-directories = { git = "https://github.com/project-robius/robius" }
diff --git a/src/home/rooms_list_entry.rs b/src/home/rooms_list_entry.rs
index 01f5441b1..7352c3917 100644
--- a/src/home/rooms_list_entry.rs
+++ b/src/home/rooms_list_entry.rs
@@ -180,6 +180,8 @@ script_mod! {
                     height: Fit
                     flow: Overlay
                     align: Align{ x: 1.0 }
+                    // Don't clip the unread badge's glow to this container's bounds.
+                    clip_x: false, clip_y: false
                     avatar := Avatar {}
                     unread_badge := UnreadBadge {}
                     tombstone_icon := mod.widgets.TombstoneIcon {}
@@ -200,6 +202,8 @@ script_mod! {
                     flow: Down
                     width: Fill, height: 56
                     align: Align{ x: 0.0, y: 0.0 }
+                    // Fixed-height view: don't clip the unread badge's glow off the top/bottom.
+                    clip_x: false, clip_y: false
                     top := View {
                         width: Fill, height: Fit,
                         spacing: 3,
@@ -211,12 +215,16 @@ script_mod! {
                         width: Fill, height: Fill,
                         spacing: 2,
                         flow: Right,
+                        // Don't clip the unread badge's glow off the top/bottom.
+                        clip_x: false, clip_y: false
                         preview := mod.widgets.MessagePreview {
                             margin: Inset{ top: 2.5 }
                         }
                         View {
                             width: Fit, height: Fit
                             align: Align{ x: 1.0 }
+                            // Don't clip the unread badge's glow to this container's bounds.
+                            clip_x: false, clip_y: false
                             unread_badge := UnreadBadge {}
                             tombstone_icon := mod.widgets.TombstoneIcon {}
                         }
diff --git a/src/shared/unread_badge.rs b/src/shared/unread_badge.rs
index ab184fa57..b225e0b93 100644
--- a/src/shared/unread_badge.rs
+++ b/src/shared/unread_badge.rs
@@ -10,30 +10,62 @@ script_mod! {
 
     mod.widgets.UnreadBadge = #(UnreadBadge::register_widget(vm)) {
 
-        width: 30, height: 20,
+        width: 27, height: 18,
         align: Align{ x: 0.5, y: 0.5 }
         flow: Overlay,
+        // Let the badge's fade-out/glow effect render beyond the badge's rect.
+        clip_x: false,
+        clip_y: false,
 
         rounded_view := View {
             width: Fill,
             height: Fill,
             show_bg: true,
+            clip_x: false,
+            clip_y: false,
+
             draw_bg +: {
                 badge_color: instance((COLOR_UNREAD_BADGE_MESSAGES)),
                 border_radius: instance(4.0)
-                // Set this border_size to a larger value to make the oval smaller 
+                // A larger border size results in a smaller oval
                 border_size: instance(2.0)
+                // For unread mention badges only, we fade through a lighter color to reduce aliasing effects
+                // on lower-res screens, since red on purple looks blocky/pixellated otherwise.
+                fade_color: instance(#xFFC8B0)
+                fade_radius: uniform(5.0)
+                // Controls the transition of the outer border. 
+                // 0.0 is a crisp solid badge, 1.0 is a soft fading/dissolve transition.
+                soft: instance(0.0)
 
-                pixel: fn() {
-                    let sdf = Sdf2d.viewport(self.pos * self.rect_size)
-                    sdf.box(
-                        self.border_size,
-                        1.0,
-                        self.rect_size.x - (self.border_size * 2.0),
-                        self.rect_size.y - 2.0,
-                        max(1.0, self.border_radius)
+                vertex: fn() {
+                    let m = self.fade_radius
+                    return self.clip_and_transform_vertex(
+                        self.rect_pos - vec2(m),
+                        self.rect_size + vec2(m * 2.0)
                     )
-                    sdf.fill_keep(self.badge_color);
+                }
+
+                pixel: fn() {
+                    let m = self.fade_radius
+                    let rs3 = self.rect_size + vec2(m * 2.0)
+                    let sdf = Sdf2d.viewport(self.pos * rs3)
+                    let bw = self.rect_size.x - (self.border_size * 2.0)
+                    let bh = self.rect_size.y - 2.0
+                    let bx = m + self.border_size
+                    let by = m + 1.0
+                    let rad = max(1.0, self.border_radius)
+                    sdf.box(bx, by, bw, bh, rad)
+                    let dist = sdf.shape
+                    let half = bh * 0.5
+                    let aa = clamp(0.5 - dist, 0.0, 1.0)
+                    let band_start = -half * 0.45
+                    let t = clamp((dist - band_start) / (m - band_start), 0.0, 1.0)
+                    let s = t * t * t * (t * (t * 6.0 - 15.0) + 10.0)
+                    let warm = mix(self.badge_color.rgb, self.fade_color.rgb, s)
+                    let dissolve = 1.0 - s
+                    let color = mix(self.badge_color.rgb, warm, self.soft)
+                    let alpha = mix(aa, dissolve, self.soft)
+                    sdf.clear(vec4(color, alpha))
                     return sdf.result;
                 }
             }
@@ -94,7 +126,10 @@ impl Widget for UnreadBadge {
             script_apply_eval!(cx, rounded_view, {
                 draw_bg +: {
                     border_size: #(border_size),
-                    badge_color: mod.widgets.COLOR_UNREAD_BADGE_MENTIONS
+                    // Solid red core fading out through a lighter warm color.
+                    badge_color: #xFF1133,
+                    fade_color: #xFFC8B0,
+                    soft: 1.0
                 }
             });
             self.visible = true;
@@ -105,8 +140,9 @@ impl Widget for UnreadBadge {
             let mut rounded_view = self.view(cx, ids!(rounded_view));
             script_apply_eval!(cx, rounded_view, {
                 draw_bg +: {
-                    border_size: 6.0, // larger value = smaller dot
-                    badge_color: mod.widgets.COLOR_UNREAD_BADGE_MARKED
+                    border_size: 6.0, // larger value = smaller badge size
+                    badge_color: mod.widgets.COLOR_UNREAD_BADGE_MARKED,
+                    soft: 0.0
                 }
             });
             self.visible = true;
@@ -120,7 +156,8 @@ impl Widget for UnreadBadge {
             script_apply_eval!(cx, rounded_view, {
                 draw_bg +: {
                     border_size: #(border_size),
-                    badge_color: mod.widgets.COLOR_UNREAD_BADGE_MESSAGES
+                    badge_color: mod.widgets.COLOR_UNREAD_BADGE_MESSAGES,
+                    soft: 0.0
                 }
             });
             self.visible = true;

From 6d2563a033d1784be58cdc1a57ce3ecba53fd192 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Tue, 30 Jun 2026 13:27:57 -0700
Subject: [PATCH 4/5] Decode avatar images asynchronously on a bg thread

now uses Makepad's built-in image cache when showing avatars,
and they're cached using their MxcUri as the cache key

Aslo, update makepad to get our improvements to Windows performance
---
 Cargo.lock           | 148 +++++++++++++++++++++----------------------
 src/shared/avatar.rs |  29 ++++++---
 2 files changed, 95 insertions(+), 82 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 838c814fc..3587fd8ea 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "accessory"
@@ -610,7 +610,7 @@ dependencies = [
 [[package]]
 name = "bitflags"
 version = "2.10.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "bitmaps"
@@ -728,7 +728,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "byteorder"
@@ -739,7 +739,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "bytes"
@@ -1954,7 +1954,7 @@ dependencies = [
 [[package]]
 name = "fxhash"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
 ]
@@ -2797,7 +2797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.53.4",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -2944,7 +2944,7 @@ dependencies = [
 [[package]]
 name = "makepad-apple-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-objc-sys",
 ]
@@ -2952,12 +2952,12 @@ dependencies = [
 [[package]]
 name = "makepad-byteorder-lite"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "makepad-code-editor"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-widgets",
 ]
@@ -2965,7 +2965,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -2973,7 +2973,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -2982,7 +2982,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -3007,7 +3007,7 @@ dependencies = [
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3015,22 +3015,22 @@ dependencies = [
 [[package]]
 name = "makepad-filesystem-watcher"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "makepad-futures"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "makepad-gif"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "weezl",
 ]
@@ -3038,7 +3038,7 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-live-id",
 ]
@@ -3052,7 +3052,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-latex-math"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "ttf-parser",
 ]
@@ -3060,7 +3060,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-live-id-macros",
  "serde",
@@ -3069,7 +3069,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3077,7 +3077,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-reload-core"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-filesystem-watcher",
 ]
@@ -3085,7 +3085,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3093,12 +3093,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -3107,7 +3107,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3115,7 +3115,7 @@ dependencies = [
 [[package]]
 name = "makepad-network"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-apple-sys",
  "makepad-error-log",
@@ -3129,12 +3129,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "makepad-platform"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "ash",
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
@@ -3171,12 +3171,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -3190,7 +3190,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3198,7 +3198,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-std"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-network",
  "makepad-script",
@@ -3207,12 +3207,12 @@ dependencies = [
 [[package]]
 name = "makepad-shared-bytes"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "makepad-studio-protocol"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "makepad-error-log",
@@ -3224,7 +3224,7 @@ dependencies = [
 [[package]]
 name = "makepad-svg"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-html",
  "makepad-live-id",
@@ -3233,7 +3233,7 @@ dependencies = [
 [[package]]
 name = "makepad-tsdf"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-math",
  "makepad-micro-serde",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -3251,7 +3251,7 @@ dependencies = [
 [[package]]
 name = "makepad-webp"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-byteorder-lite",
 ]
@@ -3259,7 +3259,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -3274,7 +3274,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-bmp"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "log",
  "makepad-zune-core",
@@ -3283,7 +3283,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "log",
 ]
@@ -3291,7 +3291,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "simd-adler32",
 ]
@@ -3299,7 +3299,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.5.15"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3307,7 +3307,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -3316,7 +3316,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-qoi"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3702,7 +3702,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 [[package]]
 name = "memchr"
 version = "2.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "mime"
@@ -4495,7 +4495,7 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
 version = "0.12.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
@@ -5383,7 +5383,7 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 [[package]]
 name = "rustybuzz"
 version = "0.18.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "bytemuck",
@@ -5483,7 +5483,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdfer"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "sealed"
@@ -5782,7 +5782,7 @@ dependencies = [
 [[package]]
 name = "simd-adler32"
 version = "0.3.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "siphasher"
@@ -5808,7 +5808,7 @@ dependencies = [
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "socket2"
@@ -6589,7 +6589,7 @@ dependencies = [
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "tungstenite"
@@ -6641,7 +6641,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 [[package]]
 name = "unicase"
 version = "2.9.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "unicode-bidi"
@@ -6652,17 +6652,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "unicode-bidi-mirroring"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "unicode-ident"
@@ -6673,7 +6673,7 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.5"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "unicode-normalization"
@@ -6693,12 +6693,12 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 [[package]]
 name = "unicode-properties"
 version = "0.1.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "unicode-script"
 version = "0.5.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6709,7 +6709,7 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "unicode-width"
@@ -7041,7 +7041,7 @@ dependencies = [
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "downcast-rs",
  "libc",
@@ -7053,7 +7053,7 @@ dependencies = [
 [[package]]
 name = "wayland-client"
 version = "0.31.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc",
@@ -7063,7 +7063,7 @@ dependencies = [
 [[package]]
 name = "wayland-egl"
 version = "0.32.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "wayland-backend",
  "wayland-sys",
@@ -7072,7 +7072,7 @@ dependencies = [
 [[package]]
 name = "wayland-protocols"
 version = "0.32.10"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-backend",
@@ -7082,7 +7082,7 @@ dependencies = [
 [[package]]
 name = "wayland-sys"
 version = "0.31.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "log",
  "pkg-config",
@@ -7142,7 +7142,7 @@ dependencies = [
 [[package]]
 name = "weezl"
 version = "0.1.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "whoami"
@@ -7195,7 +7195,7 @@ dependencies = [
 [[package]]
 name = "windows"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "windows-collections 0.3.2",
  "windows-core 0.62.2",
@@ -7214,7 +7214,7 @@ dependencies = [
 [[package]]
 name = "windows-collections"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7247,7 +7247,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "windows-link 0.2.1",
  "windows-result 0.4.1",
@@ -7268,7 +7268,7 @@ dependencies = [
 [[package]]
 name = "windows-future"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7332,7 +7332,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
 [[package]]
 name = "windows-link"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 
 [[package]]
 name = "windows-numerics"
@@ -7376,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "windows-result"
 version = "0.4.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -7393,7 +7393,7 @@ dependencies = [
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#e0a76288608d743b5f9873013986304557d64e4a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
 dependencies = [
  "windows-link 0.2.1",
 ]
diff --git a/src/shared/avatar.rs b/src/shared/avatar.rs
index 7b05a6420..171cba750 100644
--- a/src/shared/avatar.rs
+++ b/src/shared/avatar.rs
@@ -301,15 +301,16 @@ impl Avatar {
             .or_else(try_get_cached_username_avatar)
             .unwrap_or((None, AvatarState::Unknown));
 
-        let (avatar_img_data_opt, profile_drawn) = match avatar_state {
-            AvatarState::Loaded(data) => (Some(data), true),
+        let (avatar_img_data_opt, profile_drawn, avatar_key) = match avatar_state {
+            AvatarState::Loaded(data) => (Some(data), true, None),
             AvatarState::Known(Some(uri)) => match avatar_cache::get_or_fetch_avatar(cx, &uri) {
-                AvatarCacheEntry::Loaded(data) => (Some(data), true),
-                AvatarCacheEntry::Failed => (None, true),
-                AvatarCacheEntry::Requested => (None, false),
+                // Use the avatar's MxcUri as a key for makepad's async image cache
+                AvatarCacheEntry::Loaded(data) => (Some(data), true, Some(uri.to_string())),
+                AvatarCacheEntry::Failed => (None, true, None),
+                AvatarCacheEntry::Requested => (None, false, None),
             },
-            AvatarState::Known(None) | AvatarState::Failed => (None, true),
-            AvatarState::Unknown => (None, false),
+            AvatarState::Known(None) | AvatarState::Failed => (None, true, None),
+            AvatarState::Unknown => (None, false, None),
         };
 
         // Set sender to the display name if available, otherwise the user id.
@@ -328,7 +329,19 @@ impl Avatar {
                         timeline_kind.room_id().to_owned(),
                         data.clone()
                     ))),
-                    |cx, img| utils::load_image(&img, cx, &data),
+                    |cx, img| {
+                        if let Some(key) = avatar_key.as_deref() {
+                            // Try to decode the image data asynchronously, which we can only do
+                            // if we have a key for the image cache (the avatar's MxcUri).
+                            img.load_image_from_data_async(
+                                cx,
+                                std::path::Path::new(key),
+                                Arc::clone(&data),
+                            )
+                        } else {
+                            utils::load_image(&img, cx, &data)
+                        }
+                    }
                 )
                 .ok()
             })

From b6129e363976824f4fce5a05879baa68581be926 Mon Sep 17 00:00:00 2001
From: Kevin Boos <kevinaboos@gmail.com>
Date: Tue, 30 Jun 2026 19:25:26 -0700
Subject: [PATCH 5/5] use makepad image cache for more avatars/images

---
 Cargo.lock                      | 148 ++++++++++++++++----------------
 Cargo.toml                      |   3 +
 src/home/room_screen.rs         |   3 +-
 src/shared/avatar.rs            |   2 +-
 src/shared/html_or_plaintext.rs |   2 +-
 src/utils.rs                    |  32 ++++++-
 6 files changed, 112 insertions(+), 78 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3587fd8ea..12b1178d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "accessory"
@@ -610,7 +610,7 @@ dependencies = [
 [[package]]
 name = "bitflags"
 version = "2.10.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "bitmaps"
@@ -728,7 +728,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 [[package]]
 name = "bytemuck"
 version = "1.25.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "byteorder"
@@ -739,7 +739,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 [[package]]
 name = "byteorder"
 version = "1.5.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "bytes"
@@ -1954,7 +1954,7 @@ dependencies = [
 [[package]]
 name = "fxhash"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
 ]
@@ -2797,7 +2797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
 dependencies = [
  "cfg-if",
- "windows-targets 0.48.5",
+ "windows-targets 0.53.4",
 ]
 
 [[package]]
@@ -2944,7 +2944,7 @@ dependencies = [
 [[package]]
 name = "makepad-apple-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-objc-sys",
 ]
@@ -2952,12 +2952,12 @@ dependencies = [
 [[package]]
 name = "makepad-byteorder-lite"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "makepad-code-editor"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-widgets",
 ]
@@ -2965,7 +2965,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -2973,7 +2973,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -2982,7 +2982,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -3007,7 +3007,7 @@ dependencies = [
 [[package]]
 name = "makepad-error-log"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3015,22 +3015,22 @@ dependencies = [
 [[package]]
 name = "makepad-filesystem-watcher"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "makepad-futures"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "makepad-gif"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "weezl",
 ]
@@ -3038,7 +3038,7 @@ dependencies = [
 [[package]]
 name = "makepad-html"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-live-id",
 ]
@@ -3052,7 +3052,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-latex-math"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "ttf-parser",
 ]
@@ -3060,7 +3060,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-live-id-macros",
  "serde",
@@ -3069,7 +3069,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3077,7 +3077,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-reload-core"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-filesystem-watcher",
 ]
@@ -3085,7 +3085,7 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-micro-serde",
 ]
@@ -3093,12 +3093,12 @@ dependencies = [
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -3107,7 +3107,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3115,7 +3115,7 @@ dependencies = [
 [[package]]
 name = "makepad-network"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-apple-sys",
  "makepad-error-log",
@@ -3129,12 +3129,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "makepad-platform"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "ash",
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
@@ -3171,12 +3171,12 @@ dependencies = [
 [[package]]
 name = "makepad-regex"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "makepad-script"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-error-log",
  "makepad-html",
@@ -3190,7 +3190,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-derive"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -3198,7 +3198,7 @@ dependencies = [
 [[package]]
 name = "makepad-script-std"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-network",
  "makepad-script",
@@ -3207,12 +3207,12 @@ dependencies = [
 [[package]]
 name = "makepad-shared-bytes"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "makepad-studio-protocol"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "makepad-error-log",
@@ -3224,7 +3224,7 @@ dependencies = [
 [[package]]
 name = "makepad-svg"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-html",
  "makepad-live-id",
@@ -3233,7 +3233,7 @@ dependencies = [
 [[package]]
 name = "makepad-tsdf"
 version = "0.1.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-math",
  "makepad-micro-serde",
@@ -3242,7 +3242,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "1.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -3251,7 +3251,7 @@ dependencies = [
 [[package]]
 name = "makepad-webp"
 version = "0.2.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-byteorder-lite",
 ]
@@ -3259,7 +3259,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "2.0.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -3274,7 +3274,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-bmp"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "log",
  "makepad-zune-core",
@@ -3283,7 +3283,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "log",
 ]
@@ -3291,7 +3291,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "simd-adler32",
 ]
@@ -3299,7 +3299,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.5.15"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3307,7 +3307,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -3316,7 +3316,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-qoi"
 version = "0.5.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -3702,7 +3702,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 [[package]]
 name = "memchr"
 version = "2.7.6"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "mime"
@@ -4495,7 +4495,7 @@ dependencies = [
 [[package]]
 name = "pulldown-cmark"
 version = "0.12.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
@@ -5383,7 +5383,7 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 [[package]]
 name = "rustybuzz"
 version = "0.18.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback)",
  "bytemuck",
@@ -5483,7 +5483,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 [[package]]
 name = "sdfer"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "sealed"
@@ -5782,7 +5782,7 @@ dependencies = [
 [[package]]
 name = "simd-adler32"
 version = "0.3.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "siphasher"
@@ -5808,7 +5808,7 @@ dependencies = [
 [[package]]
 name = "smallvec"
 version = "1.15.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "socket2"
@@ -6589,7 +6589,7 @@ dependencies = [
 [[package]]
 name = "ttf-parser"
 version = "0.24.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "tungstenite"
@@ -6641,7 +6641,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
 [[package]]
 name = "unicase"
 version = "2.9.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "unicode-bidi"
@@ -6652,17 +6652,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
 [[package]]
 name = "unicode-bidi"
 version = "0.3.18"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "unicode-bidi-mirroring"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "unicode-ccc"
 version = "0.3.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "unicode-ident"
@@ -6673,7 +6673,7 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
 [[package]]
 name = "unicode-linebreak"
 version = "0.1.5"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "unicode-normalization"
@@ -6693,12 +6693,12 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
 [[package]]
 name = "unicode-properties"
 version = "0.1.4"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "unicode-script"
 version = "0.5.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "unicode-segmentation"
@@ -6709,7 +6709,7 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 [[package]]
 name = "unicode-segmentation"
 version = "1.12.0"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "unicode-width"
@@ -7041,7 +7041,7 @@ dependencies = [
 [[package]]
 name = "wayland-backend"
 version = "0.3.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "downcast-rs",
  "libc",
@@ -7053,7 +7053,7 @@ dependencies = [
 [[package]]
 name = "wayland-client"
 version = "0.31.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc",
@@ -7063,7 +7063,7 @@ dependencies = [
 [[package]]
 name = "wayland-egl"
 version = "0.32.9"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "wayland-backend",
  "wayland-sys",
@@ -7072,7 +7072,7 @@ dependencies = [
 [[package]]
 name = "wayland-protocols"
 version = "0.32.10"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "wayland-backend",
@@ -7082,7 +7082,7 @@ dependencies = [
 [[package]]
 name = "wayland-sys"
 version = "0.31.8"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "log",
  "pkg-config",
@@ -7142,7 +7142,7 @@ dependencies = [
 [[package]]
 name = "weezl"
 version = "0.1.12"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "whoami"
@@ -7195,7 +7195,7 @@ dependencies = [
 [[package]]
 name = "windows"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "windows-collections 0.3.2",
  "windows-core 0.62.2",
@@ -7214,7 +7214,7 @@ dependencies = [
 [[package]]
 name = "windows-collections"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7247,7 +7247,7 @@ dependencies = [
 [[package]]
 name = "windows-core"
 version = "0.62.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "windows-link 0.2.1",
  "windows-result 0.4.1",
@@ -7268,7 +7268,7 @@ dependencies = [
 [[package]]
 name = "windows-future"
 version = "0.3.2"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "windows-core 0.62.2",
 ]
@@ -7332,7 +7332,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
 [[package]]
 name = "windows-link"
 version = "0.2.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 
 [[package]]
 name = "windows-numerics"
@@ -7376,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "windows-result"
 version = "0.4.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "windows-link 0.2.1",
 ]
@@ -7393,7 +7393,7 @@ dependencies = [
 [[package]]
 name = "windows-strings"
 version = "0.5.1"
-source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#a18cd8ab2d6d98f6ae65009890ee4b118457f47a"
+source = "git+https://github.com/kevinaboos/makepad?branch=gl_sampling_fallback#381603bf80428108b6daa0eb3999dae55d6a942d"
 dependencies = [
  "windows-link 0.2.1",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 14096ccec..f2fdf9689 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,6 +20,9 @@ metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "gl_sampling_fallback", features = ["serde"] }
 makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "gl_sampling_fallback" }
 
+# makepad-widgets = { path = "../makepad/widgets", features = ["serde"] }
+# makepad-code-editor = { path = "../makepad/code_editor" }
+
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
 robius-use-makepad = "0.1.1"
 robius-directories = { git = "https://github.com/project-robius/robius" }
diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs
index b205fb046..5016a2e47 100644
--- a/src/home/room_screen.rs
+++ b/src/home/room_screen.rs
@@ -4240,8 +4240,9 @@ fn populate_image_message_content(
     let mut fetch_and_show_media_source = |cx: &mut Cx, media_source: MediaSource, image_info: Box<ImageInfo>| {
         match media_cache.try_get_media_or_fetch(&media_source, MEDIA_THUMBNAIL_FORMAT.into()) {
             (MediaCacheEntry::Loaded(data), _media_format) => {
+                let cache_key = media_source_mxc(&media_source).to_string();
                 let show_image_result = text_or_image_ref.show_image(cx, Some(media_source), |cx, img| {
-                    utils::load_image(&img, cx, &data)
+                    img.load_image_from_data_async(cx, std::path::Path::new(&cache_key), Arc::clone(&data))
                         .map(|()| img.size_in_pixels(cx).unwrap_or_default())
                 });
                 if let Err(e) = show_image_result {
diff --git a/src/shared/avatar.rs b/src/shared/avatar.rs
index 171cba750..2ff3a7aea 100644
--- a/src/shared/avatar.rs
+++ b/src/shared/avatar.rs
@@ -339,7 +339,7 @@ impl Avatar {
                                 Arc::clone(&data),
                             )
                         } else {
-                            utils::load_image(&img, cx, &data)
+                            utils::load_image_cached(&img, cx, Arc::clone(&data))
                         }
                     }
                 )
diff --git a/src/shared/html_or_plaintext.rs b/src/shared/html_or_plaintext.rs
index dab7bf404..34c4760c4 100644
--- a/src/shared/html_or_plaintext.rs
+++ b/src/shared/html_or_plaintext.rs
@@ -503,7 +503,7 @@ impl MatrixLinkPill {
             let res = avatar_ref.show_image(
                 cx,
                 None, // Don't make this avatar clickable
-                |cx, img_ref| utils::load_image(&img_ref, cx, &data),
+                |cx, img_ref| utils::load_image_cached(&img_ref, cx, Arc::clone(&data)),
             );
             if res.is_ok() {
                 return;
diff --git a/src/utils.rs b/src/utils.rs
index b7aeb70e1..dd63109e5 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -102,7 +102,37 @@ pub fn is_supported_image_mimetype(mimetype: &str) -> bool {
 ///
 /// Returns an error if the format is unsupported or decoding fails.
 pub fn load_image(img: &ImageRef, cx: &mut Cx, data: &[u8]) -> Result<(), ImageError> {
-    img.load_image_from_data(cx, data)
+    load_image_cached(img, cx, std::sync::Arc::<[u8]>::from(data))
+}
+
+/// Returns a cache key for the given encoded image `data`.
+pub fn image_cache_key(data: &[u8]) -> std::path::PathBuf {
+    use std::hash::{Hash, Hasher};
+    let mut hasher = std::collections::hash_map::DefaultHasher::new();
+    let len = data.len();
+    // Hash only the length plus a small sample of the bytes.
+    const SAMPLE: usize = 256;
+    len.hash(&mut hasher);
+    if len <= 2 * SAMPLE {
+        data.hash(&mut hasher);
+    } else {
+        data[..SAMPLE].hash(&mut hasher);
+        data[len - SAMPLE..].hash(&mut hasher);
+    }
+    std::path::PathBuf::from(format!("robrix-img-cache://{:016x}-{}", hasher.finish(), len))
+}
+
+/// Loads the encoded image `data` into the given ImageRef widget using makepad's async image cache.
+pub fn load_image_cached<D>(
+    img: &ImageRef,
+    cx: &mut Cx,
+    data: std::sync::Arc<D>,
+) -> Result<(), ImageError>
+where
+    D: AsRef<[u8]> + Send + Sync + ?Sized + 'static,
+{
+    let key = image_cache_key(data.as_ref().as_ref());
+    img.load_image_from_data_async(cx, &key, data)
 }