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

Show layout in blueprint tree view #2465

Merged
merged 20 commits into from
Jun 28, 2023
Merged

Show layout in blueprint tree view #2465

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
911f53e
Update egui_tiles to invisibility branch
emilk Jun 17, 2023
6e3926a
Show the layouts in the blueprint tree view
emilk Jun 17, 2023
257d8b2
Remove spaceviews from the tree in Viewport::remove
emilk Jun 17, 2023
c669bbb
fix text and add a TODO
emilk Jun 21, 2023
241b1ed
Some improvements and bug fixes
emilk Jun 21, 2023
0cd69ce
Handle toggling of visibility of single-child container
emilk Jun 22, 2023
263119a
Implement removal of child views
emilk Jun 22, 2023
3b63200
Remove two TODOs
emilk Jun 24, 2023
0b04ca6
Set git hash
emilk Jun 24, 2023
8d8396e
Implement removing of containers
emilk Jun 24, 2023
11b4365
Merge branch 'main' into emilk/show-tiles-layout
emilk Jun 26, 2023
5fe623f
Update egui_tiles
emilk Jun 26, 2023
f9fbe60
.vscode: don't build web-viewer when running debugger
emilk Jun 26, 2023
ff923e7
Update egui_tiles, fixing maximized state
emilk Jun 27, 2023
bbefd0d
update egui_tiles
emilk Jun 28, 2023
355b2f6
Update itertools
emilk Jun 28, 2023
560b7e2
Re-enable code that works fine
emilk Jun 28, 2023
6c8d58c
Nicer formatting of numbers
emilk Jun 28, 2023
a5d0f26
Add profiling scope
emilk Jun 28, 2023
60b32df
Update itertools in examples too
emilk Jun 28, 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
9 changes: 7 additions & 2 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"args": [
"build",
"--package=rerun-cli",
"--no-default-features",
"--features=native_viewer"
],
"filter": {
Expand All @@ -49,7 +50,9 @@
"cargo": {
"args": [
"build",
"--package=rerun-cli"
"--package=rerun-cli",
"--no-default-features",
"--features=native_viewer"
],
"filter": {
"name": "rerun",
Expand All @@ -68,7 +71,9 @@
"cargo": {
"args": [
"build",
"--package=rerun-cli"
"--package=rerun-cli",
"--no-default-features",
"--features=native_viewer"
],
"filter": {
"name": "rerun",
Expand Down
63 changes: 35 additions & 28 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.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,4 +144,4 @@ debug = true
# 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.

egui_tiles = { git = "https://github.com/rerun-io/egui_tiles.git", rev = "2c07e620dceeab999547ca1053f5ace22c1d14f0" } # TODO: don't merge
egui_tiles = { git = "https://github.com/rerun-io/egui_tiles.git", rev = "bee1b7f69ee1e4b8ddc1d78cd53540545a8f591e" } # TODO: don't merge
3 changes: 1 addition & 2 deletions crates/re_viewport/src/viewport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,10 @@ impl Viewport {
tile_id: egui_tiles::TileId,
container: &mut egui_tiles::Container,
) -> TreeAction {
if container.children().len() == 1 {
if let Some(child_id) = container.only_child() {
// Maybe a tab container with only one child - collapse it in the tree view to make it more easily understood.
// This means we won't be showing the visibility button of the parent container,
// so if the child is made invisible, we should do the same for the parent.
let child_id = container.children()[0];
let child_is_visible = self.tree.is_visible(child_id);
self.tree.set_visible(tile_id, child_is_visible);
return self.tile_ui(ctx, ui, child_id);
Expand Down