Skip to content

Commit

Permalink
Update to egui 0.30
Browse files Browse the repository at this point in the history
  • Loading branch information
emilk committed Dec 16, 2024
1 parent 5103dc6 commit e56dd4b
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 101 deletions.
129 changes: 32 additions & 97 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"

[[package]]
name = "accesskit"
version = "0.16.3"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99b76d84ee70e30a4a7e39ab9018e2b17a6a09e31084176cc7c0b2dec036ba45"
checksum = "d3d3b8f9bae46a948369bc4a03e815d4ed6d616bd00de4051133a5019dc31c5a"
dependencies = [
"enumn",
"serde",
Expand All @@ -47,7 +47,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"getrandom",
"once_cell",
"serde",
"version_check",
Expand Down Expand Up @@ -96,12 +95,6 @@ dependencies = [
"x11rb",
]

[[package]]
name = "as-raw-xcb-connection"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"

[[package]]
name = "atomic-waker"
version = "1.1.2"
Expand Down Expand Up @@ -398,9 +391,9 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"

[[package]]
name = "ecolor"
version = "0.29.1"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "775cfde491852059e386c4e1deb4aef381c617dc364184c6f6afee99b87c402b"
checksum = "7d72e9c39f6e11a2e922d04a34ec5e7ef522ea3f5a1acfca7a19d16ad5fe50f5"
dependencies = [
"bytemuck",
"emath",
Expand All @@ -409,9 +402,9 @@ dependencies = [

[[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",
Expand All @@ -431,6 +424,7 @@ dependencies = [
"objc2-foundation",
"parking_lot",
"percent-encoding",
"profiling",
"raw-window-handle",
"ron",
"serde",
Expand All @@ -440,36 +434,38 @@ dependencies = [
"web-sys",
"web-time",
"winapi",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
"winit",
]

[[package]]
name = "egui"
version = "0.29.1"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53eafabcce0cb2325a59a98736efe0bf060585b437763f8c476957fb274bb974"
checksum = "252d52224d35be1535d7fd1d6139ce071fb42c9097773e79f7665604f5596b5e"
dependencies = [
"accesskit",
"ahash",
"emath",
"epaint",
"log",
"nohash-hasher",
"profiling",
"ron",
"serde",
]

[[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",
"log",
"profiling",
"raw-window-handle",
"serde",
"smithay-clipboard",
Expand All @@ -480,16 +476,17 @@ dependencies = [

[[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",
"glow",
"log",
"memoffset",
"profiling",
"wasm-bindgen",
"web-sys",
]
Expand All @@ -505,9 +502,9 @@ dependencies = [

[[package]]
name = "emath"
version = "0.29.1"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b1fe0049ce51d0fb414d029e668dd72eb30bc2b739bf34296ed97bd33df544f3"
checksum = "c4fe73c1207b864ee40aa0b0c038d6092af1030744678c60188a05c28553515d"
dependencies = [
"bytemuck",
"serde",
Expand Down Expand Up @@ -538,9 +535,9 @@ dependencies = [

[[package]]
name = "epaint"
version = "0.29.1"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a32af8da821bd4f43f2c137e295459ee2e1661d87ca8779dfa0eaf45d870e20f"
checksum = "5666f8d25236293c966fbb3635eac18b04ad1914e3bab55bc7d44b9980cafcac"
dependencies = [
"ab_glyph",
"ahash",
Expand All @@ -551,14 +548,15 @@ dependencies = [
"log",
"nohash-hasher",
"parking_lot",
"profiling",
"serde",
]

[[package]]
name = "epaint_default_fonts"
version = "0.29.1"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "483440db0b7993cf77a20314f08311dbe95675092405518c0677aa08c151a3ea"
checksum = "66f6ddac3e6ac6fd4c3d48bb8b1943472f8da0f43a4303bcd8a18aa594401c80"

[[package]]
name = "equivalent"
Expand Down Expand Up @@ -647,17 +645,6 @@ dependencies = [
"windows-targets 0.48.5",
]

[[package]]
name = "getrandom"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"libc",
"wasi",
]

[[package]]
name = "gl_generator"
version = "0.14.0"
Expand All @@ -671,9 +658,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",
Expand All @@ -693,17 +680,14 @@ dependencies = [
"core-foundation",
"dispatch",
"glutin_egl_sys",
"glutin_glx_sys",
"glutin_wgl_sys",
"libloading",
"objc2",
"objc2-app-kit",
"objc2-foundation",
"once_cell",
"raw-window-handle",
"wayland-sys",
"windows-sys 0.52.0",
"x11-dl",
]

[[package]]
Expand All @@ -728,16 +712,6 @@ dependencies = [
"windows-sys 0.52.0",
]

[[package]]
name = "glutin_glx_sys"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c2b2d3918e76e18e08796b55eb64e8fe6ec67d5a6b2e2a7e2edce224ad24c63"
dependencies = [
"gl_generator",
"x11-dl",
]

[[package]]
name = "glutin_wgl_sys"
version = "0.6.0"
Expand Down Expand Up @@ -1496,6 +1470,12 @@ dependencies = [
"unicode-ident",
]

[[package]]
name = "profiling"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"

[[package]]
name = "quick-xml"
version = "0.34.0"
Expand Down Expand Up @@ -1854,12 +1834,6 @@ dependencies = [
"winapi-util",
]

[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

[[package]]
name = "wasm-bindgen"
version = "0.2.93"
Expand Down Expand Up @@ -1987,19 +1961,6 @@ dependencies = [
"wayland-scanner",
]

[[package]]
name = "wayland-protocols-plasma"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-scanner",
]

[[package]]
name = "wayland-protocols-wlr"
version = "0.3.3"
Expand Down Expand Up @@ -2316,12 +2277,10 @@ version = "0.30.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67"
dependencies = [
"ahash",
"android-activity",
"atomic-waker",
"bitflags 2.6.0",
"block2",
"bytemuck",
"calloop",
"cfg_aliases",
"concurrent-queue",
Expand All @@ -2331,33 +2290,24 @@ dependencies = [
"dpi",
"js-sys",
"libc",
"memmap2",
"ndk",
"objc2",
"objc2-app-kit",
"objc2-foundation",
"objc2-ui-kit",
"orbclient",
"percent-encoding",
"pin-project",
"raw-window-handle",
"redox_syscall 0.4.1",
"rustix",
"smithay-client-toolkit",
"smol_str",
"tracing",
"unicode-segmentation",
"wasm-bindgen",
"wasm-bindgen-futures",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-protocols-plasma",
"web-sys",
"web-time",
"windows-sys 0.52.0",
"x11-dl",
"x11rb",
"xkbcommon-dl",
]

Expand All @@ -2382,28 +2332,13 @@ version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"

[[package]]
name = "x11-dl"
version = "2.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
dependencies = [
"libc",
"once_cell",
"pkg-config",
]

[[package]]
name = "x11rb"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
dependencies = [
"as-raw-xcb-connection",
"gethostname",
"libc",
"libloading",
"once_cell",
"rustix",
"x11rb-protocol",
]
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ opt-level = 2 # fast and small wasm
egui_table = { version = "0.1.0", path = "egui_table", default-features = false }

document-features = " 0.2.10"
eframe = { version = "0.29.0", default-features = false }
egui = { version = "0.29.0", default-features = false }
emath = { version = "0.29.0", default-features = false }
eframe = { version = "0.30.0", default-features = false }
egui = { version = "0.30.0", default-features = false }
emath = { version = "0.30.0", default-features = false }
env_logger = { version = "0.10", default-features = false, features = [
"auto-color",
"humantime",
Expand All @@ -34,7 +34,7 @@ web-sys = "0.3.4"

[patch.crates-io]
# If you want to use the bleeding edge version of egui and eframe:
# eframe = { git = "https://github.com/emilk/egui", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25
# eframe = { git = "https://github.com/emilk/egui", rev = "f97f85089df5e936999d5b7280e2e93e3058fac8" } # egui master 2024-09-25
# egui = { git = "https://github.com/emilk/egui", rev = "f97f85089df5e936999d5b7280e2e93e2958fac8" } # egui master 2024-09-25

# If you fork https://github.com/emilk/egui you can test with:
Expand Down
1 change: 1 addition & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ allow = [
"MPL-2.0", # https://www.mozilla.org/en-US/MPL/2.0/FAQ/ - see Q11. Used by webpki-roots on Linux.
"OFL-1.1", # https://spdx.org/licenses/OFL-1.1.html
"OpenSSL", # https://www.openssl.org/source/license.html - used on Linux
"Unicode-3.0", # https://www.unicode.org/license.txt
"Unicode-DFS-2016", # https://spdx.org/licenses/Unicode-DFS-2016.html
"Zlib", # https://tldrlegal.com/license/zlib-libpng-license-(zlib)
]
Expand Down

0 comments on commit e56dd4b

Please sign in to comment.