Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to egui 0.23 #3523

Merged
merged 1 commit into from
Sep 28, 2023
Merged

Update to egui 0.23 #3523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 36 additions & 24 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 10 additions & 27 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,27 +78,27 @@ cfg-if = "1.0"
clap = "4.0"
comfy-table = { version = "6.1", default-features = false }
crossbeam = "0.8"
ecolor = "0.22.0"
eframe = { version = "0.22.0", default-features = false, features = [
ecolor = "0.23.0"
eframe = { version = "0.23.0", default-features = false, features = [
"default_fonts",
"puffin",
"wayland",
"x11",
] }
egui = { version = "0.22.0", features = [
egui = { version = "0.23.0", features = [
"extra_debug_asserts",
"log",
"puffin",
] }
egui_commonmark = { version = "0.7", default-features = false }
egui_extras = { version = "0.22.0", features = ["http", "image", "puffin"] }
egui_plot = { git = "https://github.com/emilk/egui", rev = "a9272e0e55cda2aa60d22f342d0d2280628ca354" } # egui_plot is not yet published on crates.io
egui_tiles = "0.2"
egui-wgpu = "0.22.0"
egui_commonmark = { version = "0.8", default-features = false }
egui_extras = { version = "0.23.0", features = ["http", "image", "puffin"] }
egui_plot = "0.23.0"
egui_tiles = "0.3"
egui-wgpu = "0.23.0"
ehttp = "0.3.1"
emath = "0.22.0"
emath = "0.23.0"
enumset = "1.0.12"
epaint = "0.22.0"
epaint = "0.23.0"
glam = "0.22"
gltf = "1.1"
half = "2.3.1"
Expand Down Expand Up @@ -164,20 +164,3 @@ debug = true
# If that is not possible, patch to a branch that has a PR open on the upstream repo.
# As a last resport, patch with a commit to our own repository.
# ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.

# Temporary patch until next egui release
ecolor = { git = "https://github.com/emilk/egui", rev = "a9272e0e55cda2aa60d22f342d0d2280628ca354" }
eframe = { git = "https://github.com/emilk/egui", rev = "a9272e0e55cda2aa60d22f342d0d2280628ca354" }
egui-wgpu = { git = "https://github.com/emilk/egui", rev = "a9272e0e55cda2aa60d22f342d0d2280628ca354" }
egui-winit = { git = "https://github.com/emilk/egui", rev = "a9272e0e55cda2aa60d22f342d0d2280628ca354" }
egui = { git = "https://github.com/emilk/egui", rev = "a9272e0e55cda2aa60d22f342d0d2280628ca354" }
egui_extras = { git = "https://github.com/emilk/egui", rev = "a9272e0e55cda2aa60d22f342d0d2280628ca354" }
emath = { git = "https://github.com/emilk/egui", rev = "a9272e0e55cda2aa60d22f342d0d2280628ca354" }
epaint = { git = "https://github.com/emilk/egui", rev = "a9272e0e55cda2aa60d22f342d0d2280628ca354" }

# Temporary patch until next egui_commonmark release
egui_commonmark = { git = "https://github.com/lampsitter/egui_commonmark.git", rev = "d42d340d2d617f19e3d52697faa9cfcfa3eafa27" }

# Temporary patch until next egui_tiles release
egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "f093f065c048a69be1ea125e9706ef3db302d255" }
# egui_tiles = { path = "../egui_tiles" }
5 changes: 4 additions & 1 deletion crates/re_ui/src/icons.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ impl Icon {
}

pub fn as_image(&self) -> Image<'static> {
Image::new(ImageSource::Bytes(self.id.into(), self.png_bytes.into()))
Image::new(ImageSource::Bytes {
uri: self.id.into(),
bytes: self.png_bytes.into(),
})
}
}

Expand Down
Loading