3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-02-06 16:20:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

ENH: Revert "[STUDIO-3980] drag object accross plate in ObjectList"

Browse source 
This reverts commit 3c723583743938848db8392bddffc31ae7e68b6d.

Change-Id: Ie2500ede6c1839b88fd89666596a7d16957a2443
Jira: STUDIO-3980
This commit is contained in:
chunmao.guo 2023-08-28 17:37:01 +08:00 • committed by Lane.Wei
parent 24e672a0f1
commit d1ed562622
4 changed files with 18 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/ObjectDataViewModel.cpp
View file

@ -1811,10 +1811,8 @@ wxDataViewItem ObjectDataViewModel::ReorganizeObjects( const int current_id, co
m_objects.erase(m_objects.begin() + current_id);
plate_node->GetChildren().Remove(deleted_node);
ItemDeleted(wxDataViewItem(plate_node), wxDataViewItem(deleted_node));
ItemDeleted(wxDataViewItem(deleted_node->m_parent), wxDataViewItem(deleted_node));
bool change_plate = plate_node != new_node->m_parent;
plate_node = deleted_node->m_parent = new_node->m_parent;
m_objects.emplace(m_objects.begin() + new_id, deleted_node);
int plate_child_index = plate_node->GetChildIndex(new_node);
if (current_id < new_id)
@ -1823,7 +1821,7 @@ wxDataViewItem ObjectDataViewModel::ReorganizeObjects( const int current_id, co
//should not happen
plate_node->Insert(deleted_node, plate_child_index);
}
ItemAdded(wxDataViewItem(plate_node), wxDataViewItem(deleted_node));
ItemAdded(wxDataViewItem(deleted_node->m_parent), wxDataViewItem(deleted_node));
//ItemChanged(wxDataViewItem(nullptr));