diff --git a/Cargo.lock b/Cargo.lock index 00739806..3e0340c8 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://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "addr2line" @@ -282,7 +282,7 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb" [[package]] name = "arrayvec" version = "0.7.6" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "arrayvec" @@ -299,9 +299,9 @@ checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" [[package]] name = "ash" version = "0.38.0+1.3.281" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "libloading 0.8.9 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "libloading 0.8.9 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -551,7 +551,7 @@ dependencies = [ [[package]] name = "bit-set" version = "0.8.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "bit-vec", ] @@ -559,7 +559,7 @@ dependencies = [ [[package]] name = "bit-vec" version = "0.8.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "bitflags" @@ -570,7 +570,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" version = "2.10.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "bitflags" @@ -705,7 +705,7 @@ checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e" [[package]] name = "bytemuck" version = "1.25.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "bytemuck" @@ -722,7 +722,7 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "byteorder" version = "1.5.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "byteorder-lite" @@ -800,12 +800,12 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg-if" version = "1.0.4" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "cfg_aliases" version = "0.2.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "cfg_aliases" @@ -1275,7 +1275,7 @@ checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6" [[package]] name = "crunchy" version = "0.2.4" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "crypto-common" @@ -1548,7 +1548,7 @@ dependencies = [ [[package]] name = "downcast-rs" version = "1.2.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "dunce" @@ -1674,7 +1674,7 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" [[package]] name = "equivalent" version = "1.0.2" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "errno" @@ -1849,7 +1849,7 @@ checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" [[package]] name = "foldhash" version = "0.2.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "fontconfig-parser" @@ -2022,9 +2022,9 @@ dependencies = [ [[package]] name = "fxhash" version = "0.2.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "byteorder 1.5.0 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "byteorder 1.5.0 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -2905,9 +2905,9 @@ dependencies = [ [[package]] name = "hashbrown" version = "0.16.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "foldhash 0.2.0 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "foldhash 0.2.0 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -2956,7 +2956,7 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hexf-parse" version = "0.2.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "hilog-sys" @@ -3153,17 +3153,17 @@ dependencies = [ [[package]] name = "i_float" version = "3.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "i_key_sort" version = "0.11.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "i_overlay" version = "7.0.3" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "i_float", "i_key_sort", @@ -3174,7 +3174,7 @@ dependencies = [ [[package]] name = "i_shape" version = "3.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "i_float", ] @@ -3182,7 +3182,7 @@ dependencies = [ [[package]] name = "i_tree" version = "0.19.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "iana-time-zone" @@ -3394,10 +3394,10 @@ dependencies = [ [[package]] name = "indexmap" version = "2.13.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "equivalent 1.0.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", - "hashbrown 0.16.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "equivalent 1.0.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", + "hashbrown 0.16.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -3711,10 +3711,10 @@ dependencies = [ [[package]] name = "libloading" version = "0.8.9" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "cfg-if 1.0.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", - "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "cfg-if 1.0.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", + "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -3864,7 +3864,7 @@ dependencies = [ [[package]] name = "makepad-ai" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-live-id", "makepad-micro-serde", @@ -3874,7 +3874,7 @@ dependencies = [ [[package]] name = "makepad-ai-services" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-micro-serde", "makepad-platform", @@ -3884,7 +3884,7 @@ dependencies = [ [[package]] name = "makepad-aichat" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-ai-services", "makepad-strict-json", @@ -3905,7 +3905,7 @@ dependencies = [ [[package]] name = "makepad-app-module" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-ai-services", "makepad-strict-json", @@ -3915,7 +3915,7 @@ dependencies = [ [[package]] name = "makepad-apple-sys" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-objc-sys", ] @@ -3923,12 +3923,12 @@ dependencies = [ [[package]] name = "makepad-byteorder-lite" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-code-editor" version = "2.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-widgets", ] @@ -3936,7 +3936,7 @@ dependencies = [ [[package]] name = "makepad-derive-wasm-bridge" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-micro-proc-macro", ] @@ -3944,7 +3944,7 @@ dependencies = [ [[package]] name = "makepad-derive-widget" version = "2.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-live-id", "makepad-micro-proc-macro", @@ -3964,7 +3964,7 @@ dependencies = [ [[package]] name = "makepad-draw" version = "2.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "ab_glyph_rasterizer", "fxhash", @@ -3981,7 +3981,7 @@ dependencies = [ "rustybuzz 0.18.0", "sdfer", "ttf-parser 0.24.1", - "unicode-bidi 0.3.18 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "unicode-bidi 0.3.18 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", "unicode-linebreak", "unicode-segmentation 1.12.0", ] @@ -3989,7 +3989,7 @@ dependencies = [ [[package]] name = "makepad-error-log" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-micro-serde", ] @@ -3997,12 +3997,12 @@ dependencies = [ [[package]] name = "makepad-fast-inflate" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-filesystem-watcher" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-git", ] @@ -4010,25 +4010,25 @@ dependencies = [ [[package]] name = "makepad-futures" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-futures-legacy" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-gif" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "weezl 0.1.12 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "weezl 0.1.12 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] name = "makepad-git" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-fast-inflate", ] @@ -4036,9 +4036,9 @@ dependencies = [ [[package]] name = "makepad-half" version = "2.7.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "cfg-if 1.0.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "cfg-if 1.0.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", "crunchy", "num-traits 0.2.20", "zerocopy 0.8.39", @@ -4047,7 +4047,7 @@ dependencies = [ [[package]] name = "makepad-html" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-live-id", ] @@ -4055,7 +4055,7 @@ dependencies = [ [[package]] name = "makepad-image-tiles" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-network", "makepad-platform-video", @@ -4072,7 +4072,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064" [[package]] name = "makepad-latex-math" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "ttf-parser 0.24.1", ] @@ -4080,7 +4080,7 @@ dependencies = [ [[package]] name = "makepad-live-id" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-live-id-macros", ] @@ -4088,7 +4088,7 @@ dependencies = [ [[package]] name = "makepad-live-id-macros" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-micro-proc-macro", ] @@ -4096,7 +4096,7 @@ dependencies = [ [[package]] name = "makepad-live-reload-core" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-filesystem-watcher", ] @@ -4104,7 +4104,7 @@ dependencies = [ [[package]] name = "makepad-math" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-micro-serde", ] @@ -4112,7 +4112,7 @@ dependencies = [ [[package]] name = "makepad-mbtile-reader" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "brotli", "makepad-fast-inflate", @@ -4122,12 +4122,12 @@ dependencies = [ [[package]] name = "makepad-micro-proc-macro" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-micro-serde" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-live-id", "makepad-micro-serde-derive", @@ -4136,7 +4136,7 @@ dependencies = [ [[package]] name = "makepad-micro-serde-derive" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-micro-proc-macro", ] @@ -4144,7 +4144,7 @@ dependencies = [ [[package]] name = "makepad-network" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-apple-sys", "makepad-error-log", @@ -4152,18 +4152,18 @@ dependencies = [ "makepad-live-id", "makepad-micro-serde", "makepad-script", - "windows 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] name = "makepad-objc-sys" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-pdf-parse" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-zune-inflate", ] @@ -4171,7 +4171,7 @@ dependencies = [ [[package]] name = "makepad-photos" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-ai-services", "makepad-app-module", @@ -4184,7 +4184,7 @@ dependencies = [ [[package]] name = "makepad-platform" version = "2.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "ash", "bitflags 2.10.0", @@ -4214,30 +4214,30 @@ dependencies = [ "wayland-client", "wayland-egl", "wayland-protocols", - "windows 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", - "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", + "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", "windows-targets 0.52.6", ] [[package]] name = "makepad-platform-video" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-apple-sys", "makepad-objc-sys", - "windows 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] name = "makepad-regex" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-script" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-error-log", "makepad-html", @@ -4252,7 +4252,7 @@ dependencies = [ [[package]] name = "makepad-script-derive" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-micro-proc-macro", ] @@ -4260,7 +4260,7 @@ dependencies = [ [[package]] name = "makepad-script-std" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-network", "makepad-script", @@ -4269,12 +4269,12 @@ dependencies = [ [[package]] name = "makepad-shared-bytes" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-sheets" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-ai-services", "makepad-app-module", @@ -4285,22 +4285,22 @@ dependencies = [ [[package]] name = "makepad-sqlite" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-stitch" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-strict-json" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "makepad-studio-protocol" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "bitflags 2.10.0", "makepad-error-log", @@ -4312,7 +4312,7 @@ dependencies = [ [[package]] name = "makepad-svg" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-html", "makepad-live-id", @@ -4321,7 +4321,7 @@ dependencies = [ [[package]] name = "makepad-tsdf" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-math", "makepad-micro-serde", @@ -4330,7 +4330,7 @@ dependencies = [ [[package]] name = "makepad-wasm-bridge" version = "1.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-derive-wasm-bridge", "makepad-live-id", @@ -4339,7 +4339,7 @@ dependencies = [ [[package]] name = "makepad-webp" version = "0.2.4" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-byteorder-lite", ] @@ -4347,7 +4347,7 @@ dependencies = [ [[package]] name = "makepad-widgets" version = "2.0.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "i_overlay", "makepad-derive-widget", @@ -4367,7 +4367,7 @@ dependencies = [ [[package]] name = "makepad-wm-api" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-widgets", ] @@ -4375,7 +4375,7 @@ dependencies = [ [[package]] name = "makepad-wm-theme" version = "0.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-widgets", ] @@ -4383,7 +4383,7 @@ dependencies = [ [[package]] name = "makepad-zune-bmp" version = "0.5.2" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-error-log", "makepad-zune-core", @@ -4392,7 +4392,7 @@ dependencies = [ [[package]] name = "makepad-zune-core" version = "0.5.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-error-log", ] @@ -4400,7 +4400,7 @@ dependencies = [ [[package]] name = "makepad-zune-inflate" version = "0.2.54" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "simd-adler32 0.3.9", ] @@ -4408,7 +4408,7 @@ dependencies = [ [[package]] name = "makepad-zune-jpeg" version = "0.5.15" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-zune-core", ] @@ -4416,7 +4416,7 @@ dependencies = [ [[package]] name = "makepad-zune-png" version = "0.5.2" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-fast-inflate", "makepad-zune-core", @@ -4426,7 +4426,7 @@ dependencies = [ [[package]] name = "makepad-zune-qoi" version = "0.5.2" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-zune-core", ] @@ -4493,7 +4493,7 @@ dependencies = [ [[package]] name = "memchr" version = "2.7.6" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "memchr" @@ -4678,14 +4678,14 @@ checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" [[package]] name = "naga" version = "27.0.3" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "arrayvec 0.7.6", "bit-set", "bitflags 2.10.0", - "cfg-if 1.0.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "cfg-if 1.0.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", "cfg_aliases 0.2.1", - "hashbrown 0.16.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "hashbrown 0.16.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", "hexf-parse", "indexmap 2.13.0", "makepad-error-log", @@ -4879,7 +4879,7 @@ dependencies = [ [[package]] name = "num-traits" version = "0.2.20" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "num_cpus" @@ -5504,7 +5504,7 @@ checksum = "8d380ab6c951261a0e44306245bc960b3b3367f099a7da7156bd1a3cacaf783c" [[package]] name = "once_cell" version = "1.21.3" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "once_cell" @@ -5758,7 +5758,7 @@ dependencies = [ [[package]] name = "pkg-config" version = "0.3.32" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "pkg-config" @@ -5918,11 +5918,11 @@ dependencies = [ [[package]] name = "pulldown-cmark" version = "0.12.2" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "bitflags 2.10.0", "memchr 2.7.6", - "unicase 2.9.0 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "unicase 2.9.0 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -6580,7 +6580,7 @@ checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb" [[package]] name = "rustc-hash" version = "1.1.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "rustc-hash" @@ -6748,7 +6748,7 @@ dependencies = [ [[package]] name = "rustybuzz" version = "0.18.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "bitflags 2.10.0", "bytemuck 1.25.0", @@ -6757,8 +6757,8 @@ dependencies = [ "ttf-parser 0.24.1", "unicode-bidi-mirroring 0.3.0", "unicode-ccc 0.3.0", - "unicode-properties 0.1.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", - "unicode-script 0.5.8 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "unicode-properties 0.1.4 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", + "unicode-script 0.5.8 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -6866,7 +6866,7 @@ dependencies = [ [[package]] name = "scoped-tls" version = "1.0.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "scopeguard" @@ -6877,7 +6877,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sdfer" version = "0.2.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "secrecy" @@ -7149,7 +7149,7 @@ dependencies = [ [[package]] name = "simd-adler32" version = "0.3.9" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "simd-adler32" @@ -7230,7 +7230,7 @@ dependencies = [ [[package]] name = "smallvec" version = "1.15.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "smallvec" @@ -7257,7 +7257,7 @@ checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "bitflags 2.10.0", ] @@ -7512,7 +7512,7 @@ dependencies = [ [[package]] name = "thiserror" version = "2.0.18" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "thiserror-impl 2.0.18", ] @@ -7540,7 +7540,7 @@ dependencies = [ [[package]] name = "thiserror-impl" version = "2.0.18" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-micro-proc-macro", ] @@ -8010,7 +8010,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttf-parser" version = "0.24.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "ttf-parser" @@ -8126,7 +8126,7 @@ checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" [[package]] name = "unicase" version = "2.9.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "unicode-bidi" @@ -8137,12 +8137,12 @@ checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5" [[package]] name = "unicode-bidi" version = "0.3.18" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "unicode-bidi-mirroring" version = "0.3.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "unicode-bidi-mirroring" @@ -8159,7 +8159,7 @@ checksum = "7eec5d1121208364f6793f7d2e222bf75a915c19557537745b195b253dd64217" [[package]] name = "unicode-ccc" version = "0.3.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "unicode-ccc" @@ -8170,7 +8170,7 @@ checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e" [[package]] name = "unicode-ident" version = "1.0.22" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "unicode-ident" @@ -8181,7 +8181,7 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-linebreak" version = "0.1.5" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "unicode-normalization" @@ -8201,7 +8201,7 @@ checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" [[package]] name = "unicode-properties" version = "0.1.4" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "unicode-script" @@ -8212,12 +8212,12 @@ checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee" [[package]] name = "unicode-script" version = "0.5.8" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "unicode-segmentation" version = "1.12.0" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "unicode-segmentation" @@ -8465,7 +8465,7 @@ dependencies = [ [[package]] name = "wayland-backend" version = "0.3.12" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "downcast-rs", "scoped-tls", @@ -8476,7 +8476,7 @@ dependencies = [ [[package]] name = "wayland-client" version = "0.31.12" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "bitflags 2.10.0", "wayland-backend", @@ -8486,7 +8486,7 @@ dependencies = [ [[package]] name = "wayland-egl" version = "0.32.9" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "wayland-backend", "wayland-sys", @@ -8495,7 +8495,7 @@ dependencies = [ [[package]] name = "wayland-protocols" version = "0.32.10" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "bitflags 2.10.0", "wayland-backend", @@ -8505,7 +8505,7 @@ dependencies = [ [[package]] name = "wayland-sys" version = "0.31.8" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ "makepad-error-log", "pkg-config 0.3.32", @@ -8586,7 +8586,7 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "weezl" version = "0.1.12" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "which" @@ -8690,11 +8690,11 @@ dependencies = [ [[package]] name = "windows" version = "0.62.2" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "windows-collections 0.3.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", - "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", - "windows-future 0.3.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-collections 0.3.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", + "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", + "windows-future 0.3.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -8709,9 +8709,9 @@ dependencies = [ [[package]] name = "windows-collections" version = "0.3.2" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -8754,11 +8754,11 @@ dependencies = [ [[package]] name = "windows-core" version = "0.62.2" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", - "windows-result 0.4.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", - "windows-strings 0.5.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", + "windows-result 0.4.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", + "windows-strings 0.5.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -8775,9 +8775,9 @@ dependencies = [ [[package]] name = "windows-future" version = "0.3.2" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-core 0.62.2 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -8855,7 +8855,7 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-link" version = "0.2.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "windows-numerics" @@ -8899,9 +8899,9 @@ dependencies = [ [[package]] name = "windows-result" version = "0.4.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -8916,9 +8916,9 @@ dependencies = [ [[package]] name = "windows-strings" version = "0.5.1" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" dependencies = [ - "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f)", + "windows-link 0.2.1 (git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411)", ] [[package]] @@ -9324,7 +9324,7 @@ dependencies = [ [[package]] name = "zerocopy" version = "0.8.39" -source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=f1db9eb974b3833db7caf45de88feb12251a589f#f1db9eb974b3833db7caf45de88feb12251a589f" +source = "git+https://www.github.com/OctoSense-org/makepad.git?rev=73dfc62a8358c7a6cce33e50a612ced28e5c7411#73dfc62a8358c7a6cce33e50a612ced28e5c7411" [[package]] name = "zerocopy" diff --git a/Cargo.toml b/Cargo.toml index de7ada6d..1f319815 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,19 +41,19 @@ path = "src/main.rs" libc = "0.2" # `appcard,maps`: the Octoscript-AppCard widget set (kit, text roles, weather, # finance, matplot) and the map navigation layer the appcard module renders. -makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", features = ["appcard", "maps"] } -makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } -makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } -makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", features = ["appcard", "maps"] } +makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } +makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } +makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } # The AI services wire only: the WM relays frames between the aichat child and the apps. -makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } -makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } +makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } # In-process hosting (aicontrol §3): the module contract, the palette applied # into each instance's isolate, and the modules this build links. -makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } -makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } -makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", default-features = false, optional = true } -makepad-photos = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", default-features = false, optional = true } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } +makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } +makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", default-features = false, optional = true } +makepad-photos = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", default-features = false, optional = true } octosense-reference = { path = "apps/reference", optional = true } # The whole Octoscript-AppCard app hosted in a tile, in-process (Phase B of # the AppCard port): octos-app's AppShell — routing brain, cards, kernel agent. @@ -61,15 +61,15 @@ octosense-appcard = { path = "apps/appcard", optional = true } # The assistant as a module, seated in the pane in-process: the web build's # only chat, a desktop option. Without the engine feature: no model runtime, # NoModel and the tool console (the child process keeps the real models). -makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", default-features = false, optional = true } +makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", default-features = false, optional = true } # A phone cannot spawn the desktop catalog's Cargo binaries. Link the # available modules into native mobile builds without requiring CLI flags. [target.'cfg(any(target_os = "android", target_os = "ios"))'.dependencies] octosense-reference = { path = "apps/reference" } octosense-appcard = { path = "apps/appcard" } -makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", default-features = false } -makepad-photos = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", default-features = false } +makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", default-features = false } +makepad-photos = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", default-features = false } [features] default = [] @@ -104,7 +104,7 @@ opt-level = 1 # one makepad lineage this workspace pins, so the graph has a single # makepad-widgets (a second one would make every widget type mismatch). [patch."https://github.com/ZhangHanDong/makepad.git"] -makepad-widgets = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-widgets = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } [profile.release] # cargo-makepad builds Android with `-C prefer-dynamic` (libstd as a bundled @@ -120,124 +120,124 @@ panic = "unwind" # every crate of this URL (the workspace's and octos-app's) resolves through the # www host alias of the same repository, at the workspace pin. [patch."https://github.com/OctoSense-org/makepad.git"] -ab_glyph_rasterizer = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.8" } -arrayvec = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.7.6" } -ash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.38.0+1.3.281" } -bit-set = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.8.0" } -bit-vec = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.8.0" } -bitflags = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.10.0" } -bytemuck = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.25.0" } -byteorder = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.5.0" } -cfg-if = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.4" } -cfg_aliases = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.1" } -crunchy = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.4" } -downcast-rs = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.2.1" } -equivalent = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.2" } -foldhash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.0" } -fxhash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.1" } -hashbrown = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.16.1" } -hexf-parse = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.1" } -i_float = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=3.0.0" } -i_key_sort = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.11.0" } -i_overlay = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=7.0.3" } -i_shape = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=3.0.0" } -i_tree = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.19.0" } -indexmap = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.13.0" } -libloading = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.8.9" } -makepad-ai = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-ai-services = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-aichat = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-app-module = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-apple-sys = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-byteorder-lite = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-code-editor = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.0" } -makepad-derive-wasm-bridge = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-derive-widget = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.0" } -makepad-draw = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.0" } -makepad-error-log = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-fast-inflate = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-filesystem-watcher = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-futures = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-futures-legacy = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-gif = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-git = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-half = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.7.1" } -makepad-html = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-image-tiles = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-latex-math = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-live-id = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-live-id-macros = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-live-reload-core = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-math = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-mbtile-reader = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-micro-proc-macro = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-micro-serde = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-micro-serde-derive = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-network = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-objc-sys = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-pdf-parse = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-photos = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-platform = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.0" } -makepad-platform-video = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-regex = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-script = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-script-derive = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-script-std = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-shared-bytes = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-sheets = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-sqlite = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-stitch = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-strict-json = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-studio-protocol = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-svg = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-tsdf = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-wasm-bridge = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.0" } -makepad-webp = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.4" } -makepad-widgets = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.0" } -makepad-wm-api = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-wm-theme = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.0" } -makepad-zune-bmp = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.2" } -makepad-zune-core = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.1" } -makepad-zune-inflate = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.54" } -makepad-zune-jpeg = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.15" } -makepad-zune-png = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.2" } -makepad-zune-qoi = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.2" } -memchr = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.7.6" } -naga = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=27.0.3" } -num-traits = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.20" } -once_cell = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.21.3" } -pkg-config = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.32" } -pulldown-cmark = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.12.2" } -rustc-hash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.1.0" } -rustybuzz = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.18.0" } -scoped-tls = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.1" } -sdfer = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.1" } -simd-adler32 = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.9" } -smallvec = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.15.1" } -spirv = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.0+sdk-1.3.268.0" } -thiserror = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.18" } -thiserror-impl = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.0.18" } -ttf-parser = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.24.1" } -unicase = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=2.9.0" } -unicode-bidi = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.18" } -unicode-bidi-mirroring = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.0" } -unicode-ccc = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.0" } -unicode-ident = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.0.22" } -unicode-linebreak = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.5" } -unicode-properties = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.4" } -unicode-script = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.8" } -unicode-segmentation = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=1.12.0" } -wayland-backend = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.12" } -wayland-client = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.31.12" } -wayland-egl = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.32.9" } -wayland-protocols = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.32.10" } -wayland-sys = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.31.8" } -weezl = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.1.12" } -windows = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.62.2" } -windows-collections = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.2" } -windows-core = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.62.2" } -windows-future = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.3.2" } -windows-link = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.2.1" } -windows-result = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.4.1" } -windows-strings = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.5.1" } -zerocopy = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", version = "=0.8.39" } +ab_glyph_rasterizer = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.8" } +arrayvec = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.7.6" } +ash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.38.0+1.3.281" } +bit-set = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.8.0" } +bit-vec = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.8.0" } +bitflags = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.10.0" } +bytemuck = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.25.0" } +byteorder = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.5.0" } +cfg-if = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.4" } +cfg_aliases = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.2.1" } +crunchy = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.2.4" } +downcast-rs = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.2.1" } +equivalent = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.2" } +foldhash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.2.0" } +fxhash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.2.1" } +hashbrown = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.16.1" } +hexf-parse = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.2.1" } +i_float = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=3.0.0" } +i_key_sort = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.11.0" } +i_overlay = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=7.0.3" } +i_shape = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=3.0.0" } +i_tree = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.19.0" } +indexmap = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.13.0" } +libloading = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.8.9" } +makepad-ai = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-ai-services = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-aichat = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-app-module = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-apple-sys = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-byteorder-lite = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-code-editor = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.0.0" } +makepad-derive-wasm-bridge = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-derive-widget = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.0.0" } +makepad-draw = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.0.0" } +makepad-error-log = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-fast-inflate = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-filesystem-watcher = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-futures = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-futures-legacy = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-gif = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-git = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-half = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.7.1" } +makepad-html = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-image-tiles = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-latex-math = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-live-id = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-live-id-macros = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-live-reload-core = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-math = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-mbtile-reader = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-micro-proc-macro = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-micro-serde = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-micro-serde-derive = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-network = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-objc-sys = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-pdf-parse = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-photos = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-platform = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.0.0" } +makepad-platform-video = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-regex = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-script = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-script-derive = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-script-std = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-shared-bytes = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-sheets = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-sqlite = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-stitch = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-strict-json = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-studio-protocol = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-svg = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-tsdf = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-wasm-bridge = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.0" } +makepad-webp = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.2.4" } +makepad-widgets = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.0.0" } +makepad-wm-api = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-wm-theme = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.0" } +makepad-zune-bmp = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.5.2" } +makepad-zune-core = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.5.1" } +makepad-zune-inflate = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.2.54" } +makepad-zune-jpeg = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.5.15" } +makepad-zune-png = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.5.2" } +makepad-zune-qoi = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.5.2" } +memchr = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.7.6" } +naga = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=27.0.3" } +num-traits = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.2.20" } +once_cell = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.21.3" } +pkg-config = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.3.32" } +pulldown-cmark = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.12.2" } +rustc-hash = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.1.0" } +rustybuzz = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.18.0" } +scoped-tls = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.1" } +sdfer = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.2.1" } +simd-adler32 = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.3.9" } +smallvec = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.15.1" } +spirv = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.3.0+sdk-1.3.268.0" } +thiserror = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.0.18" } +thiserror-impl = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.0.18" } +ttf-parser = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.24.1" } +unicase = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=2.9.0" } +unicode-bidi = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.3.18" } +unicode-bidi-mirroring = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.3.0" } +unicode-ccc = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.3.0" } +unicode-ident = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.0.22" } +unicode-linebreak = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.5" } +unicode-properties = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.4" } +unicode-script = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.5.8" } +unicode-segmentation = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=1.12.0" } +wayland-backend = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.3.12" } +wayland-client = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.31.12" } +wayland-egl = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.32.9" } +wayland-protocols = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.32.10" } +wayland-sys = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.31.8" } +weezl = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.1.12" } +windows = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.62.2" } +windows-collections = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.3.2" } +windows-core = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.62.2" } +windows-future = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.3.2" } +windows-link = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.2.1" } +windows-result = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.4.1" } +windows-strings = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.5.1" } +zerocopy = { git = "https://www.github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", version = "=0.8.39" } diff --git a/apps/appcard/Cargo.toml b/apps/appcard/Cargo.toml index e3037f0d..15eec285 100644 --- a/apps/appcard/Cargo.toml +++ b/apps/appcard/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" publish = false [dependencies] -makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f", features = ["appcard", "maps"] } -makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411", features = ["appcard", "maps"] } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } # The whole Octoscript-AppCard app as a library: routing brain, card store and # transport, L0 lowering, sessions, composer, kernel agent — mounted here as # its `AppShell` widget. No default features: the app's own entry points diff --git a/apps/reference/Cargo.toml b/apps/reference/Cargo.toml index cb9c6012..1c122f4d 100644 --- a/apps/reference/Cargo.toml +++ b/apps/reference/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" publish = false [dependencies] -makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } -makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f1db9eb974b3833db7caf45de88feb12251a589f" } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "73dfc62a8358c7a6cce33e50a612ced28e5c7411" } diff --git a/docs/perf-mobile-shell.md b/docs/perf-mobile-shell.md index 87f451e8..c72d61da 100644 --- a/docs/perf-mobile-shell.md +++ b/docs/perf-mobile-shell.md @@ -1,4 +1,4 @@ -# Mobile shell perf — baseline vs perf vs the idle-repaint fix (OnePlus 6T) +# Mobile shell perf — baseline, perf, the idle-repaint fix and the transition fixes (OnePlus 6T) Device: OnePlus 6T (ONEPLUS A6013), Snapdragon 845, 1080×2340 @ 60 Hz, over USB (`bf0a4730`). Both builds sit on `fix/hosted-appcard-mobile` @ fedd802 (PR #24): @@ -290,6 +290,136 @@ The shell's own draw channels account for only ~2 ms of \`event\` (home 1.0, ove - swipe home: 40 fps, p95 33 ms; - Recents → Home: 34 fps, p95 33 ms. +## Fourth column — main-thread and fill-rate fixes (`perf/transition-main-thread`) + +The fourth build is `perf/android-idle-repaint` plus: +- the makepad fork at `perf/android-main-thread` @ e596207 (six commits on #6); +- five shell commits: the run view's tick, the Android drawer's wallpaper and fills, the shade as the compositor's final glass, and the shade as one glass layer with its glyphs warmed. + +Measured with `perf_scenarios3.sh`, monitor **off**, two fresh launches per build. Raw data is in `scratchpad/perf-t-{before,before2,final1,final2}` (SurfaceFlinger presents) and `perf-t-finalmon` (the attribution run with the monitor on). The tables come from `ttable.py`. + +### How it was profiled +- **CPU.** `simpleperf record --call-graph dwarf -f 4000` as root on the release app, per scenario, both whole-process and render-thread only (`scratchpad/tprof/`). Symbols come from the APK's unstripped `libmakepad.so`. +- **Scheduling.** `atrace gfx view input sched freq idle` over a shade pull, a Recents hold and a return home. +- **GPU attribution.** A temporary `debug.octosense.ab` switch, not committed, turned parts of the shade and the drawer off one at a time. + +### Main-thread hotspots on PR #27's build (share of render-thread samples) +| scenario | App event dispatch | hosted AppCard (`MpModuleView`) | `draw_phone_scene` | `AppIconDraw` → `render_svg` | `render_view` (GL encode) | +|---|---|---|---|---|---| +| shade | 34 % | 22 % (`update_connection_indicator` 10 %) | 33 % | 27 % → 23 % | 20 % | +| open-app | 56 % | 35 % (15 %) | 16 % | 12 % → 11 % | 15 % | +| swipe home | 49 % | 33 % (15 %) | 16 % | 14 % → 12 % | 18 % | +| page swipe | 52 % | 34 % (15 %) | 21 % | 17 % → 15 % | 12 % | +| Recents hold | 34 % | 23 % (11 %) | 18 % | 13 % → 11 % | 33 % | +| Recents → Home | 50 % | 32 % (13 %) | 24 % | 20 % → 17 % | 12 % | +| group open | 50 % | 34 % (16 %) | 24 % | 21 % → 18 % | 15 % | + +**Icon tessellation.** `AppIconDraw` re-tessellated icons on every frame; `add_gradient_row` and `sample_stops` were the top self symbols. In the heaviest Recents frames, icon tessellation was 54 % of the frame. + +**The hosted AppCard.** Its cost was `Event::Signal` and `Event::Timer` dispatched from `handle_other_events`. The sources were a worker signal once per animation frame (Recents hold: 110 next-frames against 109 signals in 2 s) and a 125 Hz run-view timer. Each event ran the AppCard's `update_connection_indicator` script eval. + +**After the fixes:** +- `AppIconDraw` 0.8–1.8 %; +- `render_svg` 0–0.6 %; +- `glTexImage2D` 0 %; +- the module path 5–12 %. + +### Scheduling +- **Priority and cores.** The render thread ran at **nice 0**, while HWUI's RenderThread runs at −10. **21–28 % of its run time was on the little cores**, mostly between 576 MHz and 1.4 GHz, because `schedutil` ramps up from the idle gap before each transition. +- **No contention.** Run-queue wait was short (p50 0.09 ms, max 8 ms) and there were no lock waits. +- **Swap back-pressure.** `eglSwapBuffers` waits on the GPU, not on CPU work. In slow frames the render thread sits in D state while `queueBuffer` takes 22–73 ms. +- **Now:** nice −10, pinned to cpus 4–7. The first boost was undone by `warm_task_pool` (`UserInteractive` = nice 0), so the boost now runs after Startup. Android 11 has no ADPF hint API. +- **GPU clock.** The GPU (`msm-adreno-tz`) idles at 257 MHz and reaches 710 MHz within ~150 ms of a pull. It was not thermally limited (35 °C). + +### What the shade's frames were made of: the A/B +Shade pull and close, monitor off, two pulls per variant. + +| variant | fps | GPU-ready p95 ms | monitor on: `wait` mean / worst ms | +|---|---|---|---| +| everything drawn (4 runs) | 34–42 | 91–108 | 7–21 / 57–85 | +| no dim | 30–35 | 105–119 | — | +| no sheet glass | 39–50 | 63–68 | 4–6 / 16–34 | +| no sheet content | 41–43 | 70–94 | 12 / 79 | +| no cards | 34–41 | 100–121 | — | +| no text | 26–43 | 100–121 | — | +| no compositor at all | 44–46 | 84–106 | 4–20 / 31–64 | +| no dim, glass or content | 34 / **60.1** | 30 | **1.5–3.7 / 8–11** | + +**This is fill rate, not GL driver overhead.** CPU `draw` (the GL encode) stayed at 4–5.5 ms in every variant, including the one at 60 fps. The swap wait fell from 7–21 ms to 1.5 ms only once the stacked full-screen blends were gone: the sheet glass, its 55–62 % tint layer, the dim and the content. A Vulkan path would not remove this cost; drawing fewer full-screen blended pixels does. + +**After the shade fixes** (final glass, one merged glass layer, dim clipped, one fewer mip), with the monitor on, `wait` averages 4.9–16 ms with a worst case of 36–47 ms. Before the fixes it averaged 7–21 ms, worst 57–85 ms. + +### The Recents hold depends on where it starts +The harness reaches Recents from the Android drawer, because its page swipe ends there. +- **Over Home:** the hold already ran at 52–56 fps (GPU-ready p50 12 ms). +- **Over the drawer:** 38–40 fps (GPU-ready p50 42 ms). + +A/B over the drawer: + +| variant | fps | +|---|---| +| drawer's icons, labels or search pill removed | no change | +| either full-screen fill removed (the system-bar fill under the drawer, or the drawer's own sheet) | 42–44 | +| both fills removed | 48–49 | +| overview glass removed | 57–58 (p95 16.7 ms) | + +The committed fix draws only the system-bar strips under the drawer and a flat fill for the sheet. It was measured through the A/B switch only: the phone disconnected before a harness run on the final commit. + +### Fixes +| fix | where | +|---|---| +| a worker's UI wake dispatches but does not paint between vsync beats | fork `platform/src/os/linux/android/android.rs` (`FromJavaMessage::Wake`), `android_jni.rs`, `os/linux/mod.rs` | +| draw-storage retirement no longer raises `Event::Signal` on Android | fork `platform/src/draw_list.rs`, `thread.rs` (`submit_detached_silent`) | +| icon tessellation cached per 4 % size bucket | fork `widgets/src/app_icon.rs` | +| render thread at nice −10 on the fast cluster, after Startup | fork `platform/src/os/linux/android/android.rs` (`boost_render_thread`) | +| integer blur level: one bicubic read, `ceil(level)` mips | fork `widgets/src/gauss_view.rs` (`sample_blur`), `backdrop.rs` | +| run view ticks only with a process attached | `src/run_view.rs` | +| Android drawer: no wallpaper, no full-screen fill under it | `src/mobile.rs` (`scene_plan`), `src/desk/phone.rs`, `src/mobile_surface.rs` | +| shade sheet = the compositor's final glass | `src/desk/phone.rs` | +| shade = one merged-tint glass, dim below the sheet only, glyphs warmed once | `src/mobile_shade.rs`, `src/mobile_surface.rs` | + +### Table 5 — SurfaceFlinger, PR #27's build vs this build, monitor off +Cells: burst fps · p95 ms · intervals > 33 ms / burst intervals · worst first frame of a burst (ms). The build measured here predates the drawer fill commit. + +| scenario | before run 1 | before run 2 | after run 1 | after run 2 | +|---|---|---|---|---| +| open-app-tap-AppCard-icon | 41.4 · 49.9 · 4/20 · 49.9 | 30.1 · 50.0 · 5/21 · 16.6 | 40.1 · 66.5 · 4/20 · 49.9 | 33.4 · 166.3 · 4/20 · 16.6 | +| swipe-up-home | 43.7 · 33.3 · 0/24 · 33.3 | 42.1 · 33.3 · 1/21 · 49.9 | 45.6 · 33.3 · 0/22 · 16.6 | 41.3 · 33.3 · 1/22 · 49.9 | +| shade-pull-close | 33.7 · 49.9 · 9/46 · 66.5 | 33.9 · 49.9 · 8/48 · 83.2 | 45.1 · 49.9 · 3/33 · 49.9 | 45.7 · 49.9 · 2/35 · 33.3 | +| page-swipe-right-then-back | 41.8 · 66.5 · 2/32 · 199.6 | 35.1 · 133.1 · 2/28 · 133.1 | 37.1 · 83.0 · 2/29 · 199.7 | 47.0 · 33.3 · 1/25 · 33.3 | +| recents-swipe-up-hold | 34.9 · 33.3 · 1/75 · 149.7 | 34.5 · 49.9 · 4/74 · 83.2 | 38.8 · 33.5 · 0/84 · 33.5 | 36.3 · 33.3 · 1/84 · 149.6 | +| recents-to-home | 30.8 · 66.5 · 2/21 · 199.6 | 41.5 · 66.3 · 1/20 · 66.3 | 41.5 · 66.5 · 1/20 · 66.5 | 45.1 · 33.3 · 0/24 · 16.6 | +| island-demo-triple-tap-clock | 36.7 · 16.8 · 1/22 · 249.5 | 49.0 · 49.9 · 2/22 · 66.5 | 40.7 · 16.8 · 1/23 · 199.6 | 42.7 · 16.6 · 1/22 · 166.3 | +| group-open-tap-Work | 53.6 · 33.3 · 1/115 · 49.9 | 52.4 · 33.4 · 2/115 · 49.8 | 52.3 · 33.4 · 2/100 · 33.1 | 53.9 · 33.3 · 1/130 · 49.9 | +| group-close-tap-scrim | 48.1 · 33.3 · 0/16 · 33.3 | 36.1 · 99.8 · 2/15 · 50.0 | 48.1 · 49.9 · 1/16 · 49.9 | 48.1 · 50.0 · 1/16 · 50.0 | + +- **Shade:** 34 → 45–46 fps; >33 ms frames 8–9 → 2–3; first frame 67–83 → 33–50 ms. +- **Recents → Home:** 31–42 → 42–45 fps. +- **Recents hold:** 35 → 36–39 fps. The harness starts it from the drawer; see the section above. +- **Page swipe, island demo, open-app:** within run-to-run noise. Their first frames are still 133–250 ms. + +### Table 6 — frame monitor on this build (attribution run, busy windows, mean ms per frame) +| scenario | frames | gap p95 ms | event | draw | wait | +|---|---|---|---|---|---| +| open-app | 28 | 289.3 | 13.1 | 3.7 | 12.6 | +| swipe-up-home | 23 | 66.4 | 4.0 | 4.8 | 15.4 | +| shade-pull+close | 40 | 450.2 | 5.0 | 4.9 | 8.2 | +| page-swipe | 33 | 431.9 | 5.9 | 3.3 | 1.8 | +| recents (swipe-up-hold, from the drawer) | 89 | 58.4 | 8.2 | 4.7 | 12.0 | +| recents-to-home | 28 | 44.0 | 9.7 | 4.2 | 10.2 | +| island-demo | 27 | 297.9 | 7.1 | 2.9 | 2.3 | +| group-open | 228 | 26.8 | 7.2 | 4.0 | 3.0 | +| group-close | 19 | 346.9 | 8.3 | 5.2 | 4.7 | + +### Not met, and why +- **No transition reaches ≥ 55 fps with p95 ≤ 20 ms in the harness.** Group open is closest: 52–54 fps, p95 33 ms. The remaining cost is GPU fill in the glass and full-screen layers; Recents over Home reaches 52–56 fps. +- **First frames of 133–250 ms remain.** + - *Open-app:* 213 ms is the AppCard's script VM on first open. That covers parsing plus a failed property lookup that builds a `suggest_property` Levenshtein list. + - *Open-app, continued:* a further 190 ms is `inflate_fast`: a compressed font asset (`to_java_load_asset` → `ensure_fonts_loaded`, likely the 19 MB CJK face) decompressed on the render thread. + - *Page swipe and island:* the 150–250 ms first frames were not profiled. + - *Candidate fixes:* store fonts uncompressed in the APK (cargo-makepad's `aapt add`) or preload them off the main thread, and fix the AppCard's failed script lookup. +- **A 136×128 palette PNG is decoded every ~50 ms** during a DeepSeek streaming turn. This runs on the AppCard's backend thread, not the render thread, and belongs to Octoscript-AppCard. + ## Device housekeeping - **What the run changed.** It set `svc power stayon true` and `settings put system screen_off_timeout 1800000`. - **Restored at the end.** `settings put system screen_off_timeout 30000` (the original value) and `svc power stayon false`. diff --git a/src/desk/phone.rs b/src/desk/phone.rs index 51a363dd..f9670c45 100644 --- a/src/desk/phone.rs +++ b/src/desk/phone.rs @@ -259,8 +259,19 @@ impl WmDesk { self.phone_ui.draw_wallpaper(cx,full,style,dark,phone.wallpaper_phase); } else { // Under an open app only the system-bar strips can show: the - // status bar's own colour, one flat quad. - self.phone_ui.rounded(cx,full,0.0,if dark {crate::shell::rgb(24,24,28)}else{crate::shell::rgb(248,248,252)}); + // status bar's own colour, one flat fill. Under Android's opaque + // drawer only the strips outside the safe area can: a full-screen + // fill there was a second full-screen layer under the drawer's own, + // and with Recents' glass over both the frame missed its vsync + // (a hold from the drawer ran 38-40 fps, 48-49 without the two). + let bars=if dark {crate::shell::rgb(24,24,28)}else{crate::shell::rgb(248,248,252)}; + if phone.screen==PhoneScreen::Drawer && style!=crate::desktop::DesktopStyle::Ios { + let bottom=screen.pos.y+screen.size.y; + self.phone_ui.d.solid(cx,Rect{pos:full.pos,size:dvec2(full.size.x,(screen.pos.y-full.pos.y).max(0.0))},bars); + self.phone_ui.d.solid(cx,Rect{pos:dvec2(full.pos.x,bottom),size:dvec2(full.size.x,(full.pos.y+full.size.y-bottom).max(0.0))},bars); + } else { + self.phone_ui.d.solid(cx,full,bars); + } } self.phone_content(full); let home_backdrop=if plan.compose && style==crate::desktop::DesktopStyle::Ios && phone.openness<0.999 { @@ -354,13 +365,18 @@ impl WmDesk { } // The captures' own draws are the `module` channel (record_capture). if perf {clock=std::time::Instant::now();} - // The shade's frosted sheet samples the finished scene here (the - // final-glass snapshot is upside down on GL). - let shade_backdrop=if plan.compose && phone.shade.open>0.001 {Some(self.compositor.as_mut().unwrap().backdrop(cx,screen,3.0))}else{None}; - let glass=if plan.compose && phone.keyboard>0.5 { + let shade_glass=plan.compose && phone.shade.open>0.001; + let keyboard_glass=if plan.compose && phone.keyboard>0.5 { Some((Rect {pos:screen.pos+dvec2(0.0,screen.size.y-phone.keyboard-24.0),size:dvec2(screen.size.x,phone.keyboard)},4.0)) }else{None}; - let backdrop=if plan.compose {self.compositor.as_mut().unwrap().finish(cx,screen,glass).0} else {None}; + // The shade's sheet samples the finished scene, so it is the + // compositor's final glass: a mid-scene `backdrop` here opened a second + // segment holding nothing but a full-screen copy of the first, one + // more full-resolution scene pass per frame of the pull. With the + // keyboard up (its own final glass) the shade keeps the checkpoint. + let shade_backdrop=if shade_glass && keyboard_glass.is_some() {Some(self.compositor.as_mut().unwrap().backdrop(cx,screen,3.0))}else{None}; + let final_glass=if shade_glass && keyboard_glass.is_none() {Some((screen,3.0))} else {keyboard_glass}; + let backdrop=if plan.compose {self.compositor.as_mut().unwrap().finish(cx,screen,final_glass).0} else {None}; if perf {crate::mobile_perf::span(cx.cx,ch.glass,clock);} let state=scope.data.get_mut::().unwrap(); for r in excluded {state.phone.exclusions.add(r,[false,false,true,true]);} diff --git a/src/mobile.rs b/src/mobile.rs index 184587d8..fc86a5f4 100644 --- a/src/mobile.rs +++ b/src/mobile.rs @@ -234,7 +234,16 @@ impl PhoneState { || self.groups.window_visible() || self.shade.open > 0.001 || (ios && self.keyboard > 0.5); - ScenePlan { compose: glass, wallpaper: !app_settled, home: !app_settled } + // Android's app drawer is an opaque full-screen sheet and switches in + // without a slide, so the wallpaper under it is never seen, not even + // under the Recents blur when a home swipe starts on the drawer. The + // wallpaper shader is the most expensive full-screen fill the phone + // draws, and with glass up it ran once more in the backdrop scene: a + // Recents hold over the drawer presented at 39 fps (GPU-ready 43 ms) + // against 55 fps (13 ms) over Home. The iOS App Library is + // translucent and keeps it. + let drawer_covers = !ios && self.screen == PhoneScreen::Drawer; + ScenePlan { compose: glass, wallpaper: !app_settled && !drawer_covers, home: !app_settled } } } @@ -329,6 +338,18 @@ mod tests { assert!(phone.accepts_app_input()); } #[test] + fn the_android_drawer_hides_the_wallpaper_even_under_glass() { + let mut phone = PhoneState::default(); + phone.navigate(PhoneScreen::Drawer); + assert_eq!(phone.scene_plan(false), ScenePlan { compose: false, wallpaper: false, home: true }, "the opaque drawer covers the wallpaper"); + phone.overview = 0.4; + assert_eq!(phone.scene_plan(false), ScenePlan { compose: true, wallpaper: false, home: true }, "a home swipe from the drawer blurs the drawer, not the wallpaper"); + assert!(phone.scene_plan(true).wallpaper, "the iOS App Library is translucent: its wallpaper stays"); + phone.overview = 0.0; + phone.navigate(PhoneScreen::Home); + assert!(phone.scene_plan(false).wallpaper, "back on Home the wallpaper draws"); + } + #[test] fn compact_faces_wait_for_the_home_page_to_settle() { let mut phone = PhoneState::default(); assert!(phone.home_settled() && phone.foreground().is_none()); diff --git a/src/mobile_shade.rs b/src/mobile_shade.rs index 8722e3ec..52947018 100644 --- a/src/mobile_shade.rs +++ b/src/mobile_shade.rs @@ -424,11 +424,25 @@ pub fn draw(cx: &mut Cx2d, d: &mut ShellDraw, chrome: &mut DrawDesktopChrome, ic let sheet = shade.sheet_rect(screen); let content = shade.content_rect(screen); // The dimmed, blurred backdrop, then the sheet's own frosted surface. - rounded(chrome, cx, screen, 0.0, alpha(rgb(0, 0, 0), 0.28 * open)); + // The dim, only where the sheet does not cover: with a backdrop the + // sheet's glass fills at alpha 1 from a snapshot taken before this + // overlay, so dim drawn under it never reached the screen. + let covered = backdrop.is_some(); + let dim = if covered { rect(screen.pos.x, sheet.pos.y + sheet.size.y, screen.size.x, (screen.pos.y + screen.size.y - sheet.pos.y - sheet.size.y).max(0.0)) } else { screen }; + if dim.size.y > 0.0 { rounded(chrome, cx, dim, 0.0, alpha(rgb(0, 0, 0), 0.28 * open)); } hits.push((screen, PhoneHit::Shade(ShadeHit::Backdrop))); + // The sheet: one glass whose tint is the overview tint (#101329 at 0.20) + // with the sheet colour composited over it, folded into a single mix: + // mix(mix(T, g, 0.2), c, a) = mix(T, g', 1 - 0.8 (1 - a)). The rim and + // inner shadow scale by (1 - a), as the tint layer used to cover them. + let (tint, tint_alpha, edge) = if dark { (vec4(12.56 / 255.0, 12.98 / 255.0, 22.95 / 255.0, 1.0), 0.64, 0.45) } else { (vec4(211.98 / 255.0, 214.09 / 255.0, 223.61 / 255.0, 1.0), 0.696, 0.38) }; glass.set_blurriness(cx, 3.0); + let bg = &mut glass.draw_bg.draw_vars; + bg.set_dyn_instance(cx, live_id!(tint_color), &[tint.x, tint.y, tint.z, tint.w]); + bg.set_uniform(cx, live_id!(tint_alpha), &[tint_alpha]); + bg.set_dyn_instance(cx, live_id!(rim_alpha), &[0.55 * edge]); + bg.set_dyn_instance(cx, live_id!(inner_shadow_alpha), &[0.10 * edge]); glass.draw_surface_with_backdrop(cx, sheet, backdrop, 1.0); - rounded(chrome, cx, sheet, 0.0, if dark { alpha(rgb(12, 12, 20), 0.55) } else { alpha(rgb(236, 238, 246), 0.62) }); hits.push((sheet, PhoneHit::Shade(ShadeHit::Sheet))); let ink = if dark { rgb(245, 245, 250) } else { rgb(26, 26, 34) }; let accent = if ios { rgb(0, 122, 255) } else { rgb(103, 80, 164) }; @@ -461,6 +475,29 @@ pub fn draw(cx: &mut Cx2d, d: &mut ShellDraw, chrome: &mut DrawDesktopChrome, ic rounded(chrome, cx, rect(screen.pos.x + screen.size.x * 0.5 - 24.0, by - 16.0, 48.0, 5.0), 2.5, alpha(ink, 0.35)); } +/// Rasterize the shade's glyphs and tessellate its notification icons once, +/// before the first pull: both pages drawn from a seeded copy of the shade, +/// off-screen and fully transparent, on an idle frame. The first pull used to +/// pay it inside its first frames (glyph atlas packing under `draw_overlay`, +/// ~30 ms of a 55 ms frame on the OnePlus 6T). The live shade is untouched: +/// its fixtures still seed on the first real open. +pub fn prewarm(cx: &mut Cx2d, d: &mut ShellDraw, chrome: &mut DrawDesktopChrome, icons: &mut AppIconDraw, state: &WmState, screen: Rect) { + let mut shade = state.phone.shade.clone(); + if shade.notifications.is_empty() { shade.seed_fixtures(); } + let style = state.style.target; + let ios = style == DesktopStyle::Ios; + let clear = vec4(0.0, 0.0, 0.0, 0.0); + let accent = if ios { rgb(0, 122, 255) } else { rgb(103, 80, 164) }; + let mut hits = Vec::new(); + // Past the right edge of the window: recorded, never rasterized on screen. + let x = screen.pos.x + screen.size.x * 3.0; + let page = rect(x, screen.pos.y, screen.size.x, screen.size.y); + d.label(cx, rect(x + 24.0, page.pos.y + 14.0, 200.0, 30.0), true, 22.0, clear, HAlign::Left, &state.phone.clock); + d.label(cx, rect(x + 24.0, page.pos.y + 14.0, 200.0, 30.0), false, 13.0, clear, HAlign::Right, "0123456789% charging"); + draw_notifications(cx, d, chrome, icons, &mut hits, &shade, style, state.style.dark, clear, accent, clear, page); + draw_controls(cx, d, chrome, &mut hits, &shade, state.style.dark, clear, accent, clear, rect(x + screen.size.x, screen.pos.y, screen.size.x, screen.size.y)); +} + #[allow(clippy::too_many_arguments)] fn draw_notifications(cx: &mut Cx2d, d: &mut ShellDraw, chrome: &mut DrawDesktopChrome, icons: &mut AppIconDraw, hits: &mut Vec<(Rect, PhoneHit)>, shade: &ShadeState, style: DesktopStyle, dark: bool, ink: Vec4f, accent: Vec4f, card: Vec4f, page: Rect) { let x = page.pos.x; diff --git a/src/mobile_surface.rs b/src/mobile_surface.rs index 29e1fba1..093b6c44 100644 --- a/src/mobile_surface.rs +++ b/src/mobile_surface.rs @@ -56,6 +56,16 @@ script_mod! { lensing_strength: 0.0 specular_strength: 0.0 border_alpha: 0.0 } } + // The shade's sheet: the overview glass with the sheet's own tint + // folded in (desk light/dark tints below are set per draw), so the + // sheet is one full-width blend instead of a glass plus a tint layer. + shade_glass: GlassPanel { + draw_bg +: { + blur_level: 3.0 corner_radius: 0.0 + tint_color: #101329 tint_alpha: 0.20 surface_alpha: 1.0 + lensing_strength: 0.0 specular_strength: 0.0 border_alpha: 0.0 + } + } perf_graph: PerfGraph {panel_width: 380.0 panel_height: 210.0 panel_margin: 12.0} keyboard_glass: GlassPanel { draw_bg +: { @@ -127,6 +137,9 @@ pub struct PhoneSurface { /// the shell draws and schedules none of its own. #[live] perf_graph: PerfGraph, #[live] pub overview_glass: GaussRoundedView, + #[live] pub shade_glass: GaussRoundedView, + /// The shade's glyphs were rasterized ahead of its first pull. + #[rust] shade_warm: bool, #[live] pub group_glass: GaussRoundedView, #[rust] pressed: Option, #[live] wallpaper: DrawQuad, @@ -324,7 +337,9 @@ impl PhoneSurface { fn draw_android_drawer(&mut self, cx: &mut Cx2d, state: &WmState, screen: Rect, ids: &[(String,String)]) { let style=state.style.target; let landscape=screen.size.x>screen.size.y; - self.rounded(cx,screen,0.0,if state.style.dark {rgb(24,22,31)}else{rgb(249,245,255)}); + // A flat fill, not the SDF chrome quad: the sheet is a full-screen + // opaque rect, and under Recents' glass every full-screen layer counts. + self.d.solid(cx,screen,if state.style.dark {rgb(24,22,31)}else{rgb(249,245,255)}); let ink=if state.style.dark {rgb(255,255,255)}else{rgb(31,27,38)}; let pill=self.draw_search(cx,state,screen,ink); if state.phone.searching() {self.draw_search_results(cx,state,screen,pill,ids,ink);return;} @@ -452,7 +467,11 @@ impl PhoneSurface { self.d.icon_centered(cx,Ico::ChevronLeft,back,16.0,nav_ink);self.hits.push((back,PhoneHit::Back)); } if perf {crate::mobile_perf::span(cx.cx,ch.overlay,clock);clock=std::time::Instant::now();} - crate::mobile_shade::draw(cx,&mut self.d,&mut self.chrome,&mut self.icons,&mut self.overview_glass,&mut self.hits,state,screen,backdrop); + if !self.shade_warm && phone.shade.open<0.001 && phone.gesture.is_none() { + self.shade_warm=true; + crate::mobile_shade::prewarm(cx,&mut self.d,&mut self.chrome,&mut self.icons,state,screen); + } + crate::mobile_shade::draw(cx,&mut self.d,&mut self.chrome,&mut self.icons,&mut self.shade_glass,&mut self.hits,state,screen,backdrop); if perf { crate::mobile_perf::span(cx.cx,ch.shade,clock); // Above the shade, inside the navigation band's top edge. diff --git a/src/run_view.rs b/src/run_view.rs index 21082680..c6005ee0 100644 --- a/src/run_view.rs +++ b/src/run_view.rs @@ -272,7 +272,11 @@ impl ScriptHook for MpRunView { fn on_after_new(&mut self, vm: &mut ScriptVm) { vm.with_cx_mut(|cx| { self.draw_app.set_texture(0, &cx.null_texture()); - self.tick_timer = cx.start_interval(0.008); + // The child-process tick (`StudioToApp::Tick`, bootstrap resends) + // runs only while a process is attached (`set_target`): a view + // without one used to keep a 125 Hz interval whose `Event::Timer` + // went through the whole app — hosted modules included — on every + // pass of the event loop, on a phone that hosts no processes. self.draw_app .draw_vars .set_dyn_instance(cx, id!(packed_header), &[1.0f32]); @@ -317,6 +321,9 @@ impl MpRunView { self.bootstrap_pending = target.is_some(); self.bootstrap_tick_count = 0; if target.is_some() { + if self.tick_timer.is_empty() { + self.tick_timer = cx.start_interval(0.008); + } // Keep redrawing during startup so bootstrap messages resend // until the child socket is ready. self.redraw_countdown = self.redraw_countdown.max(240); @@ -324,6 +331,10 @@ impl MpRunView { if had_target { cx.hide_text_ime(); } + if !self.tick_timer.is_empty() { + cx.stop_timer(self.tick_timer); + self.tick_timer = Timer::empty(); + } self.redraw_countdown = 0; } self.draw_app.set_texture(0, &cx.null_texture());