From 77f323ee178a5cb8a1ff4a5717c321962423e1b4 Mon Sep 17 00:00:00 2001 From: Kevin Boos Date: Thu, 2 Apr 2026 01:12:58 -0700 Subject: [PATCH] Update makepad; use the improved PortalList smooth scroll feature --- Cargo.lock | 162 ++++++++++++++++++++-------------------- Cargo.toml | 7 +- src/home/room_screen.rs | 12 +-- src/home/rooms_list.rs | 3 +- src/home/spaces_bar.rs | 3 +- 5 files changed, 90 insertions(+), 97 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18222a14a..0570f063e 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/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "accessory" @@ -610,7 +610,7 @@ dependencies = [ [[package]] name = "bitflags" version = "2.10.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "bitmaps" @@ -728,7 +728,7 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytemuck" version = "1.25.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "byteorder" @@ -739,7 +739,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "byteorder" version = "1.5.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "bytes" @@ -1936,9 +1936,9 @@ dependencies = [ [[package]] name = "fxhash" version = "0.2.1" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ - "byteorder 1.5.0 (git+https://github.com/makepad/makepad?branch=dev)", + "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", ] [[package]] @@ -2953,7 +2953,7 @@ dependencies = [ [[package]] name = "makepad-apple-sys" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-objc-sys", ] @@ -2961,12 +2961,12 @@ dependencies = [ [[package]] name = "makepad-byteorder-lite" version = "0.1.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "makepad-code-editor" version = "2.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-widgets", ] @@ -2974,7 +2974,7 @@ dependencies = [ [[package]] name = "makepad-derive-wasm-bridge" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-micro-proc-macro", ] @@ -2982,7 +2982,7 @@ dependencies = [ [[package]] name = "makepad-derive-widget" version = "2.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-live-id", "makepad-micro-proc-macro", @@ -2991,7 +2991,7 @@ dependencies = [ [[package]] name = "makepad-draw" version = "2.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "ab_glyph_rasterizer", "fxhash", @@ -3005,15 +3005,15 @@ dependencies = [ "rustybuzz", "sdfer", "serde", - "unicode-bidi 0.3.18 (git+https://github.com/makepad/makepad?branch=dev)", + "unicode-bidi 0.3.18 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", "unicode-linebreak", - "unicode-segmentation 1.12.0 (git+https://github.com/makepad/makepad?branch=dev)", + "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", ] [[package]] name = "makepad-error-log" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-micro-serde", ] @@ -3021,22 +3021,22 @@ dependencies = [ [[package]] name = "makepad-filesystem-watcher" version = "0.1.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "makepad-futures" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "makepad-futures-legacy" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "makepad-html" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-live-id", ] @@ -3050,7 +3050,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064" [[package]] name = "makepad-latex-math" version = "0.1.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "ttf-parser", ] @@ -3058,7 +3058,7 @@ dependencies = [ [[package]] name = "makepad-live-id" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-live-id-macros", "serde", @@ -3067,7 +3067,7 @@ dependencies = [ [[package]] name = "makepad-live-id-macros" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-micro-proc-macro", ] @@ -3075,7 +3075,7 @@ dependencies = [ [[package]] name = "makepad-live-reload-core" version = "0.1.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-filesystem-watcher", ] @@ -3083,7 +3083,7 @@ dependencies = [ [[package]] name = "makepad-math" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-micro-serde", ] @@ -3091,12 +3091,12 @@ dependencies = [ [[package]] name = "makepad-micro-proc-macro" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "makepad-micro-serde" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-live-id", "makepad-micro-serde-derive", @@ -3105,7 +3105,7 @@ dependencies = [ [[package]] name = "makepad-micro-serde-derive" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-micro-proc-macro", ] @@ -3113,7 +3113,7 @@ dependencies = [ [[package]] name = "makepad-network" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-apple-sys", "makepad-error-log", @@ -3127,15 +3127,15 @@ dependencies = [ [[package]] name = "makepad-objc-sys" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "makepad-platform" version = "2.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "ash", - "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)", + "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", "hilog-sys", "makepad-android-state", "makepad-apple-sys", @@ -3156,7 +3156,7 @@ dependencies = [ "napi-derive-ohos", "napi-ohos", "ohos-sys", - "smallvec 1.15.1 (git+https://github.com/makepad/makepad?branch=dev)", + "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", "wayland-client", "wayland-egl", "wayland-protocols", @@ -3168,12 +3168,12 @@ dependencies = [ [[package]] name = "makepad-regex" version = "0.1.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "makepad-script" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-error-log", "makepad-html", @@ -3181,13 +3181,13 @@ dependencies = [ "makepad-math", "makepad-regex", "makepad-script-derive", - "smallvec 1.15.1 (git+https://github.com/makepad/makepad?branch=dev)", + "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", ] [[package]] name = "makepad-script-derive" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-micro-proc-macro", ] @@ -3195,7 +3195,7 @@ dependencies = [ [[package]] name = "makepad-script-std" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-network", "makepad-script", @@ -3204,14 +3204,14 @@ dependencies = [ [[package]] name = "makepad-shared-bytes" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "makepad-studio-protocol" version = "0.1.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ - "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)", + "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", "makepad-error-log", "makepad-live-id", "makepad-micro-serde", @@ -3221,7 +3221,7 @@ dependencies = [ [[package]] name = "makepad-svg" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-html", "makepad-live-id", @@ -3230,7 +3230,7 @@ dependencies = [ [[package]] name = "makepad-tsdf" version = "0.1.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-math", "makepad-micro-serde", @@ -3239,7 +3239,7 @@ dependencies = [ [[package]] name = "makepad-wasm-bridge" version = "1.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-derive-wasm-bridge", "makepad-live-id", @@ -3248,7 +3248,7 @@ dependencies = [ [[package]] name = "makepad-webp" version = "0.2.4" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-byteorder-lite", ] @@ -3256,7 +3256,7 @@ dependencies = [ [[package]] name = "makepad-widgets" version = "2.0.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-derive-widget", "makepad-draw", @@ -3265,18 +3265,18 @@ dependencies = [ "pulldown-cmark 0.12.2", "serde", "ttf-parser", - "unicode-segmentation 1.12.0 (git+https://github.com/makepad/makepad?branch=dev)", + "unicode-segmentation 1.12.0 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", ] [[package]] name = "makepad-zune-core" version = "0.5.1" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "makepad-zune-inflate" version = "0.2.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "simd-adler32", ] @@ -3284,7 +3284,7 @@ dependencies = [ [[package]] name = "makepad-zune-jpeg" version = "0.5.12" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-zune-core", ] @@ -3292,7 +3292,7 @@ dependencies = [ [[package]] name = "makepad-zune-png" version = "0.5.1" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "makepad-zune-core", "makepad-zune-inflate", @@ -3688,7 +3688,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memchr" version = "2.7.6" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "mime" @@ -4420,10 +4420,10 @@ dependencies = [ [[package]] name = "pulldown-cmark" version = "0.12.2" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ - "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)", - "memchr 2.7.6 (git+https://github.com/makepad/makepad?branch=dev)", + "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", + "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", "unicase 2.9.0", ] @@ -5182,12 +5182,12 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" [[package]] name = "rustybuzz" version = "0.18.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ - "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)", + "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", "bytemuck", "makepad-error-log", - "smallvec 1.15.1 (git+https://github.com/makepad/makepad?branch=dev)", + "smallvec 1.15.1 (git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix)", "ttf-parser", "unicode-bidi-mirroring", "unicode-ccc", @@ -5282,7 +5282,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sdfer" version = "0.2.1" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "sealed" @@ -5581,7 +5581,7 @@ dependencies = [ [[package]] name = "simd-adler32" version = "0.3.8" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "siphasher" @@ -5607,7 +5607,7 @@ dependencies = [ [[package]] name = "smallvec" version = "1.15.1" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "socket2" @@ -6373,7 +6373,7 @@ dependencies = [ [[package]] name = "ttf-parser" version = "0.24.1" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "tungstenite" @@ -6434,7 +6434,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" [[package]] name = "unicase" version = "2.9.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "unicode-bidi" @@ -6445,17 +6445,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-bidi" version = "0.3.18" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "unicode-bidi-mirroring" version = "0.3.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "unicode-ccc" version = "0.3.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "unicode-ident" @@ -6466,7 +6466,7 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unicode-linebreak" version = "0.1.5" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "unicode-normalization" @@ -6486,12 +6486,12 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-properties" version = "0.1.4" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "unicode-script" version = "0.5.8" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "unicode-segmentation" @@ -6502,7 +6502,7 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-segmentation" version = "1.12.0" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "unicode-width" @@ -6782,7 +6782,7 @@ dependencies = [ [[package]] name = "wayland-backend" version = "0.3.12" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "downcast-rs", "libc", @@ -6794,7 +6794,7 @@ dependencies = [ [[package]] name = "wayland-client" version = "0.31.12" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc", @@ -6804,7 +6804,7 @@ dependencies = [ [[package]] name = "wayland-egl" version = "0.32.9" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "wayland-backend", "wayland-sys", @@ -6813,7 +6813,7 @@ dependencies = [ [[package]] name = "wayland-protocols" version = "0.32.10" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-backend", @@ -6823,7 +6823,7 @@ dependencies = [ [[package]] name = "wayland-sys" version = "0.31.8" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "log", "pkg-config", @@ -6922,7 +6922,7 @@ dependencies = [ [[package]] name = "windows" version = "0.62.2" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "windows-collections 0.3.2", "windows-core 0.62.2", @@ -6941,7 +6941,7 @@ dependencies = [ [[package]] name = "windows-collections" version = "0.3.2" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "windows-core 0.62.2", ] @@ -6974,7 +6974,7 @@ dependencies = [ [[package]] name = "windows-core" version = "0.62.2" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "windows-link 0.2.1", "windows-result 0.4.1", @@ -6995,7 +6995,7 @@ dependencies = [ [[package]] name = "windows-future" version = "0.3.2" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "windows-core 0.62.2", ] @@ -7059,7 +7059,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" [[package]] name = "windows-link" version = "0.2.1" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" [[package]] name = "windows-numerics" @@ -7103,7 +7103,7 @@ dependencies = [ [[package]] name = "windows-result" version = "0.4.1" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "windows-link 0.2.1", ] @@ -7120,7 +7120,7 @@ dependencies = [ [[package]] name = "windows-strings" version = "0.5.1" -source = "git+https://github.com/makepad/makepad?branch=dev#0f2939945cdfbe5296d54c91028d85a8a2613e5c" +source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_smooth_scroll_fix#6957403dd68e21d408496a51e48849dafa908ae2" dependencies = [ "windows-link 0.2.1", ] diff --git a/Cargo.toml b/Cargo.toml index daf7ba9e2..6395748a7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,8 +14,11 @@ version = "0.0.1-pre-alpha-4" metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q=" [dependencies] -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/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 = "portal_list_smooth_scroll_fix", features = ["serde"] } +makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "portal_list_smooth_scroll_fix" } ## Including this crate automatically configures all `robius-*` crates to work with Makepad. diff --git a/src/home/room_screen.rs b/src/home/room_screen.rs index 8f700c123..8cd50b1fe 100644 --- a/src/home/room_screen.rs +++ b/src/home/room_screen.rs @@ -1428,11 +1428,7 @@ impl RoomScreen { // NOTE: this code was copied from the `MessageAction::JumpToRelated` handler; // we should deduplicate them at some point. let speed = 50.0; - // Scroll to the message right above the replied-to message. - // FIXME: `smooth_scroll_to` should accept a scroll offset parameter too, - // so that we can scroll to the replied-to message and have it - // appear beneath the top of the viewport. - portal_list.smooth_scroll_to(cx, index.saturating_sub(1), speed, None); + portal_list.smooth_scroll_to(cx, index, speed, None, 10.0); // start highlight animation. tl.message_highlight_animation_state = MessageHighlightAnimationState::Pending { item_id: index @@ -2137,11 +2133,7 @@ impl RoomScreen { if let Some(index) = related_msg_tl_index { // log!("The related message {replied_to_event} was immediately found in room {}, scrolling to from index {reply_message_item_id} --> {index} (first ID {}).", tl.kind.room_id(), portal_list.first_id()); let speed = 50.0; - // Scroll to the message right *before* the replied-to message. - // FIXME: `smooth_scroll_to` should accept a "scroll offset" (first scroll) parameter too, - // so that we can scroll to the replied-to message and have it - // appear beneath the top of the viewport. - portal_list.smooth_scroll_to(cx, index.saturating_sub(1), speed, None); + portal_list.smooth_scroll_to(cx, index, speed, None, 10.0); // start highlight animation. tl.message_highlight_animation_state = MessageHighlightAnimationState::Pending { item_id: index diff --git a/src/home/rooms_list.rs b/src/home/rooms_list.rs index 7cf7d5106..a22966c5f 100644 --- a/src/home/rooms_list.rs +++ b/src/home/rooms_list.rs @@ -792,8 +792,7 @@ impl RoomsList { self.invited_rooms_indexes.first_room_index + invited_index } else { continue }; - // Scroll to just above the room to make it more obviously visible. - portal_list.smooth_scroll_to(cx, portal_list_index.saturating_sub(1), speed, Some(15)); + portal_list.smooth_scroll_to(cx, portal_list_index, speed, Some(15), 10.0); } RoomsListUpdate::SpaceRequestSender(sender) => { self.space_request_sender = Some(sender); diff --git a/src/home/spaces_bar.rs b/src/home/spaces_bar.rs index 8f613dc93..ed8b4842d 100644 --- a/src/home/spaces_bar.rs +++ b/src/home/spaces_bar.rs @@ -773,8 +773,7 @@ impl SpacesBar { if let Some(index) = self.displayed_spaces.iter().position(|s| s == &space_id) { let portal_list = self.view.portal_list(cx, ids!(spaces_list)); let speed = 40.0; - // Scroll to just above the space to make it more visible. - portal_list.smooth_scroll_to(cx, index.saturating_sub(1), speed, Some(10)); + portal_list.smooth_scroll_to(cx, index, speed, Some(10), 10.0); } } }