@@ -10,7 +10,7 @@ use re_types::blueprint::components::Visible;
1010use re_ui:: { drag_and_drop:: DropTarget , list_item, ContextExt as _, DesignTokens , UiExt as _} ;
1111use re_viewer_context:: {
1212 contents_name_style, icon_for_container_kind, CollapseScope , Contents , DataResultNodeOrPath ,
13- SystemCommandSender ,
13+ DragAndDropPayload , SystemCommandSender ,
1414} ;
1515use re_viewer_context:: {
1616 ContainerId , DataQueryResult , DataResultNode , HoverHighlight , Item , ViewId , ViewerContext ,
@@ -168,7 +168,7 @@ impl BlueprintTree {
168168 let item_response = ui
169169 . list_item ( )
170170 . selected ( ctx. selection ( ) . contains_item ( & item) )
171- . draggable ( false )
171+ . draggable ( true ) // allowed for consistency but results in an invalid drag
172172 . drop_target_style ( self . is_candidate_drop_parent_container ( & container_id) )
173173 . show_flat (
174174 ui,
@@ -189,7 +189,7 @@ impl BlueprintTree {
189189 SelectionUpdateBehavior :: UseSelection ,
190190 ) ;
191191 self . scroll_to_me_if_needed ( ui, & item, & item_response) ;
192- ctx. select_hovered_on_click ( & item_response, item) ;
192+ ctx. handle_select_hover_drag_interactions ( & item_response, item, true ) ;
193193
194194 self . handle_root_container_drag_and_drop_interaction (
195195 viewport,
@@ -270,12 +270,11 @@ impl BlueprintTree {
270270 SelectionUpdateBehavior :: UseSelection ,
271271 ) ;
272272 self . scroll_to_me_if_needed ( ui, & item, & response) ;
273- ctx. select_hovered_on_click ( & response, item) ;
273+ ctx. handle_select_hover_drag_interactions ( & response, item, true ) ;
274274
275275 viewport. set_content_visibility ( ctx, & content, visible) ;
276276
277277 self . handle_drag_and_drop_interaction (
278- ctx,
279278 viewport,
280279 ui,
281280 content,
@@ -406,13 +405,12 @@ impl BlueprintTree {
406405 SelectionUpdateBehavior :: UseSelection ,
407406 ) ;
408407 self . scroll_to_me_if_needed ( ui, & item, & response) ;
409- ctx. select_hovered_on_click ( & response, item) ;
408+ ctx. handle_select_hover_drag_interactions ( & response, item, true ) ;
410409
411410 let content = Contents :: View ( * view_id) ;
412411
413412 viewport. set_content_visibility ( ctx, & content, visible) ;
414413 self . handle_drag_and_drop_interaction (
415- ctx,
416414 viewport,
417415 ui,
418416 content,
@@ -494,6 +492,7 @@ impl BlueprintTree {
494492
495493 let list_item = ui
496494 . list_item ( )
495+ . draggable ( true )
497496 . selected ( is_selected)
498497 . force_hovered ( is_item_hovered) ;
499498
@@ -596,7 +595,7 @@ impl BlueprintTree {
596595 SelectionUpdateBehavior :: UseSelection ,
597596 ) ;
598597 self . scroll_to_me_if_needed ( ui, & item, & response) ;
599- ctx. select_hovered_on_click ( & response, item) ;
598+ ctx. handle_select_hover_drag_interactions ( & response, item, true ) ;
600599 }
601600
602601 /// Add a button to trigger the addition of a new view or container.
@@ -636,16 +635,21 @@ impl BlueprintTree {
636635 response : & egui:: Response ,
637636 ) {
638637 //
639- // check if a drag is in progress and set the cursor accordingly
638+ // check if a drag with acceptable content is in progress
640639 //
641640
642- let Some ( dragged_item_id ) = egui:: DragAndDrop :: payload ( ui. ctx ( ) ) . map ( |payload| * payload )
641+ let Some ( dragged_payload ) = egui:: DragAndDrop :: payload :: < DragAndDropPayload > ( ui. ctx ( ) )
643642 else {
644- // nothing is being dragged, so nothing to do
645643 return ;
646644 } ;
647645
648- ui. ctx ( ) . set_cursor_icon ( egui:: CursorIcon :: Grabbing ) ;
646+ let DragAndDropPayload :: Contents {
647+ contents : dragged_contents,
648+ } = dragged_payload. as_ref ( )
649+ else {
650+ // nothing we care about is being dragged
651+ return ;
652+ } ;
649653
650654 //
651655 // find the drop target
@@ -668,39 +672,34 @@ impl BlueprintTree {
668672 ) ;
669673
670674 if let Some ( drop_target) = drop_target {
671- self . handle_drop_target ( viewport, ui, dragged_item_id , & drop_target) ;
675+ self . handle_contents_drop_target ( viewport, ui, dragged_contents , & drop_target) ;
672676 }
673677 }
674678
675679 fn handle_drag_and_drop_interaction (
676680 & mut self ,
677- ctx : & ViewerContext < ' _ > ,
678681 viewport : & ViewportBlueprint ,
679682 ui : & egui:: Ui ,
680683 contents : Contents ,
681684 response : & egui:: Response ,
682685 body_response : Option < & egui:: Response > ,
683686 ) {
684687 //
685- // initiate drag and force single-selection
686- //
687-
688- if response. drag_started ( ) {
689- ctx. selection_state ( ) . set_selection ( contents. as_item ( ) ) ;
690- egui:: DragAndDrop :: set_payload ( ui. ctx ( ) , contents) ;
691- }
692-
693- //
694- // check if a drag is in progress and set the cursor accordingly
688+ // check if a drag with acceptable content is in progress
695689 //
696690
697- let Some ( dragged_item_id ) = egui:: DragAndDrop :: payload ( ui. ctx ( ) ) . map ( |payload| * payload )
691+ let Some ( dragged_payload ) = egui:: DragAndDrop :: payload :: < DragAndDropPayload > ( ui. ctx ( ) )
698692 else {
699- // nothing is being dragged, so nothing to do
700693 return ;
701694 } ;
702695
703- ui. ctx ( ) . set_cursor_icon ( egui:: CursorIcon :: Grabbing ) ;
696+ let DragAndDropPayload :: Contents {
697+ contents : dragged_contents,
698+ } = dragged_payload. as_ref ( )
699+ else {
700+ // nothing we care about is being dragged
701+ return ;
702+ } ;
704703
705704 //
706705 // find our parent, our position within parent, and the previous container (if any)
@@ -752,7 +751,7 @@ impl BlueprintTree {
752751 ) ;
753752
754753 if let Some ( drop_target) = drop_target {
755- self . handle_drop_target ( viewport, ui, dragged_item_id , & drop_target) ;
754+ self . handle_contents_drop_target ( viewport, ui, dragged_contents , & drop_target) ;
756755 }
757756 }
758757
@@ -763,16 +762,21 @@ impl BlueprintTree {
763762 empty_space : egui:: Rect ,
764763 ) {
765764 //
766- // check if a drag is in progress and set the cursor accordingly
765+ // check if a drag with acceptable content is in progress
767766 //
768767
769- let Some ( dragged_item_id ) = egui:: DragAndDrop :: payload ( ui. ctx ( ) ) . map ( |payload| * payload )
768+ let Some ( dragged_payload ) = egui:: DragAndDrop :: payload :: < DragAndDropPayload > ( ui. ctx ( ) )
770769 else {
771- // nothing is being dragged, so nothing to do
772770 return ;
773771 } ;
774772
775- ui. ctx ( ) . set_cursor_icon ( egui:: CursorIcon :: Grabbing ) ;
773+ let DragAndDropPayload :: Contents {
774+ contents : dragged_contents,
775+ } = dragged_payload. as_ref ( )
776+ else {
777+ // nothing we care about is being dragged
778+ return ;
779+ } ;
776780
777781 //
778782 // prepare a drop target corresponding to "insert last in root container"
@@ -788,25 +792,31 @@ impl BlueprintTree {
788792 usize:: MAX ,
789793 ) ;
790794
791- self . handle_drop_target ( viewport, ui, dragged_item_id , & drop_target) ;
795+ self . handle_contents_drop_target ( viewport, ui, dragged_contents , & drop_target) ;
792796 }
793797 }
794798
795- fn handle_drop_target (
799+ fn handle_contents_drop_target (
796800 & mut self ,
797801 viewport : & ViewportBlueprint ,
798802 ui : & Ui ,
799- dragged_item_id : Contents ,
803+ dragged_contents : & [ Contents ] ,
800804 drop_target : & DropTarget < Contents > ,
801805 ) {
802- // We cannot allow the target location to be "inside" the dragged item, because that would amount moving
803- // myself inside of me.
804- if let Contents :: Container ( dragged_container_id) = & dragged_item_id {
805- if viewport
806- . is_contents_in_container ( & drop_target. target_parent_id , dragged_container_id)
807- {
808- return ;
806+ // We cannot allow the target location to be "inside" any of the dragged items, because that
807+ // would amount to moving myself inside of me.
808+ let parent_contains_dragged_content = |content : & Contents | {
809+ if let Contents :: Container ( dragged_container_id) = content {
810+ if viewport
811+ . is_contents_in_container ( & drop_target. target_parent_id , dragged_container_id)
812+ {
813+ return true ;
814+ }
809815 }
816+ false
817+ } ;
818+ if dragged_contents. iter ( ) . any ( parent_contains_dragged_content) {
819+ return ;
810820 }
811821
812822 ui. painter ( ) . hline (
@@ -822,7 +832,7 @@ impl BlueprintTree {
822832
823833 if ui. input ( |i| i. pointer . any_released ( ) ) {
824834 viewport. move_contents (
825- dragged_item_id ,
835+ dragged_contents . to_vec ( ) ,
826836 target_container_id,
827837 drop_target. target_position_index ,
828838 ) ;
0 commit comments