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

Single-selection drag-and-drop demos #4879

Merged
merged 37 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3a08110
WIP: basics work but selection is wacky
abey79 Jan 19, 2024
d3af316
WIP: fix selection behaviour
abey79 Jan 22, 2024
154bd0f
Drag support in ListItem + code cleanup
abey79 Jan 22, 2024
81ff675
Lint
abey79 Jan 22, 2024
ed6e2c3
Lint + moved code to a better place
abey79 Jan 22, 2024
9dd1cbb
Added hierarchical version of the demo
abey79 Jan 22, 2024
f689bf6
Lint
abey79 Jan 22, 2024
f863c3d
WIP
abey79 Jan 23, 2024
d9841e6
WIP - hierarchy dnd feature complete / TODO: clean code
abey79 Jan 23, 2024
b5f0e0b
Much improved hierachical drag and drop
abey79 Jan 23, 2024
8598e35
Merge branch 'main' into antoine/dnd_demo
abey79 Jan 23, 2024
a168a5b
Fixed bug and improved code
abey79 Jan 23, 2024
5eec3ab
ASCII art!! ٩(๑・ิᴗ・ิ)۶
abey79 Jan 23, 2024
c902974
Highlight destination container
abey79 Jan 23, 2024
39c173d
Merge branch 'main' into antoine/dnd_demo
abey79 Jan 23, 2024
b0cbd00
Review comment: non-hierarchial demo in mod + better item id
abey79 Jan 23, 2024
a283f75
Review comment: hierarchical demo in mod
abey79 Jan 23, 2024
2177577
Review comment: DragTarget -> DropTarget
abey79 Jan 23, 2024
c220dd0
Review comment: X before Y
abey79 Jan 23, 2024
a1faa50
Review comment: better note on adding `response.drag_stopped()`
abey79 Jan 23, 2024
f8f6c62
Review comment: cursor -> drag target indicator
abey79 Jan 23, 2024
e14f9cf
Removed one todo that could be cleaned up + lint
abey79 Jan 23, 2024
69aa6db
Merge branch 'main' into antoine/dnd_demo
abey79 Jan 23, 2024
f8357b9
Post merge fix
abey79 Jan 23, 2024
fd3251e
Update crates/re_ui/examples/re_ui_example.rs
abey79 Jan 24, 2024
0d519aa
Review comment: set cursor to Grabbing
abey79 Jan 24, 2024
1b6257b
Review comment: ListItem::drag_id -> draggable
abey79 Jan 24, 2024
4659239
Review comment: pos -> position_idx
abey79 Jan 24, 2024
6d90d4d
Review comment: misc
abey79 Jan 24, 2024
ab2cdc6
Update to latest egui commit and removed some TODOs
abey79 Jan 24, 2024
069b894
Review comment: updated TODOs
abey79 Jan 24, 2024
e7e21f2
Review comment: ListItem::drag_target -> drop_target_style
abey79 Jan 24, 2024
0c4a69b
Review comment: removed item string from the flat demo
abey79 Jan 24, 2024
6d29e79
Review comment: clarified `MoveItem` command + moar cleanup
abey79 Jan 24, 2024
d145e73
Review comment: moved the DnD demo to be better separated from the ot…
abey79 Jan 24, 2024
755927b
Merge branch 'main' into antoine/dnd_demo
abey79 Jan 24, 2024
94b9a81
Merge branch 'main' into antoine/dnd_demo
abey79 Jan 25, 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
41 changes: 11 additions & 30 deletions Cargo.lock

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

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -276,13 +276,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 = "2f9a4ca6e8434aaee3569095c0743b73cba26c44" } # egui master 2024-01-23
eframe = { git = "https://github.com/emilk/egui.git", rev = "2f9a4ca6e8434aaee3569095c0743b73cba26c44" } # egui master 2024-01-23
egui = { git = "https://github.com/emilk/egui.git", rev = "2f9a4ca6e8434aaee3569095c0743b73cba26c44" } # egui master 2024-01-23
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "2f9a4ca6e8434aaee3569095c0743b73cba26c44" } # egui master 2024-01-23
egui_plot = { git = "https://github.com/emilk/egui.git", rev = "2f9a4ca6e8434aaee3569095c0743b73cba26c44" } # egui master 2024-01-23
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "2f9a4ca6e8434aaee3569095c0743b73cba26c44" } # egui master 2024-01-23
emath = { git = "https://github.com/emilk/egui.git", rev = "2f9a4ca6e8434aaee3569095c0743b73cba26c44" } # egui master 2024-01-23
ecolor = { git = "https://github.com/emilk/egui.git", rev = "bcf032a08f7d7b510901a8f24a66ea12de6b2ac9" } # egui master 2024-01-24
eframe = { git = "https://github.com/emilk/egui.git", rev = "bcf032a08f7d7b510901a8f24a66ea12de6b2ac9" } # egui master 2024-01-24
egui = { git = "https://github.com/emilk/egui.git", rev = "bcf032a08f7d7b510901a8f24a66ea12de6b2ac9" } # egui master 2024-01-24
egui_extras = { git = "https://github.com/emilk/egui.git", rev = "bcf032a08f7d7b510901a8f24a66ea12de6b2ac9" } # egui master 2024-01-24
egui_plot = { git = "https://github.com/emilk/egui.git", rev = "bcf032a08f7d7b510901a8f24a66ea12de6b2ac9" } # egui master 2024-01-24
egui-wgpu = { git = "https://github.com/emilk/egui.git", rev = "bcf032a08f7d7b510901a8f24a66ea12de6b2ac9" } # egui master 2024-01-24
emath = { git = "https://github.com/emilk/egui.git", rev = "bcf032a08f7d7b510901a8f24a66ea12de6b2ac9" } # egui master 2024-01-24

# Useful while developing:
# ecolor = { path = "../../egui/crates/ecolor" }
Expand Down
4 changes: 3 additions & 1 deletion crates/re_ui/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ strum.workspace = true
sublime_fuzzy.workspace = true

[dev-dependencies]
re_log.workspace = true

eframe = { workspace = true, default-features = false, features = ["wgpu"] }
egui_tiles.workspace = true
re_log.workspace = true
rand.workspace = true
Loading
Loading