diff --git a/.gitignore b/.gitignore
index 1f891a019..ce24399bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
.DS_Store
CLAUDE.md
proxychains.conf
+testflight.sh
diff --git a/Cargo.lock b/Cargo.lock
index 6879bcc9e..e85c3659b 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#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "accessory"
@@ -610,7 +610,7 @@ dependencies = [
[[package]]
name = "bitflags"
version = "2.10.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[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#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[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#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "bytes"
@@ -1941,9 +1941,9 @@ dependencies = [
[[package]]
name = "fxhash"
version = "0.2.1"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
- "byteorder 1.5.0 (git+https://github.com/makepad/makepad?branch=dev)",
+ "byteorder 1.5.0 (git+https://github.com/kevinaboos/makepad?branch=more_fixes)",
]
[[package]]
@@ -2790,7 +2790,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]]
@@ -2937,7 +2937,7 @@ dependencies = [
[[package]]
name = "makepad-apple-sys"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-objc-sys",
]
@@ -2945,12 +2945,12 @@ dependencies = [
[[package]]
name = "makepad-byteorder-lite"
version = "0.1.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "makepad-code-editor"
version = "2.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-widgets",
]
@@ -2958,7 +2958,7 @@ dependencies = [
[[package]]
name = "makepad-derive-wasm-bridge"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-micro-proc-macro",
]
@@ -2966,7 +2966,7 @@ dependencies = [
[[package]]
name = "makepad-derive-widget"
version = "2.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-live-id",
"makepad-micro-proc-macro",
@@ -2975,7 +2975,7 @@ dependencies = [
[[package]]
name = "makepad-draw"
version = "2.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"ab_glyph_rasterizer",
"fxhash",
@@ -2989,15 +2989,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=more_fixes)",
"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=more_fixes)",
]
[[package]]
name = "makepad-error-log"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-micro-serde",
]
@@ -3005,22 +3005,22 @@ dependencies = [
[[package]]
name = "makepad-filesystem-watcher"
version = "0.1.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "makepad-futures"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "makepad-futures-legacy"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "makepad-html"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-live-id",
]
@@ -3034,7 +3034,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
[[package]]
name = "makepad-latex-math"
version = "0.1.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"ttf-parser",
]
@@ -3042,7 +3042,7 @@ dependencies = [
[[package]]
name = "makepad-live-id"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-live-id-macros",
"serde",
@@ -3051,7 +3051,7 @@ dependencies = [
[[package]]
name = "makepad-live-id-macros"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-micro-proc-macro",
]
@@ -3059,7 +3059,7 @@ dependencies = [
[[package]]
name = "makepad-live-reload-core"
version = "0.1.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-filesystem-watcher",
]
@@ -3067,7 +3067,7 @@ dependencies = [
[[package]]
name = "makepad-math"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-micro-serde",
]
@@ -3075,12 +3075,12 @@ dependencies = [
[[package]]
name = "makepad-micro-proc-macro"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "makepad-micro-serde"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-live-id",
"makepad-micro-serde-derive",
@@ -3089,7 +3089,7 @@ dependencies = [
[[package]]
name = "makepad-micro-serde-derive"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-micro-proc-macro",
]
@@ -3097,7 +3097,7 @@ dependencies = [
[[package]]
name = "makepad-network"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-apple-sys",
"makepad-error-log",
@@ -3111,15 +3111,15 @@ dependencies = [
[[package]]
name = "makepad-objc-sys"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "makepad-platform"
version = "2.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
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=more_fixes)",
"hilog-sys",
"makepad-android-state",
"makepad-apple-sys",
@@ -3140,7 +3140,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=more_fixes)",
"wayland-client",
"wayland-egl",
"wayland-protocols",
@@ -3152,12 +3152,12 @@ dependencies = [
[[package]]
name = "makepad-regex"
version = "0.1.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "makepad-script"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-error-log",
"makepad-html",
@@ -3165,13 +3165,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=more_fixes)",
]
[[package]]
name = "makepad-script-derive"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-micro-proc-macro",
]
@@ -3179,7 +3179,7 @@ dependencies = [
[[package]]
name = "makepad-script-std"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-network",
"makepad-script",
@@ -3188,14 +3188,14 @@ dependencies = [
[[package]]
name = "makepad-shared-bytes"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "makepad-studio-protocol"
version = "0.1.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
- "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)",
+ "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=more_fixes)",
"makepad-error-log",
"makepad-live-id",
"makepad-micro-serde",
@@ -3205,7 +3205,7 @@ dependencies = [
[[package]]
name = "makepad-svg"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-html",
"makepad-live-id",
@@ -3214,7 +3214,7 @@ dependencies = [
[[package]]
name = "makepad-tsdf"
version = "0.1.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-math",
"makepad-micro-serde",
@@ -3223,7 +3223,7 @@ dependencies = [
[[package]]
name = "makepad-wasm-bridge"
version = "1.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-derive-wasm-bridge",
"makepad-live-id",
@@ -3232,7 +3232,7 @@ dependencies = [
[[package]]
name = "makepad-webp"
version = "0.2.4"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-byteorder-lite",
]
@@ -3240,7 +3240,7 @@ dependencies = [
[[package]]
name = "makepad-widgets"
version = "2.0.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-derive-widget",
"makepad-draw",
@@ -3249,18 +3249,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=more_fixes)",
]
[[package]]
name = "makepad-zune-core"
version = "0.5.1"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "makepad-zune-inflate"
version = "0.2.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"simd-adler32",
]
@@ -3268,7 +3268,7 @@ dependencies = [
[[package]]
name = "makepad-zune-jpeg"
version = "0.5.12"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-zune-core",
]
@@ -3276,7 +3276,7 @@ dependencies = [
[[package]]
name = "makepad-zune-png"
version = "0.5.1"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"makepad-zune-core",
"makepad-zune-inflate",
@@ -3663,7 +3663,7 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
[[package]]
name = "memchr"
version = "2.7.6"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "mime"
@@ -4392,10 +4392,10 @@ dependencies = [
[[package]]
name = "pulldown-cmark"
version = "0.12.2"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
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=more_fixes)",
+ "memchr 2.7.6 (git+https://github.com/kevinaboos/makepad?branch=more_fixes)",
"unicase 2.9.0",
]
@@ -5203,12 +5203,12 @@ checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
[[package]]
name = "rustybuzz"
version = "0.18.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
- "bitflags 2.10.0 (git+https://github.com/makepad/makepad?branch=dev)",
+ "bitflags 2.10.0 (git+https://github.com/kevinaboos/makepad?branch=more_fixes)",
"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=more_fixes)",
"ttf-parser",
"unicode-bidi-mirroring",
"unicode-ccc",
@@ -5303,7 +5303,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
[[package]]
name = "sdfer"
version = "0.2.1"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "sealed"
@@ -5602,7 +5602,7 @@ dependencies = [
[[package]]
name = "simd-adler32"
version = "0.3.8"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "siphasher"
@@ -5628,7 +5628,7 @@ dependencies = [
[[package]]
name = "smallvec"
version = "1.15.1"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "socket2"
@@ -6409,7 +6409,7 @@ dependencies = [
[[package]]
name = "ttf-parser"
version = "0.24.1"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "tungstenite"
@@ -6461,7 +6461,7 @@ checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
[[package]]
name = "unicase"
version = "2.9.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "unicode-bidi"
@@ -6472,17 +6472,17 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
[[package]]
name = "unicode-bidi"
version = "0.3.18"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "unicode-bidi-mirroring"
version = "0.3.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "unicode-ccc"
version = "0.3.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "unicode-ident"
@@ -6493,7 +6493,7 @@ checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
[[package]]
name = "unicode-linebreak"
version = "0.1.5"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "unicode-normalization"
@@ -6513,12 +6513,12 @@ checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
[[package]]
name = "unicode-properties"
version = "0.1.4"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "unicode-script"
version = "0.5.8"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "unicode-segmentation"
@@ -6529,7 +6529,7 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
[[package]]
name = "unicode-segmentation"
version = "1.12.0"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "unicode-width"
@@ -6861,7 +6861,7 @@ dependencies = [
[[package]]
name = "wayland-backend"
version = "0.3.12"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"downcast-rs",
"libc",
@@ -6873,7 +6873,7 @@ dependencies = [
[[package]]
name = "wayland-client"
version = "0.31.12"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc",
@@ -6883,7 +6883,7 @@ dependencies = [
[[package]]
name = "wayland-egl"
version = "0.32.9"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"wayland-backend",
"wayland-sys",
@@ -6892,7 +6892,7 @@ dependencies = [
[[package]]
name = "wayland-protocols"
version = "0.32.10"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"bitflags 2.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
"wayland-backend",
@@ -6902,7 +6902,7 @@ dependencies = [
[[package]]
name = "wayland-sys"
version = "0.31.8"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"log",
"pkg-config",
@@ -7010,7 +7010,7 @@ dependencies = [
[[package]]
name = "windows"
version = "0.62.2"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"windows-collections 0.3.2",
"windows-core 0.62.2",
@@ -7029,7 +7029,7 @@ dependencies = [
[[package]]
name = "windows-collections"
version = "0.3.2"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"windows-core 0.62.2",
]
@@ -7062,7 +7062,7 @@ dependencies = [
[[package]]
name = "windows-core"
version = "0.62.2"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"windows-link 0.2.1",
"windows-result 0.4.1",
@@ -7083,7 +7083,7 @@ dependencies = [
[[package]]
name = "windows-future"
version = "0.3.2"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"windows-core 0.62.2",
]
@@ -7147,7 +7147,7 @@ checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
[[package]]
name = "windows-link"
version = "0.2.1"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
[[package]]
name = "windows-numerics"
@@ -7191,7 +7191,7 @@ dependencies = [
[[package]]
name = "windows-result"
version = "0.4.1"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"windows-link 0.2.1",
]
@@ -7208,7 +7208,7 @@ dependencies = [
[[package]]
name = "windows-strings"
version = "0.5.1"
-source = "git+https://github.com/makepad/makepad?branch=dev#30385ae3c6d451a8260ddea9429885c81ccc27dc"
+source = "git+https://github.com/kevinaboos/makepad?branch=more_fixes#d72951d21ea2ed2abc2536ff70ad306229914a45"
dependencies = [
"windows-link 0.2.1",
]
diff --git a/Cargo.toml b/Cargo.toml
index 01b5b37bb..0c9730231 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,9 +14,11 @@ version = "1.0.0-alpha.1"
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 = "more_fixes", features = ["serde"] }
+makepad-code-editor = { git = "https://github.com/kevinaboos/makepad", branch = "more_fixes" }
## Including this crate automatically configures all `robius-*` crates to work with Makepad.
diff --git a/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon1024x1024.png b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon1024x1024.png
new file mode 100644
index 000000000..d7d2a86cb
Binary files /dev/null and b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon1024x1024.png differ
diff --git a/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon120x120.png b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon120x120.png
new file mode 100644
index 000000000..f984367c0
Binary files /dev/null and b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon120x120.png differ
diff --git a/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon152x152.png b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon152x152.png
new file mode 100644
index 000000000..a303f1b2d
Binary files /dev/null and b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon152x152.png differ
diff --git a/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon167x167.png b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon167x167.png
new file mode 100644
index 000000000..853a000da
Binary files /dev/null and b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon167x167.png differ
diff --git a/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon180x180.png b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon180x180.png
new file mode 100644
index 000000000..03162ab81
Binary files /dev/null and b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/AppIcon180x180.png differ
diff --git a/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/Contents.json b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 000000000..2b4429c17
--- /dev/null
+++ b/packaging/ios/icons/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,38 @@
+{
+ "images" : [
+ {
+ "filename" : "AppIcon120x120.png",
+ "idiom" : "iphone",
+ "scale" : "2x",
+ "size" : "60x60"
+ },
+ {
+ "filename" : "AppIcon180x180.png",
+ "idiom" : "iphone",
+ "scale" : "3x",
+ "size" : "60x60"
+ },
+ {
+ "filename" : "AppIcon152x152.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "76x76"
+ },
+ {
+ "filename" : "AppIcon167x167.png",
+ "idiom" : "ipad",
+ "scale" : "2x",
+ "size" : "83.5x83.5"
+ },
+ {
+ "filename" : "AppIcon1024x1024.png",
+ "idiom" : "ios-marketing",
+ "scale" : "1x",
+ "size" : "1024x1024"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/packaging/ios/icons/Assets.xcassets/Contents.json b/packaging/ios/icons/Assets.xcassets/Contents.json
new file mode 100644
index 000000000..73c00596a
--- /dev/null
+++ b/packaging/ios/icons/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/packaging/ios/icons/Assets.xcassets/LaunchScreenBackground.colorset/Contents.json b/packaging/ios/icons/Assets.xcassets/LaunchScreenBackground.colorset/Contents.json
new file mode 100644
index 000000000..cea21679f
--- /dev/null
+++ b/packaging/ios/icons/Assets.xcassets/LaunchScreenBackground.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "srgb",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "1.000",
+ "green" : "1.000",
+ "red" : "1.000"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/resources/icons/verification_no_bg.svg b/resources/icons/verification_no_bg.svg
new file mode 100644
index 000000000..3bbd96faf
--- /dev/null
+++ b/resources/icons/verification_no_bg.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/resources/icons/verification_unk_bg.svg b/resources/icons/verification_unk_bg.svg
new file mode 100644
index 000000000..1ef6a7633
--- /dev/null
+++ b/resources/icons/verification_unk_bg.svg
@@ -0,0 +1,12 @@
+
+
diff --git a/resources/icons/verification_yes_bg.svg b/resources/icons/verification_yes_bg.svg
new file mode 100644
index 000000000..473fb06a0
--- /dev/null
+++ b/resources/icons/verification_yes_bg.svg
@@ -0,0 +1,4 @@
+
+
diff --git a/src/home/add_room.rs b/src/home/add_room.rs
index deda9236e..68c032e9a 100644
--- a/src/home/add_room.rs
+++ b/src/home/add_room.rs
@@ -18,7 +18,7 @@ script_mod! {
width: Fill, height: Fill,
flow: Down,
- padding: Inset{top: 5, left: 15, right: 15, bottom: 0},
+ padding: Inset{top: 5, left: 15, right: 15, bottom: 20},
title := TitleLabel {
text: "Add/Explore Rooms and Spaces"
diff --git a/src/home/home_screen.rs b/src/home/home_screen.rs
index 507d46894..f5a560648 100644
--- a/src/home/home_screen.rs
+++ b/src/home/home_screen.rs
@@ -253,7 +253,8 @@ script_mod! {
height: 39,
flow: Right
padding: Inset{top: 2, bottom: 2}
- margin: Inset{right: 2}
+ // The negative left margin compensates for the RoomFilterInputBar's border
+ margin: Inset{left: -1.5, right: 2}
spacing: 2
align: Align{y: 0.5}
diff --git a/src/home/main_desktop_ui.rs b/src/home/main_desktop_ui.rs
index 82b130312..845f63cde 100644
--- a/src/home/main_desktop_ui.rs
+++ b/src/home/main_desktop_ui.rs
@@ -17,8 +17,7 @@ script_mod! {
height: Fill,
padding: 0,
spacing: 0,
- // Align the dock with the RoomFilterInputBar. Not sure why we need this...
- margin: Inset{left: 1.75}
+ margin: 0
tab_bar +: {
CloseableTab := mod.widgets.RobrixTab { closeable: true }
diff --git a/src/home/navigation_tab_bar.rs b/src/home/navigation_tab_bar.rs
index 0a699de91..1ae8a26bd 100644
--- a/src/home/navigation_tab_bar.rs
+++ b/src/home/navigation_tab_bar.rs
@@ -57,46 +57,33 @@ script_mod! {
use mod.widgets.*
- // The base layout/sizing for the icon-style buttons in the NavigationTabBar.
- // Inherits hover/selected styling from `mod.widgets.NavigationBarButton`
- // (defined in `src/shared/navigation_bar_button.rs`).
+ // The base style definition for icon buttons in the NavigationTabBar.
mod.widgets.NavigationTabButton = mod.widgets.NavigationBarButton {
width: Fill,
- height: (NAVIGATION_TAB_BAR_SIZE - 5),
+ height: (NAVIGATION_TAB_BAR_SIZE - 4),
padding: 5,
- margin: 3,
+ margin: 2,
align: Align{x: 0.5, y: 0.5}
flow: Down,
}
mod.widgets.ProfileIcon = #(ProfileIcon::register_widget(vm)) {
- // Inherit hover/selected styling directly from NavigationBarButton
- // (not via NavigationTabButton, to avoid inheriting its padding/margin
- // which would squeeze ProfileIcon's avatar+badge layout).
..mod.widgets.NavigationBarButton
// ProfileIcon emits its own dynamic tooltip (with verification badge info)
// from Rust, so leave the built-in tooltip text empty.
tooltip_text: ""
- // Match the drawn bg bounds of `NavigationTabButton` (height and
- // margin) so that ProfileIcon's hover/selected highlight is the same
- // size and shape as the other buttons in the tab bar.
+ // Use the same size/shape bounds as other buttons in the NavigationTabBar
width: Fill,
- height: (NAVIGATION_TAB_BAR_SIZE - 5)
+ height: (NAVIGATION_TAB_BAR_SIZE - 4)
padding: 0,
- margin: 3,
+ margin: 2,
align: Align{ x: 0.5, y: 0.5 }
- // The avatar and verification badge are wrapped in a sub-container that
- // is *larger* than the avatar (sized to match ProfileIcon's drawn bg
- // bounds), so the avatar can be centered while the badge sits in the
- // gap between the avatar's edge and the wrapper's corner. This places
- // the badge at the avatar's outer top-right (overlapping the corner)
- // independently of the parent ProfileIcon's width.
avatar_with_badge := View {
- width: (NAVIGATION_TAB_BAR_SIZE - 5)
- height: (NAVIGATION_TAB_BAR_SIZE - 5)
+ width: (NAVIGATION_TAB_BAR_SIZE - 4)
+ height: (NAVIGATION_TAB_BAR_SIZE - 4)
flow: Overlay
align: Align { x: 0.5, y: 0.5 }
@@ -137,8 +124,8 @@ script_mod! {
margin: 0,
icon_walk: Walk {
margin: 0,
- width: (NAVIGATION_TAB_BAR_SIZE / 2.2),
- height: (NAVIGATION_TAB_BAR_SIZE / 2.2)
+ width: 30,
+ height: 30
}
draw_icon +: {
color: (COLOR_NAVIGATION_TAB_FG)
@@ -153,8 +140,8 @@ script_mod! {
margin: 0,
icon_walk: Walk {
margin: 0,
- width: (NAVIGATION_TAB_BAR_SIZE / 2.2),
- height: (NAVIGATION_TAB_BAR_SIZE / 2.2)
+ width: 30,
+ height: 30
}
draw_icon +: {
color: (COLOR_NAVIGATION_TAB_FG)
@@ -172,8 +159,8 @@ script_mod! {
margin: 0,
icon_walk: Walk {
margin: 0,
- width: (NAVIGATION_TAB_BAR_SIZE / 2.2),
- height: (NAVIGATION_TAB_BAR_SIZE / 2.2)
+ width: 30,
+ height: 30
}
draw_icon +: {
color: (COLOR_NAVIGATION_TAB_FG)
@@ -190,12 +177,15 @@ script_mod! {
align: Align{x: 0.5}
// Similar to how we do it for the mobile mode view, but now
// the bar is on the left, so we add left padding and extra width.
+ // Right padding must equal the left padding so that the actual content
+ // is horizontally centered within the spaces bar.
padding: Inset{
top: 8.,
bottom: (8.0 + mod.widgets.SAFE_INSET_PAD_BOTTOM),
left: (mod.widgets.SAFE_INSET_PAD_LEFT),
+ right: (mod.widgets.SAFE_INSET_PAD_LEFT),
}
- width: (mod.widgets.NAVIGATION_TAB_BAR_SIZE + mod.widgets.SAFE_INSET_PAD_LEFT),
+ width: (mod.widgets.NAVIGATION_TAB_BAR_SIZE + 2 * mod.widgets.SAFE_INSET_PAD_LEFT),
height: Fill
draw_bg +: {
diff --git a/src/home/spaces_bar.rs b/src/home/spaces_bar.rs
index 578625d48..e4bc1bbf7 100644
--- a/src/home/spaces_bar.rs
+++ b/src/home/spaces_bar.rs
@@ -5,7 +5,7 @@
//! 1. a narrow vertical strip, when in Desktop (widescreen) mode,
//! 2. a wide, short horizontal strip, when in Mobile (narrowscreen) mode.
-use std::collections::HashMap;
+use std::{borrow::Cow, collections::HashMap};
use crossbeam_queue::SegQueue;
use makepad_widgets::*;
@@ -30,11 +30,14 @@ script_mod! {
mod.widgets.SpacesBarEntry = set_type_default() do #(SpacesBarEntry::register_widget(vm)) {
..mod.widgets.NavigationBarButton
- width: (NAVIGATION_TAB_BAR_SIZE - 5),
- height: (NAVIGATION_TAB_BAR_SIZE - 5),
- flow: Down
- padding: 5,
- margin: 3,
+ // `height + (2 * margin)`` must equal NAVIGATION_TAB_BAR_SIZE to avoid clipping
+ width: (NAVIGATION_TAB_BAR_SIZE - 4),
+ height: (NAVIGATION_TAB_BAR_SIZE - 4),
+ // Flow.Overlay (rather than Down) so that the invisible `space_name` Label
+ // doesn't sit in the avatar's flow column and shift its centering.
+ flow: Overlay
+ padding: 4,
+ margin: 2,
align: Align{x: 0.5, y: 0.5}
avatar := Avatar {
@@ -57,6 +60,7 @@ script_mod! {
height: 0,
flow: Flow.Right{wrap: false}, // do not wrap
padding: 0,
+ margin: 0,
align: Align{x: 0.5}
max_lines: 1
text_overflow: Ellipsis
@@ -68,22 +72,25 @@ script_mod! {
}
mod.widgets.SpacesStatusLabel = View {
- width: (NAVIGATION_TAB_BAR_SIZE),
- height: (NAVIGATION_TAB_BAR_SIZE),
+ // We allow the status label to take up 2 entries' worth of horizontal space
+ // (only relevant in mobile view mode).
+ width: Fill { max: (NAVIGATION_TAB_BAR_SIZE * 2) },
+ // Non-fixed height: let the label grow down (important on Desktop mode).
+ height: Fit
+ margin: 2,
align: Align{ x: 0.5, y: 0.5 }
- margin: Inset{top: 9, left: 0, bottom: 5}
- padding: 4.0,
+ padding: 4,
label := Label {
padding: 0
margin: 0
width: Fill,
- height: Fill
+ height: Fit,
flow: Flow.Right{wrap: true},
- align: Align{ x: 0.5, y: 0.5 }
+ align: Align{ x: 0.5 }
draw_text +: {
color: (MESSAGE_TEXT_COLOR),
- text_style: REGULAR_TEXT {font_size: 9}
+ text_style: REGULAR_TEXT {font_size: 8, line_spacing: 1.0}
}
}
}
@@ -91,7 +98,8 @@ script_mod! {
mod.widgets.SpacesList = PortalList {
height: Fill,
width: Fill,
- spacing: 0.0
+ spacing: 0
+ align: Align{x: 0.5, y: 0.5}
auto_tail: false,
max_pull_down: 0.0,
@@ -428,7 +436,7 @@ impl Widget for SpacesBar {
item.label(cx, ids!(label)).set_text(
cx,
if self.is_filtered {
- "Found no\nmatching spaces."
+ "No spaces\nmatch."
} else {
"Found no\njoined spaces."
}
@@ -481,12 +489,15 @@ impl Widget for SpacesBar {
}
else if portal_list_index == len {
let item = list.item(cx, portal_list_index, id!(StatusLabel));
- let descriptor = if self.is_filtered { "matching" } else { "joined" };
- let text = match len {
- 0 => format!("Found no\n{descriptor} spaces."),
- 1 => format!("Found 1\n{descriptor} space."),
- 2..100 => format!("Found {len}\n{descriptor} spaces."),
- 100.. => format!("Found 99+\n{descriptor} spaces."),
+ let text: Cow<'static, str> = if self.is_filtered {
+ let total = self.all_joined_spaces.len();
+ format!("{len} of {total} spaces").into()
+ } else {
+ match len {
+ 0 => "Found no joined spaces.".into(),
+ 1 => "Found 1 joined space.".into(),
+ 2.. => format!("Found {len} joined spaces.").into(),
+ }
};
item.label(cx, ids!(label)).set_text(cx, &text);
item
diff --git a/src/home/welcome_screen.rs b/src/home/welcome_screen.rs
index 5e08674dc..d9d0a9f72 100644
--- a/src/home/welcome_screen.rs
+++ b/src/home/welcome_screen.rs
@@ -52,7 +52,7 @@ script_mod! {
// color_hover: #0f0,
// }
}
- body:"
Our Matrix client is under heavy development. Currently, you can access the rooms and spaces that you've joined in other clients.
+ body:"
Our Matrix client is under active development, so you may need to use other clients to perform admin actions like creating rooms, kicking/banning users, and starting verification requests.
But don't worry, we're constantly expanding the featureset of Robrix!
diff --git a/src/shared/html_or_plaintext.rs b/src/shared/html_or_plaintext.rs
index 1e055aa92..3ea123bf4 100644
--- a/src/shared/html_or_plaintext.rs
+++ b/src/shared/html_or_plaintext.rs
@@ -168,8 +168,8 @@ script_mod! {
heading_margin: Inset{ top: 1.0, bottom: 0.1 }
paragraph_margin: Inset{ top: 0.33, bottom: 0.33 }
- inline_code_padding: Inset{top: 3, bottom: 3, left: 4, right: 4 }
- inline_code_margin: Inset{ left: 3, right: 3, bottom: 2, top: 2 }
+ inline_code_padding: Inset{top: 3, bottom: 3, left: 5, right: 5 }
+ inline_code_margin: Inset{ left: 0, right: 0, bottom: 2, top: 2 }
font := mod.widgets.MatrixHtmlSpan { }
span := mod.widgets.MatrixHtmlSpan { }
diff --git a/src/shared/styles.rs b/src/shared/styles.rs
index c4bb13fda..5bad5dce0 100644
--- a/src/shared/styles.rs
+++ b/src/shared/styles.rs
@@ -170,9 +170,10 @@ script_mod! {
mod.widgets.COLOR_LINK_HOVER = #21B070
- // This is chosen to nicely fit the 3 window chrome buttons on macOS
- mod.widgets.NAVIGATION_TAB_BAR_SIZE = 76
- mod.widgets.NAVIGATION_TAB_BAR_AVATAR_SIZE = (mod.widgets.NAVIGATION_TAB_BAR_SIZE * 0.65)
+ // Use an even value for this, not odd, such that it can be divided in half,
+ // which is needed when calculating the value of other widgets that scale with this.
+ mod.widgets.NAVIGATION_TAB_BAR_SIZE = 54
+ mod.widgets.NAVIGATION_TAB_BAR_AVATAR_SIZE = 40
mod.widgets.NAVIGATION_TAB_BAR_AVATAR_FONT_SIZE = (mod.widgets.NAVIGATION_TAB_BAR_AVATAR_SIZE * 0.4)
diff --git a/src/shared/verification_badge.rs b/src/shared/verification_badge.rs
index 2a0ef3588..adfb9abf8 100644
--- a/src/shared/verification_badge.rs
+++ b/src/shared/verification_badge.rs
@@ -14,9 +14,13 @@ script_mod! {
use mod.widgets.*
mod.widgets.VERIFICATION_YES = crate_resource("self://resources/icons/verification_yes.svg")
+ mod.widgets.VERIFICATION_YES_BG = crate_resource("self://resources/icons/verification_yes_bg.svg")
mod.widgets.VERIFICATION_NO = crate_resource("self://resources/icons/verification_no.svg")
+ mod.widgets.VERIFICATION_NO_BG = crate_resource("self://resources/icons/verification_no_bg.svg")
+
mod.widgets.VERIFICATION_UNK = crate_resource("self://resources/icons/verification_unk.svg")
+ mod.widgets.VERIFICATION_UNK_BG = crate_resource("self://resources/icons/verification_unk_bg.svg")
mod.widgets.VerificationIcon = Icon {
icon_walk: Walk {
@@ -27,10 +31,23 @@ script_mod! {
margin: Inset{left: 0, right: 3, top: 2, bottom: 0}
}
+ // Each verification icon is a colored shield with the inner glyph carved
+ // out (transparent). Stacked behind it is a white-tinted shield-only
+ // version of the same SVG so the avatar doesn't show through the carved
+ // glyph area — the white shows through instead.
mod.widgets.IconYes = View {
visible: false
width: Fit, height: Fit
+ flow: Overlay
+ mod.widgets.VerificationIcon {
+ draw_icon +: {
+ svg: (mod.widgets.VERIFICATION_YES_BG),
+ get_color: fn() -> vec4 {
+ return #xFFFFFFFF;
+ }
+ }
+ }
mod.widgets.VerificationIcon {
draw_icon +: {
svg: (mod.widgets.VERIFICATION_YES),
@@ -45,6 +62,15 @@ script_mod! {
visible: false
width: Fit, height: Fit
+ flow: Overlay
+ mod.widgets.VerificationIcon {
+ draw_icon +: {
+ svg: (mod.widgets.VERIFICATION_NO_BG),
+ get_color: fn() -> vec4 {
+ return #xFFFFFFFF;
+ }
+ }
+ }
mod.widgets.VerificationIcon {
draw_icon +: {
svg: (mod.widgets.VERIFICATION_NO),
@@ -59,6 +85,15 @@ script_mod! {
visible: false
width: Fit, height: Fit
+ flow: Overlay
+ mod.widgets.VerificationIcon {
+ draw_icon +: {
+ svg: (mod.widgets.VERIFICATION_UNK_BG),
+ get_color: fn() -> vec4 {
+ return #xFFFFFFFF;
+ }
+ }
+ }
mod.widgets.VerificationIcon {
draw_icon +: {
svg: (mod.widgets.VERIFICATION_UNK),