commit b33346a25d2fbe44bb637fcd49de4c84ab917cdc
parent b21e39dea9da8b0cfcfd5315ad6bded11229e708
Author: William Casarin <jb55@jb55.com>
Date: Tue, 28 Jan 2025 10:01:40 -0800
update to egui 0.30.0
Diffstat:
4 files changed, 315 insertions(+), 215 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -29,6 +29,16 @@ dependencies = [
]
[[package]]
+name = "accesskit"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3d3b8f9bae46a948369bc4a03e815d4ed6d616bd00de4051133a5019dc31c5a"
+dependencies = [
+ "enumn",
+ "serde",
+]
+
+[[package]]
name = "addr2line"
version = "0.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -518,18 +528,18 @@ dependencies = [
[[package]]
name = "bit-set"
-version = "0.6.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f"
+checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3"
dependencies = [
"bit-vec",
]
[[package]]
name = "bit-vec"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22"
+checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7"
[[package]]
name = "bit_field"
@@ -811,6 +821,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]]
+name = "cgl"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff"
+dependencies = [
+ "libc",
+]
+
+[[package]]
name = "chacha20"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -882,37 +901,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
-name = "com"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e17887fd17353b65b1b2ef1c526c83e26cd72e74f598a8dc1bee13a48f3d9f6"
-dependencies = [
- "com_macros",
-]
-
-[[package]]
-name = "com_macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d375883580a668c7481ea6631fc1a8863e33cc335bf56bfad8d7e6d4b04b13a5"
-dependencies = [
- "com_macros_support",
- "proc-macro2",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "com_macros_support"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad899a1087a9296d5644792d7cb72b8e34c1bec8e7d4fbc002230169a6e8710c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
name = "combine"
version = "4.6.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1165,26 +1153,39 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"
[[package]]
name = "ecolor"
version = "0.29.1"
-source = "git+https://github.com/damus-io/egui?branch=update_layouter_0.29.1#4b19e72384345078581f940c9cd17dcb2f43d124"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775cfde491852059e386c4e1deb4aef381c617dc364184c6f6afee99b87c402b"
+dependencies = [
+ "emath 0.29.1",
+ "serde",
+]
+
+[[package]]
+name = "ecolor"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d72e9c39f6e11a2e922d04a34ec5e7ef522ea3f5a1acfca7a19d16ad5fe50f5"
dependencies = [
"bytemuck",
- "emath",
+ "emath 0.30.0",
"serde",
]
[[package]]
name = "eframe"
-version = "0.29.1"
+version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ac2645a9bf4826eb4e91488b1f17b8eaddeef09396706b2f14066461338e24f"
+checksum = "b2f2d9e7ea2d11ec9e98a8683b6eb99f9d7d0448394ef6e0d6d91bd4eb817220"
dependencies = [
"ahash",
"bytemuck",
"document-features",
- "egui",
+ "egui 0.30.0",
"egui-wgpu",
"egui-winit",
"egui_glow",
+ "glutin",
+ "glutin-winit",
"image",
"js-sys",
"log",
@@ -1193,8 +1194,8 @@ dependencies = [
"objc2-foundation",
"parking_lot",
"percent-encoding",
- "pollster 0.3.0",
- "puffin 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pollster",
+ "profiling",
"raw-window-handle 0.6.2",
"static_assertions",
"wasm-bindgen",
@@ -1203,39 +1204,54 @@ dependencies = [
"web-time 1.1.0",
"wgpu",
"winapi",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
"winit",
]
[[package]]
name = "egui"
version = "0.29.1"
-source = "git+https://github.com/damus-io/egui?branch=update_layouter_0.29.1#4b19e72384345078581f940c9cd17dcb2f43d124"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53eafabcce0cb2325a59a98736efe0bf060585b437763f8c476957fb274bb974"
dependencies = [
- "accesskit",
+ "accesskit 0.16.3",
+ "ahash",
+ "emath 0.29.1",
+ "epaint 0.29.1",
+ "nohash-hasher",
+ "serde",
+]
+
+[[package]]
+name = "egui"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "252d52224d35be1535d7fd1d6139ce071fb42c9097773e79f7665604f5596b5e"
+dependencies = [
+ "accesskit 0.17.1",
"ahash",
"backtrace",
- "emath",
- "epaint",
+ "emath 0.30.0",
+ "epaint 0.30.0",
"log",
"nohash-hasher",
- "puffin 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "profiling",
"serde",
]
[[package]]
name = "egui-wgpu"
-version = "0.29.1"
+version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00fd5d06d8405397e64a928fa0ef3934b3c30273ea7603e3dc4627b1f7a1a82"
+checksum = "26c1e821d2d8921ef6ce98b258c7e24d9d6aab2ca1f9cdf374eca997e7f67f59"
dependencies = [
"ahash",
"bytemuck",
"document-features",
- "egui",
- "epaint",
+ "egui 0.30.0",
+ "epaint 0.30.0",
"log",
- "puffin 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "profiling",
"thiserror 1.0.69",
"type-map",
"web-time 1.1.0",
@@ -1245,15 +1261,15 @@ dependencies = [
[[package]]
name = "egui-winit"
-version = "0.29.1"
+version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a9c430f4f816340e8e8c1b20eec274186b1be6bc4c7dfc467ed50d57abc36c6"
+checksum = "1e84c2919cd9f3a38a91e8f84ac6a245c19251fd95226ed9fae61d5ea564fce3"
dependencies = [
"ahash",
"arboard",
- "egui",
+ "egui 0.30.0",
"log",
- "puffin 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "profiling",
"raw-window-handle 0.6.2",
"smithay-clipboard",
"web-time 1.1.0",
@@ -1268,30 +1284,42 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf3c1f5cd8dfe2ade470a218696c66cf556fcfd701e7830fa2e9f4428292a2a1"
dependencies = [
"ahash",
- "egui",
+ "egui 0.29.1",
+ "enum-map",
+ "log",
+ "serde",
+]
+
+[[package]]
+name = "egui_extras"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7a8198c088b1007108cb2d403bc99a5e370999b200db4f14559610d7330126"
+dependencies = [
+ "ahash",
+ "egui 0.30.0",
"ehttp",
"enum-map",
"image",
"log",
"mime_guess2",
+ "profiling",
"resvg",
- "serde",
]
[[package]]
name = "egui_glow"
-version = "0.29.1"
+version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e39bccc683cd43adab530d8f21a13eb91e80de10bcc38c3f1c16601b6f62b26"
+checksum = "3eaf6264cc7608e3e69a7d57a6175f438275f1b3889c1a551b418277721c95e6"
dependencies = [
"ahash",
"bytemuck",
- "egui",
- "egui-winit",
- "glow 0.14.2",
+ "egui 0.30.0",
+ "glow 0.16.0",
"log",
"memoffset",
- "puffin 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "profiling",
"wasm-bindgen",
"web-sys",
"winit",
@@ -1300,29 +1328,28 @@ dependencies = [
[[package]]
name = "egui_nav"
version = "0.2.0"
-source = "git+https://github.com/damus-io/egui-nav?rev=ac7d663307b76634757024b438dd4b899790da99#ac7d663307b76634757024b438dd4b899790da99"
+source = "git+https://github.com/damus-io/egui-nav?rev=eb297a0fefd9047352102346625a2eba93a1aa04#eb297a0fefd9047352102346625a2eba93a1aa04"
dependencies = [
- "egui",
- "egui_extras",
+ "egui 0.30.0",
+ "egui_extras 0.30.0",
]
[[package]]
name = "egui_tabs"
version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ff9e00113ffe8f10d36302c383f2c0ad01ec388479a30851bfda5bcc446a840"
+source = "git+https://github.com/damus-io/egui-tabs?rev=5d0bacc6ce2c645fe8a77723d2beb0f85b8148ee#5d0bacc6ce2c645fe8a77723d2beb0f85b8148ee"
dependencies = [
- "egui",
- "egui_extras",
+ "egui 0.30.0",
+ "egui_extras 0.30.0",
]
[[package]]
name = "egui_virtual_list"
-version = "0.5.0"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8191e9cbf6cc7b111655fc115725505fc09d7698c04c36897950c46d6e69521b"
+checksum = "7fbbfa80812198ff985aab67ffa5b2649014d50267b04d269c9f1c2ebe72d9c7"
dependencies = [
- "egui",
+ "egui 0.30.0",
"web-time 1.1.0",
]
@@ -1349,7 +1376,17 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
[[package]]
name = "emath"
version = "0.29.1"
-source = "git+https://github.com/damus-io/egui?branch=update_layouter_0.29.1#4b19e72384345078581f940c9cd17dcb2f43d124"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1fe0049ce51d0fb414d029e668dd72eb30bc2b739bf34296ed97bd33df544f3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "emath"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4fe73c1207b864ee40aa0b0c038d6092af1030744678c60188a05c28553515d"
dependencies = [
"bytemuck",
"serde",
@@ -1436,25 +1473,42 @@ dependencies = [
[[package]]
name = "epaint"
version = "0.29.1"
-source = "git+https://github.com/damus-io/egui?branch=update_layouter_0.29.1#4b19e72384345078581f940c9cd17dcb2f43d124"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a32af8da821bd4f43f2c137e295459ee2e1661d87ca8779dfa0eaf45d870e20f"
+dependencies = [
+ "ab_glyph",
+ "ahash",
+ "ecolor 0.29.1",
+ "emath 0.29.1",
+ "nohash-hasher",
+ "parking_lot",
+ "serde",
+]
+
+[[package]]
+name = "epaint"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5666f8d25236293c966fbb3635eac18b04ad1914e3bab55bc7d44b9980cafcac"
dependencies = [
"ab_glyph",
"ahash",
"bytemuck",
- "ecolor",
- "emath",
+ "ecolor 0.30.0",
+ "emath 0.30.0",
"epaint_default_fonts",
"log",
"nohash-hasher",
"parking_lot",
- "puffin 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "profiling",
"serde",
]
[[package]]
name = "epaint_default_fonts"
-version = "0.29.1"
-source = "git+https://github.com/damus-io/egui?branch=update_layouter_0.29.1#4b19e72384345078581f940c9cd17dcb2f43d124"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66f6ddac3e6ac6fd4c3d48bb8b1943472f8da0f43a4303bcd8a18aa594401c80"
[[package]]
name = "equivalent"
@@ -1782,9 +1836,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "glow"
-version = "0.13.1"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd348e04c43b32574f2de31c8bb397d96c9fcfa1371bd4ca6d8bdc464ab121b1"
+checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483"
dependencies = [
"js-sys",
"slotmap",
@@ -1794,9 +1848,9 @@ dependencies = [
[[package]]
name = "glow"
-version = "0.14.2"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483"
+checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
dependencies = [
"js-sys",
"slotmap",
@@ -1805,6 +1859,63 @@ dependencies = [
]
[[package]]
+name = "glutin"
+version = "0.32.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec69412a0bf07ea7607e638b415447857a808846c2b685a43c8aa18bc6d5e499"
+dependencies = [
+ "bitflags 2.6.0",
+ "cfg_aliases 0.2.1",
+ "cgl",
+ "core-foundation 0.9.4",
+ "dispatch",
+ "glutin_egl_sys",
+ "glutin_glx_sys",
+ "glutin_wgl_sys",
+ "libloading",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-foundation",
+ "once_cell",
+ "raw-window-handle 0.6.2",
+ "wayland-sys",
+ "windows-sys 0.52.0",
+ "x11-dl",
+]
+
+[[package]]
+name = "glutin-winit"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85edca7075f8fc728f28cb8fbb111a96c3b89e930574369e3e9c27eb75d3788f"
+dependencies = [
+ "cfg_aliases 0.2.1",
+ "glutin",
+ "raw-window-handle 0.6.2",
+ "winit",
+]
+
+[[package]]
+name = "glutin_egl_sys"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c4680ba6195f424febdc3ba46e7a42a0e58743f2edb115297b86d7f8ecc02d2"
+dependencies = [
+ "gl_generator",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "glutin_glx_sys"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7bb2938045a88b612499fbcba375a77198e01306f52272e692f8c1f3751185"
+dependencies = [
+ "gl_generator",
+ "x11-dl",
+]
+
+[[package]]
name = "glutin_wgl_sys"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1833,19 +1944,6 @@ dependencies = [
]
[[package]]
-name = "gpu-allocator"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd4240fc91d3433d5e5b0fc5b67672d771850dc19bbee03c1381e19322803d7"
-dependencies = [
- "log",
- "presser",
- "thiserror 1.0.69",
- "winapi",
- "windows",
-]
-
-[[package]]
name = "gpu-descriptor"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1892,21 +1990,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
[[package]]
-name = "hassle-rs"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af2a7e73e1f34c48da31fb668a907f250794837e08faa144fd24f0b8b741e890"
-dependencies = [
- "bitflags 2.6.0",
- "com",
- "libc",
- "libloading",
- "thiserror 1.0.69",
- "widestring",
- "winapi",
-]
-
-[[package]]
name = "heck"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2557,9 +2640,9 @@ dependencies = [
[[package]]
name = "naga"
-version = "22.1.0"
+version = "23.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad"
+checksum = "364f94bc34f61332abebe8cad6f6cd82a5b65cff22c828d05d0968911462ca4f"
dependencies = [
"arrayvec",
"bit-set",
@@ -2747,7 +2830,7 @@ dependencies = [
"bincode",
"dirs",
"eframe",
- "egui",
+ "egui 0.30.0",
"ehttp",
"enostr",
"hex",
@@ -2755,7 +2838,7 @@ dependencies = [
"mime_guess",
"nostrdb",
"poll-promise",
- "puffin 0.19.1 (git+https://github.com/jb55/puffin?rev=70ff86d5503815219b01a009afd3669b7903a057)",
+ "puffin",
"puffin_egui",
"security-framework",
"serde",
@@ -2776,12 +2859,12 @@ version = "0.3.1"
dependencies = [
"android-activity 0.4.3",
"eframe",
- "egui",
- "egui_extras",
+ "egui 0.30.0",
+ "egui_extras 0.30.0",
"log",
"notedeck",
"notedeck_columns",
- "puffin 0.19.1 (git+https://github.com/jb55/puffin?rev=70ff86d5503815219b01a009afd3669b7903a057)",
+ "puffin",
"puffin_egui",
"serde",
"serde_json",
@@ -2804,8 +2887,8 @@ dependencies = [
"bitflags 2.6.0",
"dirs",
"eframe",
- "egui",
- "egui_extras",
+ "egui 0.30.0",
+ "egui_extras 0.30.0",
"egui_nav",
"egui_tabs",
"egui_virtual_list",
@@ -2819,7 +2902,7 @@ dependencies = [
"open",
"poll-promise",
"pretty_assertions",
- "puffin 0.19.1 (git+https://github.com/jb55/puffin?rev=70ff86d5503815219b01a009afd3669b7903a057)",
+ "puffin",
"puffin_egui",
"rfd",
"rmpv",
@@ -2831,7 +2914,7 @@ dependencies = [
"strum",
"strum_macros",
"tempfile",
- "thiserror 2.0.7",
+ "thiserror 2.0.11",
"tokenator",
"tokio",
"tracing",
@@ -3419,12 +3502,6 @@ dependencies = [
[[package]]
name = "pollster"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22686f4785f02a4fcc856d3b3bb19bf6c8160d103f7a99cc258bddd0251dc7f2"
-
-[[package]]
-name = "pollster"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3"
@@ -3456,12 +3533,6 @@ dependencies = [
]
[[package]]
-name = "presser"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa"
-
-[[package]]
name = "pretty_assertions"
version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -3531,20 +3602,6 @@ dependencies = [
[[package]]
name = "puffin"
version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9dae7b05c02ec1a6bc9bcf20d8bc64a7dcbf57934107902a872014899b741f"
-dependencies = [
- "anyhow",
- "byteorder",
- "cfg-if",
- "itertools 0.10.5",
- "once_cell",
- "parking_lot",
-]
-
-[[package]]
-name = "puffin"
-version = "0.19.1"
source = "git+https://github.com/jb55/puffin?rev=70ff86d5503815219b01a009afd3669b7903a057#70ff86d5503815219b01a009afd3669b7903a057"
dependencies = [
"anyhow",
@@ -3563,13 +3620,13 @@ name = "puffin_egui"
version = "0.29.0"
source = "git+https://github.com/jb55/puffin?rev=70ff86d5503815219b01a009afd3669b7903a057#70ff86d5503815219b01a009afd3669b7903a057"
dependencies = [
- "egui",
- "egui_extras",
+ "egui 0.29.1",
+ "egui_extras 0.29.1",
"indexmap",
"natord",
"once_cell",
"parking_lot",
- "puffin 0.19.1 (git+https://github.com/jb55/puffin?rev=70ff86d5503815219b01a009afd3669b7903a057)",
+ "puffin",
"time",
"vec1",
"web-time 0.2.4",
@@ -3834,7 +3891,7 @@ dependencies = [
"objc2",
"objc2-app-kit",
"objc2-foundation",
- "pollster 0.4.0",
+ "pollster",
"raw-window-handle 0.6.2",
"urlencoding",
"wasm-bindgen",
@@ -5226,9 +5283,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
[[package]]
name = "wgpu"
-version = "22.1.0"
+version = "23.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d1c4ba43f80542cf63a0a6ed3134629ae73e8ab51e4b765a67f3aa062eb433"
+checksum = "80f70000db37c469ea9d67defdc13024ddf9a5f1b89cb2941b812ad7cde1735a"
dependencies = [
"arrayvec",
"cfg_aliases 0.1.1",
@@ -5251,9 +5308,9 @@ dependencies = [
[[package]]
name = "wgpu-core"
-version = "22.1.0"
+version = "23.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0348c840d1051b8e86c3bcd31206080c5e71e5933dabd79be1ce732b0b2f089a"
+checksum = "d63c3c478de8e7e01786479919c8769f62a22eec16788d8c2ac77ce2c132778a"
dependencies = [
"arrayvec",
"bit-vec",
@@ -5276,23 +5333,22 @@ dependencies = [
[[package]]
name = "wgpu-hal"
-version = "22.0.0"
+version = "23.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6bbf4b4de8b2a83c0401d9e5ae0080a2792055f25859a02bf9be97952bbed4f"
+checksum = "89364b8a0b211adc7b16aeaf1bd5ad4a919c1154b44c9ce27838213ba05fd821"
dependencies = [
"android_system_properties",
"arrayvec",
"ash",
"bitflags 2.6.0",
"block",
+ "bytemuck",
"cfg_aliases 0.1.1",
"core-graphics-types",
- "glow 0.13.1",
+ "glow 0.14.2",
"glutin_wgl_sys",
"gpu-alloc",
- "gpu-allocator",
"gpu-descriptor",
- "hassle-rs",
"js-sys",
"khronos-egl",
"libc",
@@ -5313,14 +5369,14 @@ dependencies = [
"wasm-bindgen",
"web-sys",
"wgpu-types",
- "winapi",
+ "windows",
]
[[package]]
name = "wgpu-types"
-version = "22.0.0"
+version = "23.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc9d91f0e2c4b51434dfa6db77846f2793149d8e73f800fa2e41f52b8eac3c5d"
+checksum = "610f6ff27778148c31093f3b03abc4840f9636d58d597ca2f5977433acfe0068"
dependencies = [
"bitflags 2.6.0",
"js-sys",
@@ -5340,12 +5396,6 @@ dependencies = [
]
[[package]]
-name = "widestring"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
-
-[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5378,9 +5428,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
-version = "0.52.0"
+version = "0.58.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
dependencies = [
"windows-core",
"windows-targets 0.52.6",
@@ -5388,10 +5438,55 @@ dependencies = [
[[package]]
name = "windows-core"
-version = "0.52.0"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
dependencies = [
+ "windows-result",
"windows-targets 0.52.6",
]
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,12 +16,12 @@ rmpv = "1.3.0"
bech32 = { version = "0.11", default-features = false }
bitflags = "2.5.0"
dirs = "5.0.1"
-eframe = { version = "0.29.1", default-features = false, features = [ "wgpu", "wayland", "x11", "android-game-activity" ] }
-egui = { version = "0.29.1", features = ["serde"] }
-egui_extras = { version = "0.29.1", features = ["all_loaders"] }
-egui_nav = { git = "https://github.com/damus-io/egui-nav", rev = "ac7d663307b76634757024b438dd4b899790da99" }
-egui_tabs = "0.2.0"
-egui_virtual_list = "0.5.0"
+eframe = { version = "0.30.0", default-features = false, features = [ "wgpu", "wayland", "x11", "android-game-activity" ] }
+egui = { version = "0.30.0", features = ["serde"] }
+egui_extras = { version = "0.30.0", features = ["all_loaders"] }
+egui_nav = { git = "https://github.com/damus-io/egui-nav", rev = "eb297a0fefd9047352102346625a2eba93a1aa04" }
+egui_tabs = { git = "https://github.com/damus-io/egui-tabs", rev = "5d0bacc6ce2c645fe8a77723d2beb0f85b8148ee" }
+egui_virtual_list = "0.6.0"
ehttp = "0.5.0"
enostr = { path = "crates/enostr" }
ewebsock = { version = "0.2.0", features = ["tls"] }
diff --git a/crates/notedeck_chrome/src/fonts.rs b/crates/notedeck_chrome/src/fonts.rs
@@ -1,5 +1,6 @@
use egui::{FontData, FontDefinitions, FontTweak};
use std::collections::BTreeMap;
+use std::sync::Arc;
use tracing::debug;
use notedeck::fonts::NamedFontFamily;
@@ -7,35 +8,35 @@ use notedeck::fonts::NamedFontFamily;
// Use gossip's approach to font loading. This includes japanese fonts
// for rending stuff from japanese users.
pub fn setup_fonts(ctx: &egui::Context) {
- let mut font_data: BTreeMap<String, FontData> = BTreeMap::new();
+ let mut font_data: BTreeMap<String, Arc<FontData>> = BTreeMap::new();
let mut families = BTreeMap::new();
font_data.insert(
"Onest".to_owned(),
- FontData::from_static(include_bytes!(
+ Arc::new(FontData::from_static(include_bytes!(
"../../../assets/fonts/onest/OnestRegular1602-hint.ttf"
- )),
+ ))),
);
font_data.insert(
"OnestMedium".to_owned(),
- FontData::from_static(include_bytes!(
+ Arc::new(FontData::from_static(include_bytes!(
"../../../assets/fonts/onest/OnestMedium1602-hint.ttf"
- )),
+ ))),
);
font_data.insert(
"DejaVuSans".to_owned(),
- FontData::from_static(include_bytes!(
+ Arc::new(FontData::from_static(include_bytes!(
"../../../assets/fonts/DejaVuSansSansEmoji.ttf"
- )),
+ ))),
);
font_data.insert(
"OnestBold".to_owned(),
- FontData::from_static(include_bytes!(
+ Arc::new(FontData::from_static(include_bytes!(
"../../../assets/fonts/onest/OnestBold1602-hint.ttf"
- )),
+ ))),
);
/*
@@ -60,43 +61,47 @@ pub fn setup_fonts(ctx: &egui::Context) {
font_data.insert(
"Inconsolata".to_owned(),
- FontData::from_static(include_bytes!(
- "../../../assets/fonts/Inconsolata-Regular.ttf"
- ))
- .tweak(FontTweak {
- scale: 1.22, // This font is smaller than DejaVuSans
- y_offset_factor: -0.18, // and too low
- y_offset: 0.0,
- baseline_offset_factor: 0.0,
- }),
+ Arc::new(
+ FontData::from_static(include_bytes!(
+ "../../../assets/fonts/Inconsolata-Regular.ttf"
+ ))
+ .tweak(FontTweak {
+ scale: 1.22, // This font is smaller than DejaVuSans
+ y_offset_factor: -0.18, // and too low
+ y_offset: 0.0,
+ baseline_offset_factor: 0.0,
+ }),
+ ),
);
font_data.insert(
"NotoSansCJK".to_owned(),
- FontData::from_static(include_bytes!(
+ Arc::new(FontData::from_static(include_bytes!(
"../../../assets/fonts/NotoSansCJK-Regular.ttc"
- )),
+ ))),
);
font_data.insert(
"NotoSansThai".to_owned(),
- FontData::from_static(include_bytes!(
+ Arc::new(FontData::from_static(include_bytes!(
"../../../assets/fonts/NotoSansThai-Regular.ttf"
- )),
+ ))),
);
// Some good looking emojis. Use as first priority:
font_data.insert(
"NotoEmoji".to_owned(),
- FontData::from_static(include_bytes!(
- "../../../assets/fonts/NotoEmoji-Regular.ttf"
- ))
- .tweak(FontTweak {
- scale: 1.1, // make them a touch larger
- y_offset_factor: 0.0,
- y_offset: 0.0,
- baseline_offset_factor: 0.0,
- }),
+ Arc::new(
+ FontData::from_static(include_bytes!(
+ "../../../assets/fonts/NotoEmoji-Regular.ttf"
+ ))
+ .tweak(FontTweak {
+ scale: 1.1, // make them a touch larger
+ y_offset_factor: 0.0,
+ y_offset: 0.0,
+ baseline_offset_factor: 0.0,
+ }),
+ ),
);
let base_fonts = vec![
diff --git a/crates/notedeck_columns/Cargo.toml b/crates/notedeck_columns/Cargo.toml
@@ -61,5 +61,5 @@ security-framework = "2.11.0"
[features]
default = []
-profiling = ["puffin", "puffin_egui", "eframe/puffin"]
+profiling = ["puffin", "puffin_egui"]
