amanda/egui-test
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update egui to 0.16

Browse source
This commit is contained in:
Amanda Graven 2022-01-04 17:29:02 +01:00
parent 84112a1027
commit 146282f0c8
Signed by: amanda
GPG key ID: 45C461CDC9286390
4 changed files with 225 additions and 288 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

479
Cargo.lock generated
View file

@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af0ac006645f86f20f6c6fa4dcaef920bf803df819123626f9440e35835e7d80" checksum = "af0ac006645f86f20f6c6fa4dcaef920bf803df819123626f9440e35835e7d80"
dependencies = [ dependencies = [
"ab_glyph_rasterizer", "ab_glyph_rasterizer",
"owned_ttf_parser 0.12.1", "owned_ttf_parser",
] ]
[[package]] [[package]]
@ -87,19 +87,6 @@ dependencies = [
"version_check", "version_check",
] ]
[[package]]
name = "andrew"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf"
dependencies = [
"bitflags",
"rusttype",
"walkdir",
"xdg",
"xml-rs",
]
[[package]] [[package]]
name = "android_glue" name = "android_glue"
version = "0.2.3" version = "0.2.3"
@ -247,12 +234,12 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8"
[[package]] [[package]]
name = "calloop" name = "calloop"
version = "0.6.5" version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c" checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82"
dependencies = [ dependencies = [
"log", "log",
"nix 0.18.0", "nix 0.22.0",
] ]
[[package]] [[package]]
@ -498,20 +485,6 @@ dependencies = [
"cfg-if 1.0.0", "cfg-if 1.0.0",
] ]
[[package]]
name = "crossbeam"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-channel",
"crossbeam-deque",
"crossbeam-epoch",
"crossbeam-queue",
"crossbeam-utils",
]
[[package]] [[package]]
name = "crossbeam-channel" name = "crossbeam-channel"
version = "0.5.1" version = "0.5.1"
@ -546,16 +519,6 @@ dependencies = [
"scopeguard", "scopeguard",
] ]
[[package]]
name = "crossbeam-queue"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils",
]
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.8.5" version = "0.8.5"
@ -585,6 +548,12 @@ dependencies = [
"cipher", "cipher",
] ]
[[package]]
name = "cty"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35"
[[package]] [[package]]
name = "curve25519-dalek" name = "curve25519-dalek"
version = "3.2.0" version = "3.2.0"
@ -600,9 +569,9 @@ dependencies = [
[[package]] [[package]]
name = "darling" name = "darling"
version = "0.10.2" version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d706e75d87e35569db781a9b5e2416cff1236a47ed380831f959382ccd5f858" checksum = "d0d720b8683f8dd83c65155f0530560cba68cd2bf395f6513a483caee57ff7f4"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"darling_macro", "darling_macro",
@ -610,9 +579,9 @@ dependencies = [
[[package]] [[package]]
name = "darling_core" name = "darling_core"
version = "0.10.2" version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b" checksum = "7a340f241d2ceed1deb47ae36c4144b2707ec7dd0b649f894cb39bb595986324"
dependencies = [ dependencies = [
"fnv", "fnv",
"ident_case", "ident_case",
@ -624,9 +593,9 @@ dependencies = [
[[package]] [[package]]
name = "darling_macro" name = "darling_macro"
version = "0.10.2" version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" checksum = "72c41b3b7352feb3211a0d743dc5700a4e3b60f51bd2b368892d1e0f9a95f44b"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"quote 1.0.10", "quote 1.0.10",
@ -692,26 +661,6 @@ dependencies = [
"dirs-sys-next", "dirs-sys-next",
] ]
[[package]]
name = "dirs"
version = "3.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
dependencies = [
"dirs-sys",
]
[[package]]
name = "dirs-sys"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
dependencies = [
"libc",
"redox_users",
"winapi",
]
[[package]] [[package]]
name = "dirs-sys-next" name = "dirs-sys-next"
version = "0.1.2" version = "0.1.2"
@ -729,22 +678,13 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
[[package]]
name = "dlib"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76"
dependencies = [
"libloading 0.6.7",
]
[[package]] [[package]]
name = "dlib" name = "dlib"
version = "0.5.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794" checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
dependencies = [ dependencies = [
"libloading 0.7.1", "libloading",
] ]
[[package]] [[package]]
@ -778,9 +718,9 @@ dependencies = [
[[package]] [[package]]
name = "eframe" name = "eframe"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a084390b90aa223d5fb6ee3d2ac3a2ded0df212f684f91fbb5f0f45ab9e0724" checksum = "a8fd502d42c805bab4c2eccfaf3e28243fe3a5870ac0c13c4514470ea6d8fb19"
dependencies = [ dependencies = [
"egui", "egui",
"egui-winit", "egui-winit",
@ -791,9 +731,9 @@ dependencies = [
[[package]] [[package]]
name = "egui" name = "egui"
version = "0.15.0" version = "0.16.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1c8d416a3343cbfc6f4d17bb1cba46b4d7efecb9ee541967763e0b5e04e5fae7" checksum = "7c733356eb5f1139fdeedc370c00e9ea689c5d9120502c43925285bc7249a333"
dependencies = [ dependencies = [
"ahash", "ahash",
"epaint", "epaint",
@ -818,9 +758,9 @@ dependencies = [
[[package]] [[package]]
name = "egui-winit" name = "egui-winit"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc403e91d1bd693239f1c734193cdf0eb38c8682bbfb9990c4b6cd2db5ee368e" checksum = "1d5469a6ffc609e9e41e647617c0480ea4af69a8563e6efc4e1d7df0d550b5ef"
dependencies = [ dependencies = [
"copypasta", "copypasta",
"egui", "egui",
@ -832,9 +772,9 @@ dependencies = [
[[package]] [[package]]
name = "egui_glium" name = "egui_glium"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26478ec89b8c9c41a45687a90f9c8fc18106e3ffd8a08559285d625185a2ac92" checksum = "652110ddd1da1da0aa66a52d68695d828f4ab55cdc5bc21d779bfe9e440b0ec7"
dependencies = [ dependencies = [
"egui", "egui",
"egui-winit", "egui-winit",
@ -844,9 +784,9 @@ dependencies = [
[[package]] [[package]]
name = "egui_web" name = "egui_web"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43f2af8984a1c9ecaaaf7f11424c78185c89b5cfe8dab3bd0fac641db81c5763" checksum = "0a717dbb0cc1909a4c7c0955cc0cf7c77a9eee2a88cca18fe96888c428a4c206"
dependencies = [ dependencies = [
"egui", "egui",
"epi", "epi",
@ -864,9 +804,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]] [[package]]
name = "emath" name = "emath"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24a1aaa922d55da6a2bf32957c3d153e7fb9d52ed8d69777a75092240172eb6e" checksum = "55673de2eb96660dde25ba7b2d36a7054beead1a2bec74dcfd5eb05a1e1ba76d"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -882,9 +822,9 @@ dependencies = [
[[package]] [[package]]
name = "epaint" name = "epaint"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16bb4d3b8bbbd132c99d2a5efec8567e8b6d09b742f758ae6cf1e4b104fe0231" checksum = "adfd9296f7f92902e41c0e8e5deca6d2fb29f289c86d03a01ea01bd7498316c2"
dependencies = [ dependencies = [
"ab_glyph", "ab_glyph",
"ahash", "ahash",
@ -896,9 +836,9 @@ dependencies = [
[[package]] [[package]]
name = "epi" name = "epi"
version = "0.15.0" version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f5e4e08127f9b86e2c450c96a3032764b63546eb170c2fc54684dc70ff3fc82" checksum = "b4ae4ce3271febeacc5b4afbd77e500316c6ba316561067acbdddf0c14268a7c"
dependencies = [ dependencies = [
"directories-next", "directories-next",
"egui", "egui",
@ -1176,9 +1116,9 @@ dependencies = [
[[package]] [[package]]
name = "glium" name = "glium"
version = "0.30.2" version = "0.31.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "506a2aa1564891d447ae5d1ba37519a8efd6d01ea3e7952da81aa30430c90007" checksum = "0ab4f09b43d8ee427a700cb9ed3b20e0e858d62a509edded1a98ca5707d68e19"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"fnv", "fnv",
@ -1205,9 +1145,9 @@ dependencies = [
[[package]] [[package]]
name = "glutin" name = "glutin"
version = "0.27.0" version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "762d6cd2e1b855d99668ebe591cc9058659d85ac39a9a2078000eb122ddba8f0" checksum = "00ea9dbe544bc8a657c4c4a798c2d16cd01b549820e47657297549d28371f6d2"
dependencies = [ dependencies = [
"android_glue", "android_glue",
"cgl", "cgl",
@ -1219,12 +1159,12 @@ dependencies = [
"glutin_glx_sys", "glutin_glx_sys",
"glutin_wgl_sys", "glutin_wgl_sys",
"lazy_static", "lazy_static",
"libloading 0.7.1", "libloading",
"log", "log",
"objc", "objc",
"osmesa-sys", "osmesa-sys",
"parking_lot", "parking_lot",
"wayland-client", "wayland-client 0.29.3",
"wayland-egl", "wayland-egl",
"winapi", "winapi",
"winit", "winit",
@ -1541,16 +1481,6 @@ version = "0.2.105"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013"
[[package]]
name = "libloading"
version = "0.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
dependencies = [
"cfg-if 1.0.0",
"winapi",
]
[[package]] [[package]]
name = "libloading" name = "libloading"
version = "0.7.1" version = "0.7.1"
@ -1728,18 +1658,18 @@ checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
[[package]] [[package]]
name = "memmap2" name = "memmap2"
version = "0.1.0" version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a" checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4"
dependencies = [ dependencies = [
"libc", "libc",
] ]
[[package]] [[package]]
name = "memmap2" name = "memmap2"
version = "0.2.3" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" checksum = "00b6c2ebff6180198788f5db08d7ce3bc1d0b617176678831a7510825973e357"
dependencies = [ dependencies = [
"libc", "libc",
] ]
@ -1798,15 +1728,16 @@ dependencies = [
] ]
[[package]] [[package]]
name = "mio-misc" name = "mio"
version = "1.2.1" version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ddf05411bb159cdb5801bb10002afb66cb4572be656044315e363460ce69dc2" checksum = "ba272f85fa0b41fc91872be579b3bbe0f56b792aa361a380eb669469f68dafb2"
dependencies = [ dependencies = [
"crossbeam", "libc",
"crossbeam-queue",
"log", "log",
"mio", "miow",
"ntapi",
"winapi",
] ]
[[package]] [[package]]
@ -1820,10 +1751,11 @@ dependencies = [
[[package]] [[package]]
name = "ndk" name = "ndk"
version = "0.3.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8794322172319b972f528bf90c6b467be0079f1fa82780ffb431088e741a73ab" checksum = "96d868f654c72e75f8687572699cdabe755f03effbb62542768e995d5b8d699d"
dependencies = [ dependencies = [
"bitflags",
"jni-sys", "jni-sys",
"ndk-sys", "ndk-sys",
"num_enum", "num_enum",
@ -1832,9 +1764,9 @@ dependencies = [
[[package]] [[package]]
name = "ndk-glue" name = "ndk-glue"
version = "0.3.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5caf0c24d51ac1c905c27d4eda4fa0635bbe0de596b8f79235e0b17a4d29385" checksum = "fc291b8de2095cba8dab7cf381bf582ff4c17a09acf854c32e46545b08085d28"
dependencies = [ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",
@ -1846,12 +1778,12 @@ dependencies = [
[[package]] [[package]]
name = "ndk-macro" name = "ndk-macro"
version = "0.2.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05d1c6307dc424d0f65b9b06e94f88248e6305726b14729fd67a5e47b2dc481d" checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro-crate 0.1.5", "proc-macro-crate",
"proc-macro2 1.0.30", "proc-macro2 1.0.30",
"quote 1.0.10", "quote 1.0.10",
"syn 1.0.80", "syn 1.0.80",
@ -1859,21 +1791,9 @@ dependencies = [
[[package]] [[package]]
name = "ndk-sys" name = "ndk-sys"
version = "0.2.1" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c44922cb3dbb1c70b5e5f443d63b64363a898564d739ba5198e3a9138442868d" checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
[[package]]
name = "nix"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055"
dependencies = [
"bitflags",
"cc",
"cfg-if 0.1.10",
"libc",
]
[[package]] [[package]]
name = "nix" name = "nix"
@ -1887,6 +1807,19 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "nix"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187"
dependencies = [
"bitflags",
"cc",
"cfg-if 1.0.0",
"libc",
"memoffset",
]
[[package]] [[package]]
name = "nohash-hasher" name = "nohash-hasher"
version = "0.2.0" version = "0.2.0"
@ -1980,7 +1913,7 @@ version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9" checksum = "486ea01961c4a818096de679a8b740b26d9033146ac5291b1c98557658f8cdd9"
dependencies = [ dependencies = [
"proc-macro-crate 1.1.0", "proc-macro-crate",
"proc-macro2 1.0.30", "proc-macro2 1.0.30",
"quote 1.0.10", "quote 1.0.10",
"syn 1.0.80", "syn 1.0.80",
@ -2067,22 +2000,13 @@ dependencies = [
"shared_library", "shared_library",
] ]
[[package]]
name = "owned_ttf_parser"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3"
dependencies = [
"ttf-parser 0.6.2",
]
[[package]] [[package]]
name = "owned_ttf_parser" name = "owned_ttf_parser"
version = "0.12.1" version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60ac8dda2e5cc09bf6480e3b3feff9783db251710c922ae9369a429c51efdeb0" checksum = "60ac8dda2e5cc09bf6480e3b3feff9783db251710c922ae9369a429c51efdeb0"
dependencies = [ dependencies = [
"ttf-parser 0.12.3", "ttf-parser",
] ]
[[package]] [[package]]
@ -2221,15 +2145,6 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
[[package]]
name = "proc-macro-crate"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
dependencies = [
"toml",
]
[[package]] [[package]]
name = "proc-macro-crate" name = "proc-macro-crate"
version = "1.1.0" version = "1.1.0"
@ -2390,11 +2305,11 @@ dependencies = [
[[package]] [[package]]
name = "raw-window-handle" name = "raw-window-handle"
version = "0.3.3" version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a441a7a6c80ad6473bd4b74ec1c9a4c951794285bf941c2126f607c72e48211" checksum = "fba75eee94a9d5273a68c9e1e105d9cffe1ef700532325788389e5a83e2522b7"
dependencies = [ dependencies = [
"libc", "cty",
] ]
[[package]] [[package]]
@ -2564,7 +2479,7 @@ name = "ruma-api-macros"
version = "0.18.5" version = "0.18.5"
source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7" source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7"
dependencies = [ dependencies = [
"proc-macro-crate 1.1.0", "proc-macro-crate",
"proc-macro2 1.0.30", "proc-macro2 1.0.30",
"quote 1.0.10", "quote 1.0.10",
"syn 1.0.80", "syn 1.0.80",
@ -2626,7 +2541,7 @@ name = "ruma-events-macros"
version = "0.24.6" version = "0.24.6"
source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7" source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7"
dependencies = [ dependencies = [
"proc-macro-crate 1.1.0", "proc-macro-crate",
"proc-macro2 1.0.30", "proc-macro2 1.0.30",
"quote 1.0.10", "quote 1.0.10",
"syn 1.0.80", "syn 1.0.80",
@ -2698,7 +2613,7 @@ name = "ruma-serde-macros"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7" source = "git+https://github.com/ruma/ruma?rev=ac6ecc3e5#ac6ecc3e5e28197765f345c4d5a7732b41b057e7"
dependencies = [ dependencies = [
"proc-macro-crate 1.1.0", "proc-macro-crate",
"proc-macro2 1.0.30", "proc-macro2 1.0.30",
"quote 1.0.10", "quote 1.0.10",
"syn 1.0.80", "syn 1.0.80",
@ -2757,31 +2672,12 @@ dependencies = [
"webpki", "webpki",
] ]
[[package]]
name = "rusttype"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59"
dependencies = [
"ab_glyph_rasterizer",
"owned_ttf_parser 0.6.0",
]
[[package]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.5" version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "same-file"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
dependencies = [
"winapi-util",
]
[[package]] [[package]]
name = "scoped-tls" name = "scoped-tls"
version = "1.0.0" version = "1.0.0"
@ -2925,25 +2821,6 @@ version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
[[package]]
name = "smithay-client-toolkit"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80"
dependencies = [
"andrew",
"bitflags",
"calloop",
"dlib 0.4.2",
"lazy_static",
"log",
"memmap2 0.1.0",
"nix 0.18.0",
"wayland-client",
"wayland-cursor",
"wayland-protocols",
]
[[package]] [[package]]
name = "smithay-client-toolkit" name = "smithay-client-toolkit"
version = "0.14.0" version = "0.14.0"
@ -2951,14 +2828,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec783683499a2cfc85b6df3d04f83b1907b5cbd98a1aed44667dbdf1eac4e64c" checksum = "ec783683499a2cfc85b6df3d04f83b1907b5cbd98a1aed44667dbdf1eac4e64c"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"dlib 0.5.0", "dlib",
"lazy_static", "lazy_static",
"log", "log",
"memmap2 0.2.3", "memmap2 0.2.3",
"nix 0.20.0", "nix 0.20.0",
"wayland-client", "wayland-client 0.28.6",
"wayland-cursor", "wayland-cursor 0.28.6",
"wayland-protocols", "wayland-protocols 0.28.6",
]
[[package]]
name = "smithay-client-toolkit"
version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1325f292209cee78d5035530932422a30aa4c8fda1a16593ac083c1de211e68a"
dependencies = [
"bitflags",
"calloop",
"dlib",
"lazy_static",
"log",
"memmap2 0.3.1",
"nix 0.22.0",
"pkg-config",
"wayland-client 0.29.3",
"wayland-cursor 0.29.3",
"wayland-protocols 0.29.3",
] ]
[[package]] [[package]]
@ -2968,7 +2864,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "986c5b4a7bd4f50d4c51f81f844745535cb488360f9cf63293780b109b9295f3" checksum = "986c5b4a7bd4f50d4c51f81f844745535cb488360f9cf63293780b109b9295f3"
dependencies = [ dependencies = [
"smithay-client-toolkit 0.14.0", "smithay-client-toolkit 0.14.0",
"wayland-client", "wayland-client 0.28.6",
] ]
[[package]] [[package]]
@ -2998,9 +2894,9 @@ dependencies = [
[[package]] [[package]]
name = "strsim" name = "strsim"
version = "0.9.3" version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]] [[package]]
name = "subtle" name = "subtle"
@ -3096,15 +2992,14 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.12.0" version = "1.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
dependencies = [ dependencies = [
"autocfg",
"bytes", "bytes",
"libc", "libc",
"memchr", "memchr",
"mio", "mio 0.7.14",
"num_cpus", "num_cpus",
"once_cell", "once_cell",
"parking_lot", "parking_lot",
@ -3116,9 +3011,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-macros" name = "tokio-macros"
version = "1.5.0" version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd" checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7"
dependencies = [ dependencies = [
"proc-macro2 1.0.30", "proc-macro2 1.0.30",
"quote 1.0.10", "quote 1.0.10",
@ -3213,12 +3108,6 @@ version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "ttf-parser"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc"
[[package]] [[package]]
name = "ttf-parser" name = "ttf-parser"
version = "0.12.3" version = "0.12.3"
@ -3309,17 +3198,6 @@ version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
name = "walkdir"
version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
dependencies = [
"same-file",
"winapi",
"winapi-util",
]
[[package]] [[package]]
name = "want" name = "want"
version = "0.3.0" version = "0.3.0"
@ -3419,9 +3297,25 @@ dependencies = [
"libc", "libc",
"nix 0.20.0", "nix 0.20.0",
"scoped-tls", "scoped-tls",
"wayland-commons", "wayland-commons 0.28.6",
"wayland-scanner", "wayland-scanner 0.28.6",
"wayland-sys", "wayland-sys 0.28.6",
]
[[package]]
name = "wayland-client"
version = "0.29.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e256a731597b4e264d2f342e44f3708814103fbab144676fa077b6d9f3e2966"
dependencies = [
"bitflags",
"downcast-rs",
"libc",
"nix 0.22.0",
"scoped-tls",
"wayland-commons 0.29.3",
"wayland-scanner 0.29.3",
"wayland-sys 0.29.3",
] ]
[[package]] [[package]]
@ -3433,7 +3327,19 @@ dependencies = [
"nix 0.20.0", "nix 0.20.0",
"once_cell", "once_cell",
"smallvec", "smallvec",
"wayland-sys", "wayland-sys 0.28.6",
]
[[package]]
name = "wayland-commons"
version = "0.29.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96f28d05d154a6ae7a183f2d29906ccceae794047b3a97d35a627f483ed05ee2"
dependencies = [
"nix 0.22.0",
"once_cell",
"smallvec",
"wayland-sys 0.29.3",
] ]
[[package]] [[package]]
@ -3443,18 +3349,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a" checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a"
dependencies = [ dependencies = [
"nix 0.20.0", "nix 0.20.0",
"wayland-client", "wayland-client 0.28.6",
"xcursor",
]
[[package]]
name = "wayland-cursor"
version = "0.29.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bcb1afc06470809fea80281128ea2ed21b730589fe5f5ef0478eb8633bc1b003"
dependencies = [
"nix 0.22.0",
"wayland-client 0.29.3",
"xcursor", "xcursor",
] ]
[[package]] [[package]]
name = "wayland-egl" name = "wayland-egl"
version = "0.28.6" version = "0.29.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99ba1ab1e18756b23982d36f08856d521d7df45015f404a2d7c4f0b2d2f66956" checksum = "d805575be40ef52bd6496a6796d6c8e3c49da06ee2382a0a30aa5d2909280869"
dependencies = [ dependencies = [
"wayland-client", "wayland-client 0.29.3",
"wayland-sys", "wayland-sys 0.29.3",
] ]
[[package]] [[package]]
@ -3464,9 +3381,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f" checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"wayland-client", "wayland-client 0.28.6",
"wayland-commons", "wayland-commons 0.28.6",
"wayland-scanner", "wayland-scanner 0.28.6",
]
[[package]]
name = "wayland-protocols"
version = "0.29.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b5199e12af7708dfb4eb6ea2f10b089d21b4b437cfde44b018ad11b093101b6"
dependencies = [
"bitflags",
"wayland-client 0.29.3",
"wayland-commons 0.29.3",
"wayland-scanner 0.29.3",
] ]
[[package]] [[package]]
@ -3480,13 +3409,35 @@ dependencies = [
"xml-rs", "xml-rs",
] ]
[[package]]
name = "wayland-scanner"
version = "0.29.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2cfd5edf014d2bcfd13607f6461acc15677676eeca58df0af7c4856be5faabf1"
dependencies = [
"proc-macro2 1.0.30",
"quote 1.0.10",
"xml-rs",
]
[[package]] [[package]]
name = "wayland-sys" name = "wayland-sys"
version = "0.28.6" version = "0.28.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8" checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8"
dependencies = [ dependencies = [
"dlib 0.5.0", "dlib",
"lazy_static",
"pkg-config",
]
[[package]]
name = "wayland-sys"
version = "0.29.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "beb0eb50984d3efb0642b58ee2f458a62d765563bebd94049b6f9f40979f12aa"
dependencies = [
"dlib",
"lazy_static", "lazy_static",
"pkg-config", "pkg-config",
] ]
@ -3565,15 +3516,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-util"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
dependencies = [
"winapi",
]
[[package]] [[package]]
name = "winapi-x86_64-pc-windows-gnu" name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0" version = "0.4.0"
@ -3582,11 +3524,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]] [[package]]
name = "winit" name = "winit"
version = "0.25.0" version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79610794594d5e86be473ef7763f604f2159cbac8c94debd00df8fb41e86c2f8" checksum = "70466a5f4825cc88c92963591b06dbc255420bffe19d847bfcda475e82d079c0"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"block",
"cocoa", "cocoa",
"core-foundation 0.9.2", "core-foundation 0.9.2",
"core-graphics 0.22.2", "core-graphics 0.22.2",
@ -3596,8 +3539,7 @@ dependencies = [
"lazy_static", "lazy_static",
"libc", "libc",
"log", "log",
"mio", "mio 0.8.0",
"mio-misc",
"ndk", "ndk",
"ndk-glue", "ndk-glue",
"ndk-sys", "ndk-sys",
@ -3605,9 +3547,11 @@ dependencies = [
"parking_lot", "parking_lot",
"percent-encoding", "percent-encoding",
"raw-window-handle", "raw-window-handle",
"scopeguard", "smithay-client-toolkit 0.15.3",
"smithay-client-toolkit 0.12.3", "wasm-bindgen",
"wayland-client", "wayland-client 0.29.3",
"wayland-protocols 0.29.3",
"web-sys",
"winapi", "winapi",
"x11-dl", "x11-dl",
] ]
@ -3661,15 +3605,6 @@ dependencies = [
"nom", "nom",
] ]
[[package]]
name = "xdg"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803"
dependencies = [
"dirs",
]
[[package]] [[package]]
name = "xml-rs" name = "xml-rs"
version = "0.8.4" version = "0.8.4"

4
Cargo.toml
View file

@ -8,11 +8,11 @@ resolver = "2"
[dependencies] [dependencies]
crossbeam-channel = "0.5" crossbeam-channel = "0.5"
eframe = { version = "0.15", features = ["persistence"] } eframe = { version = "0.16", features = ["persistence"] }
futures = "0.3" futures = "0.3"
ron = "0.6" ron = "0.6"
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", features = ["derive"] }
tokio = { version = "*", features = ["full"] } tokio = { version = "1.15", features = ["full"] }
url = { version = "2.2", features = ["serde"] } url = { version = "2.2", features = ["serde"] }
[dependencies.matrix-sdk] [dependencies.matrix-sdk]

4
src/ui.rs
View file

@ -22,7 +22,7 @@ impl epi::App for App {
fn setup( fn setup(
&mut self, &mut self,
_ctx: &egui::CtxRef, _ctx: &egui::CtxRef,
_frame: &mut epi::Frame<'_>, _frame: &epi::Frame,
storage: Option<&dyn epi::Storage>, storage: Option<&dyn epi::Storage>,
) { ) {
let client = match Session::from_fs().and_then(Session::restore) { let client = match Session::from_fs().and_then(Session::restore) {
@ -70,7 +70,7 @@ impl epi::App for App {
}; };
} }
fn update(&mut self, ctx: &egui::CtxRef, _frame: &mut epi::Frame<'_>) { fn update(&mut self, ctx: &egui::CtxRef, _frame: &epi::Frame) {
match self.view { match self.view {
View::Login(ref mut login) => { View::Login(ref mut login) => {
if login.update(ctx) { if login.update(ctx) {

26
src/ui/session.rs
View file

@ -4,7 +4,7 @@ use std::{
}; };
use crossbeam_channel::Receiver; use crossbeam_channel::Receiver;
use eframe::egui::{self, Color32, Label, ScrollArea, Sense}; use eframe::egui::{self, Color32, Label, RichText, ScrollArea, Sense};
use matrix_sdk::{ use matrix_sdk::{
deserialized_responses::SyncResponse, deserialized_responses::SyncResponse,
encryption::verification::{SasVerification, Verification, VerificationRequest}, encryption::verification::{SasVerification, Verification, VerificationRequest},
@ -135,7 +135,7 @@ impl App {
.max_width(400.0) .max_width(400.0)
.default_width(400.0) .default_width(400.0)
.show(ctx, |ui| { .show(ctx, |ui| {
ui.add(egui::Label::new("Joined").strong()); ui.add(Label::new(RichText::new("Joined").strong()));
let mut joined = self.client.joined_rooms(); let mut joined = self.client.joined_rooms();
joined.sort_by_key(|room| self.room_list.room_name(&room).to_uppercase()); joined.sort_by_key(|room| self.room_list.room_name(&room).to_uppercase());
@ -253,8 +253,8 @@ impl App {
for emoji in emojis { for emoji in emojis {
ui.vertical_centered(|ui| { ui.vertical_centered(|ui| {
ui.set_max_width(50.0); ui.set_max_width(50.0);
ui.heading(&emoji.symbol); ui.heading(emoji.symbol);
ui.label(&emoji.description); ui.label(emoji.description);
}); });
} }
} }
@ -305,22 +305,24 @@ impl App {
match &msg.content.msgtype { match &msg.content.msgtype {
MessageType::Text(text) => { MessageType::Text(text) => {
ui.horizontal_wrapped(|ui| { ui.horizontal_wrapped(|ui| {
ui.add(Label::new(name).strong()) ui.add(Label::new(RichText::new(name).strong()))
.on_hover_text(event.sender()); .on_hover_text(event.sender().as_str());
ui.label(&text.body); ui.label(&text.body);
}); });
} }
MessageType::Notice(notice) => { MessageType::Notice(notice) => {
ui.horizontal_wrapped(|ui| { ui.horizontal_wrapped(|ui| {
ui.add(Label::new(name).strong()) ui.add(Label::new(RichText::new(name).strong()))
.on_hover_text(event.sender()); .on_hover_text(event.sender().as_str());
ui.add(egui::Label::new(&notice.body).weak()); ui.add(egui::Label::new(
RichText::new(&notice.body).weak(),
));
}); });
} }
MessageType::ServerNotice(notice) => { MessageType::ServerNotice(notice) => {
ui.add(Label::new(name).strong()) ui.add(Label::new(RichText::new(name).strong()))
.on_hover_text(event.sender()); .on_hover_text(event.sender().as_str());
ui.add(egui::Label::new(&notice.body).weak()); ui.add(egui::Label::new(RichText::new(&notice.body).weak()));
} }
MessageType::Emote(emote) => { MessageType::Emote(emote) => {
ui.label(format!("* {} {}", name, emote.body)); ui.label(format!("* {} {}", name, emote.body));