Dragging objects into open folders in list now puts them in the folder
This commit is contained in:
parent
08670e5dee
commit
b85993c838
1 changed files with 11 additions and 6 deletions
|
|
@ -61,24 +61,29 @@ void TreeListing::update(UpdateInputData& io, GUIManager& gui, NetworkingObjects
|
||||||
if(!hoveredObject.has_value())
|
if(!hoveredObject.has_value())
|
||||||
set_single_selected_object();
|
set_single_selected_object();
|
||||||
else {
|
else {
|
||||||
ParentObjectIDStack& hoveredObjVal = hoveredObject.value();
|
ParentObjectIDStack hoveredObjValToUse = hoveredObject.value(); // By value since it'll be edited
|
||||||
size_t indexToMoveFrom = displayData.getIndexOfObjInList(objDraggedVal);
|
size_t indexToMoveFrom = displayData.getIndexOfObjInList(objDraggedVal);
|
||||||
size_t indexToMoveTo = displayData.getIndexOfObjInList({hoveredObjVal.parents.back(), hoveredObjVal.object});
|
size_t indexToMoveTo = displayData.getIndexOfObjInList({hoveredObjValToUse.parents.back(), hoveredObjValToUse.object});
|
||||||
if(!topHalfOfHovered)
|
std::optional<DisplayData::ObjInList> objInList = displayData.getObjInListAtIndex(hoveredObjValToUse.parents.back(), indexToMoveTo);
|
||||||
|
if(objInList.value().isDirectoryOpen && !topHalfOfHovered) { // Move to front of the list object if it's open
|
||||||
|
hoveredObjValToUse.parents.emplace_back(hoveredObjValToUse.object);
|
||||||
|
indexToMoveTo = 0;
|
||||||
|
}
|
||||||
|
else if(!topHalfOfHovered)
|
||||||
indexToMoveTo++;
|
indexToMoveTo++;
|
||||||
if((indexToMoveFrom == indexToMoveTo || (indexToMoveFrom + 1) == indexToMoveTo) && objDraggedVal.parent == hoveredObjVal.parents.back())
|
if((indexToMoveFrom == indexToMoveTo || (indexToMoveFrom + 1) == indexToMoveTo) && objDraggedVal.parent == hoveredObjValToUse.parents.back())
|
||||||
set_single_selected_object();
|
set_single_selected_object();
|
||||||
else {
|
else {
|
||||||
bool wrongMovement = false;
|
bool wrongMovement = false;
|
||||||
// Check if object is about to move into itself
|
// Check if object is about to move into itself
|
||||||
for(const NetworkingObjects::NetObjID& parent : hoveredObjVal.parents) {
|
for(const NetworkingObjects::NetObjID& parent : hoveredObjValToUse.parents) {
|
||||||
if(objsSelected.contains(parent)) {
|
if(objsSelected.contains(parent)) {
|
||||||
wrongMovement = true;
|
wrongMovement = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(!wrongMovement)
|
if(!wrongMovement)
|
||||||
displayData.moveObjectsToListAtIndex(hoveredObjVal.parents.back(), indexToMoveTo, orderedObjsSelected);
|
displayData.moveObjectsToListAtIndex(hoveredObjValToUse.parents.back(), indexToMoveTo, orderedObjsSelected);
|
||||||
objsSelected.clear();
|
objsSelected.clear();
|
||||||
orderedObjsSelected.clear();
|
orderedObjsSelected.clear();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue