Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7326f46
Update egui to laters master
lucasmerlin Feb 21, 2025
b996a49
Update stuff
lucasmerlin Feb 28, 2025
427f9c9
Use egui from master
lucasmerlin Mar 3, 2025
943ad26
Use MenuButton instead of SubMenuButton
lucasmerlin Mar 3, 2025
a48d2be
Use new egui close fn and return egui ModalResponse
lucasmerlin Mar 13, 2025
98266f5
Replace deprecated fns
lucasmerlin Mar 13, 2025
2826898
Merge branch 'main' into lucas/egui-popup-modal-update
lucasmerlin Apr 24, 2025
0467890
Replace close_menu calls
lucasmerlin Apr 24, 2025
dd2a579
Update egui
lucasmerlin Apr 24, 2025
7d518ce
Ooof that's a lot of snapshots
lucasmerlin Apr 24, 2025
8fa32f7
Merge branch 'main' into lucas/egui-popup-modal-update
lucasmerlin Apr 30, 2025
0d929b1
Use new menu button
lucasmerlin Apr 30, 2025
8d9f34f
Newer egui commit
lucasmerlin Apr 30, 2025
8091b16
Use ScrollSource
lucasmerlin Apr 30, 2025
703f2dc
Update egui
lucasmerlin Apr 30, 2025
5394d9e
Update threshold
lucasmerlin Apr 30, 2025
8f2448e
Use rerun commonmark fork
lucasmerlin Apr 30, 2025
543b065
Update threshold
lucasmerlin Apr 30, 2025
42c3a09
Add `snapshot_with_broken_pixels`
lucasmerlin Apr 30, 2025
f6bdc43
Merge branch 'main' into lucas/egui-popup-modal-update
lucasmerlin Apr 30, 2025
5ab0e49
Update egui
lucasmerlin May 6, 2025
0681edd
Fix trait fn
lucasmerlin May 6, 2025
6a97071
Merge branch 'main' into lucas/egui-popup-modal-update
lucasmerlin May 6, 2025
cf499f8
Fixes
lucasmerlin May 6, 2025
f9b711c
Update snapshots
lucasmerlin May 6, 2025
f1bd2b3
Improve time panel strength
lucasmerlin May 6, 2025
0840fae
Make them even stronger
lucasmerlin May 6, 2025
bf922e6
Fix annotations test
lucasmerlin May 6, 2025
94a3fbd
Egui update & fixes
lucasmerlin May 7, 2025
dc683f6
Update snapshot (looks wrong)
lucasmerlin May 7, 2025
555f195
It fixed itself
lucasmerlin May 7, 2025
b42f09b
Merge branch 'main' into lucas/egui-popup-modal-update
lucasmerlin May 8, 2025
c0e5a14
Fix after update
lucasmerlin May 8, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
403 changes: 242 additions & 161 deletions Cargo.lock

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -644,13 +644,13 @@ significant_drop_tightening = "allow" # An update of parking_lot made this trigg
# Prefer patching with `branch` over `rev` and let `Cargo.lock` handle the commit hash.
# That makes it easy to upade with `cargo update -p $CRATE`.

# ecolor = { git = "https://github.com/emilk/egui.git", branch = "master" }
# eframe = { git = "https://github.com/emilk/egui.git", branch = "master" }
# egui = { git = "https://github.com/emilk/egui.git", branch = "master" }
# egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master" }
# egui_kittest = { git = "https://github.com/emilk/egui.git", branch = "master" }
# egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "master" }
# emath = { git = "https://github.com/emilk/egui.git", branch = "master" }
ecolor = { git = "https://github.com/emilk/egui.git", branch = "master" }
eframe = { git = "https://github.com/emilk/egui.git", branch = "master" }
egui = { git = "https://github.com/emilk/egui.git", branch = "master" }
egui_extras = { git = "https://github.com/emilk/egui.git", branch = "master" }
egui_kittest = { git = "https://github.com/emilk/egui.git", branch = "master" }
egui-wgpu = { git = "https://github.com/emilk/egui.git", branch = "master" }
emath = { git = "https://github.com/emilk/egui.git", branch = "master" }

# Useful while developing:
# ecolor = { path = "../../egui/crates/ecolor" }
Expand All @@ -667,7 +667,7 @@ significant_drop_tightening = "allow" # An update of parking_lot made this trigg
# egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", branch = "emilk/update-egui" }
# egui_tiles = { path = "../egui_tiles" }

# egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark.git", branch = "egui-update" } # https://github.com/lampsitter/egui_commonmark/pull/71
egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark.git", branch = "egui-update" } # https://github.com/lampsitter/egui_commonmark/pull/76

# egui_commonmark = { path = "../../forks/egui_commonmark/egui_commonmark" }

Expand Down
6 changes: 3 additions & 3 deletions crates/viewer/re_blueprint_tree/src/blueprint_tree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1146,7 +1146,7 @@ fn add_new_view_or_container_menu_button(
))
.clicked()
{
ui.close_menu();
ui.close();

// If a single container is selected, we use it as target. Otherwise, we target the
// root container.
Expand Down Expand Up @@ -1197,7 +1197,7 @@ fn set_blueprint_to_default_menu_buttons(ctx: &ViewerContext<'_>, ui: &mut egui:
};

if response.clicked() {
ui.close_menu();
ui.close();
ctx.command_sender()
.send_system(re_viewer_context::SystemCommand::ClearActiveBlueprint);
}
Expand All @@ -1219,7 +1219,7 @@ fn set_blueprint_to_auto_menu_button(ctx: &ViewerContext<'_>, ui: &mut egui::Ui)
.on_hover_text("Re-populate viewport with automatically chosen views")
.clicked()
{
ui.close_menu();
ui.close();
ctx.command_sender()
.send_system(re_viewer_context::SystemCommand::ClearActiveBlueprintAndEnableHeuristics);
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading