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

Jump to bottom

Update to latest egui + use new Image api #3311

Merged
merged 10 commits into from
Sep 13, 2023
Merged

Update to latest egui + use new Image api #3311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e96c6a4
update to latest egui + use new image api
jprochazk Sep 13, 2023
3e0a223
remove `as_image_with_size`
jprochazk Sep 13, 2023
f317a93
move import
jprochazk Sep 13, 2023
d50ca9c
Merge branch 'main' into jan/update-egui-0
jprochazk Sep 13, 2023
7c1b33f
update `egui` commit
jprochazk Sep 13, 2023
e46b1dd
Merge branch 'main' into jan/update-egui-0
jprochazk Sep 13, 2023
fefe8fb
Enable the 'puffin' feature of egui and eframe
emilk Sep 13, 2023
69ff836
Reduce indentation
emilk Sep 13, 2023
d0b172a
Remove spinners from loading images
emilk Sep 13, 2023
5fd7b59
Simplify example page code
emilk Sep 13, 2023
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
46 changes: 36 additions & 10 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.

25 changes: 15 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,22 @@ crossbeam = "0.8"
ecolor = "0.22.0"
eframe = { version = "0.22.0", default-features = false, features = [
"default_fonts",
"puffin",
"wayland",
"x11",
] }
egui = { version = "0.22.0", features = ["extra_debug_asserts", "log"] }
egui = { version = "0.22.0", features = [
"extra_debug_asserts",
"log",
"puffin",
] }
egui_extras = { version = "0.22.0", features = [
"log",
"image",
"http",
"puffin",
] }
egui_plot = { git = "https://github.com/emilk/egui", rev = "2338a854f932658ad0548aa4f00874b3427970c1" }
egui_plot = { git = "https://github.com/emilk/egui", rev = "67a3fcae383044def7450b311ddc1f79e36eaae0" }
egui_tiles = { version = "0.2" }
egui-wgpu = "0.22.0"
ehttp = { version = "0.3" }
Expand Down Expand Up @@ -165,14 +170,14 @@ debug = true
# 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 = "2338a854f932658ad0548aa4f00874b3427970c1" }
eframe = { git = "https://github.com/emilk/egui", rev = "2338a854f932658ad0548aa4f00874b3427970c1" }
egui-wgpu = { git = "https://github.com/emilk/egui", rev = "2338a854f932658ad0548aa4f00874b3427970c1" }
egui-winit = { git = "https://github.com/emilk/egui", rev = "2338a854f932658ad0548aa4f00874b3427970c1" }
egui = { git = "https://github.com/emilk/egui", rev = "2338a854f932658ad0548aa4f00874b3427970c1" }
egui_extras = { git = "https://github.com/emilk/egui", rev = "2338a854f932658ad0548aa4f00874b3427970c1" }
emath = { git = "https://github.com/emilk/egui", rev = "2338a854f932658ad0548aa4f00874b3427970c1" }
epaint = { git = "https://github.com/emilk/egui", rev = "2338a854f932658ad0548aa4f00874b3427970c1" }
ecolor = { git = "https://github.com/emilk/egui", rev = "67a3fcae383044def7450b311ddc1f79e36eaae0" }
eframe = { git = "https://github.com/emilk/egui", rev = "67a3fcae383044def7450b311ddc1f79e36eaae0" }
egui-wgpu = { git = "https://github.com/emilk/egui", rev = "67a3fcae383044def7450b311ddc1f79e36eaae0" }
egui-winit = { git = "https://github.com/emilk/egui", rev = "67a3fcae383044def7450b311ddc1f79e36eaae0" }
egui = { git = "https://github.com/emilk/egui", rev = "67a3fcae383044def7450b311ddc1f79e36eaae0" }
egui_extras = { git = "https://github.com/emilk/egui", rev = "67a3fcae383044def7450b311ddc1f79e36eaae0" }
emath = { git = "https://github.com/emilk/egui", rev = "67a3fcae383044def7450b311ddc1f79e36eaae0" }
epaint = { git = "https://github.com/emilk/egui", rev = "67a3fcae383044def7450b311ddc1f79e36eaae0" }

# Temporary patch until next egui_tiles release
egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "c66d6cba7ddb5b236be614d1816be4561260274e" }
2 changes: 1 addition & 1 deletion crates/re_ui/src/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ impl UICommand {
response
}

pub fn menu_button(self, egui_ctx: &egui::Context) -> egui::Button {
pub fn menu_button(self, egui_ctx: &egui::Context) -> egui::Button<'static> {
let mut button = egui::Button::new(self.text());
if let Some(shortcut) = self.kb_shortcut() {
button = button.shortcut_text(egui_ctx.format_shortcut(&shortcut));
Expand Down
2 changes: 2 additions & 0 deletions crates/re_ui/src/design_tokens.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ fn apply_design_tokens(ctx: &egui::Context) -> DesignTokens {
// don't color hyperlinks #2733
egui_style.visuals.hyperlink_color = default;

egui_style.image_loading_spinners = false;

ctx.set_style(egui_style);

DesignTokens {
Expand Down
6 changes: 6 additions & 0 deletions crates/re_ui/src/icons.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use egui::{Image, ImageSource};

#[derive(Clone, Copy, Debug)]
pub struct Icon {
/// Human readable unique id
Expand All @@ -10,6 +12,10 @@ impl Icon {
pub const fn new(id: &'static str, png_bytes: &'static [u8]) -> Self {
Self { id, png_bytes }
}

pub fn as_image(&self) -> Image<'static> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be an impl From<&Icon> for Image<'static>

Image::new(ImageSource::Bytes(self.id.into(), self.png_bytes.into()))
}
}

pub const RERUN_MENU: Icon =
Expand Down
Loading
Loading