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.

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

Add support for drag-and-drop in blueprint tree #4910

Merged
merged 36 commits into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
990e421
WIP
abey79 Jan 25, 2024
b73a8cb
First working drag and drop!! :tada:
abey79 Jan 25, 2024
73efd74
`ListItem`: don't show icons when a drag is ongoing
abey79 Jan 25, 2024
3b6597b
Highlight receiving container
abey79 Jan 25, 2024
b763458
Lint
abey79 Jan 25, 2024
cfb13a2
Merge branch 'main' into antoine/blueprint_dnd
abey79 Jan 25, 2024
d37f60b
Update egui_tile commit ref
abey79 Jan 25, 2024
e8cfa30
Fixed self-drag bug + cargo bug from main
abey79 Jan 25, 2024
747d218
Merge branch 'main' into antoine/blueprint_dnd
abey79 Jan 25, 2024
9a967a2
Back-port `re_ui::drag_and_drop::find_drop_target` to `re_ui_example`
abey79 Jan 26, 2024
9146345
Updated to last egui_tile + minor code improvement
abey79 Jan 26, 2024
dea19c9
Accept drag in the empty space bellow the tree
abey79 Jan 26, 2024
88c36e0
Merge branch 'main' into antoine/blueprint_dnd
abey79 Jan 26, 2024
492b7c5
Post merge fixes
abey79 Jan 26, 2024
59489b1
WIP
abey79 Jan 26, 2024
128add0
Fix stuff due to egui bump
abey79 Jan 26, 2024
39adb17
Update the dnd demo to the new APIs
abey79 Jan 26, 2024
12ccfb1
Update the dnd demo to the new APIs
abey79 Jan 26, 2024
82c187c
Merge branch 'main' into antoine/dnd_better_egui_api
abey79 Jan 26, 2024
21073db
Remove useless code
abey79 Jan 26, 2024
6478006
Improved docstring
abey79 Jan 26, 2024
4536b47
Unneeded whitespace
abey79 Jan 27, 2024
75749e0
Bump egui commit to today's master
abey79 Jan 29, 2024
de957fb
Merge branch 'main' into antoine/blueprint_dnd
abey79 Jan 29, 2024
cb3a755
Fix lint
abey79 Jan 29, 2024
628b0c9
Update crates/re_ui/src/drag_and_drop.rs
abey79 Jan 29, 2024
8c0d55a
Clarified `find_drop_target` docstring and improved its signature
abey79 Jan 29, 2024
406e5d7
Merge branch 'main' into antoine/blueprint_dnd
abey79 Jan 29, 2024
85d31a9
Review comments: `ListItem` code clean-up
abey79 Jan 29, 2024
8dc3aca
Review comments: highlighted container clarifications
abey79 Jan 29, 2024
e4b47c0
Update crates/re_viewport/src/viewport.rs
abey79 Jan 30, 2024
957f8e8
Merge branch 'main' into antoine/blueprint_dnd
abey79 Jan 30, 2024
2040ab0
Post merge
abey79 Jan 30, 2024
3abcb57
Post merge proper
abey79 Jan 30, 2024
7f57f40
Merge branch 'main' into antoine/blueprint_dnd
abey79 Jan 30, 2024
b4084fe
Rolled back some `ListItem` changes that triggered unwanted interactions
abey79 Jan 30, 2024
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
23 changes: 11 additions & 12 deletions Cargo.lock

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

16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,13 @@ 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.

ecolor = { git = "https://github.com/emilk/egui.git", rev = "6b0782c96b76349da9be785d0e9054f87cd7b00a" } # egui master 2024-01-26
eframe = { git = "https://github.com/emilk/egui.git", rev = "6b0782c96b76349da9be785d0e9054f87cd7b00a" } # egui master 2024-01-26
egui = { git = "https://github.com/emilk/egui.git", rev = "6b0782c96b76349da9be785d0e9054f87cd7b00a" } # egui master 2024-01-26
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "6b0782c96b76349da9be785d0e9054f87cd7b00a" } # egui master 2024-01-26
egui_plot = { git = "https://github.com/emilk/egui.git", rev = "6b0782c96b76349da9be785d0e9054f87cd7b00a" } # egui master 2024-01-26
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "6b0782c96b76349da9be785d0e9054f87cd7b00a" } # egui master 2024-01-26
emath = { git = "https://github.com/emilk/egui.git", rev = "6b0782c96b76349da9be785d0e9054f87cd7b00a" } # egui master 2024-01-26
ecolor = { git = "https://github.com/emilk/egui.git", rev = "13b59fb0d4c4b032edc426abed4a98decd0163a6" } # egui master 2024-01-29
eframe = { git = "https://github.com/emilk/egui.git", rev = "13b59fb0d4c4b032edc426abed4a98decd0163a6" } # egui master 2024-01-29
egui = { git = "https://github.com/emilk/egui.git", rev = "13b59fb0d4c4b032edc426abed4a98decd0163a6" } # egui master 2024-01-29
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "13b59fb0d4c4b032edc426abed4a98decd0163a6" } # egui master 2024-01-29
egui_plot = { git = "https://github.com/emilk/egui.git", rev = "13b59fb0d4c4b032edc426abed4a98decd0163a6" } # egui master 2024-01-29
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "13b59fb0d4c4b032edc426abed4a98decd0163a6" } # egui master 2024-01-29
emath = { git = "https://github.com/emilk/egui.git", rev = "13b59fb0d4c4b032edc426abed4a98decd0163a6" } # egui master 2024-01-29

# Useful while developing:
# ecolor = { path = "../../egui/crates/ecolor" }
Expand All @@ -294,6 +294,6 @@ emath = { git = "https://github.com/emilk/egui.git", rev = "6b0782c96b76349da9be
# egui-wgpu = { path = "../../egui/crates/egui-wgpu" }
# emath = { path = "../../egui/crates/emath" }

# egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "b6e4fd457b2eee2c671747ead12f4a20feb380e8" } # Merge of: https://github.com/rerun-io/egui_tiles/pull/41
egui_tiles = { git = "https://github.com/rerun-io/egui_tiles", rev = "35e711283e7a021ca425d9fbd8e7581548971f49" } # master 2024-01-26

# egui_commonmark = { git = "https://github.com/rerun-io/egui_commonmark", rev = "3d83a92f995a1d18ab1172d0b129d496e0eedaae" } # Update to egui 0.25 https://github.com/lampsitter/egui_commonmark/pull/27
2 changes: 1 addition & 1 deletion crates/re_space_view_time_series/src/space_view_class.rs
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ impl SpaceViewClass for TimeSeriesSpaceView {
.x_axis_formatter(move |time, _, _| {
format_time(
time_type,
time as i64 + time_offset,
time.value as i64 + time_offset,
time_zone_for_timestamps,
)
})
Expand Down
Loading
Loading