3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed DnD down-moving on GTK

Browse source
This commit is contained in:
YuSanka 2018-08-14 13:04:11 +02:00
parent 13388f1caa
commit acac6b0b44
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View file

@ -690,7 +690,7 @@ void add_object_to_list(const std::string &name, ModelObject* model_object)
} }
// part_selection_changed(); // part_selection_changed();
#ifdef __WXMSW__ #ifndef __WXOSX__ //#ifdef __WXMSW__
object_ctrl_selection_changed(); object_ctrl_selection_changed();
#endif //__WXMSW__ #endif //__WXMSW__
} }
@ -1230,7 +1230,7 @@ void on_btn_del()
void on_btn_split(const bool split_part) void on_btn_split(const bool split_part)
{ {
auto item = m_objects_ctrl->GetSelection(); auto item = m_objects_ctrl->GetSelection();
if (!item) if (!item || m_selected_object_id<0)
return; return;
auto volume_id = m_objects_model->GetVolumeIdByItem(item); auto volume_id = m_objects_model->GetVolumeIdByItem(item);
ModelVolume* volume; ModelVolume* volume;
@ -1542,6 +1542,13 @@ void on_begin_drag(wxDataViewEvent &event)
return; return;
} }
/* Under MSW or OSX, DnD moves an item to the place of another selected item
* But under GTK, DnD moves an item between another two items.
* And as a result - call EVT_CHANGE_SELECTION to unselect all items.
* To prevent such behavior use g_prevent_list_events
**/
g_prevent_list_events = true;//it's needed for GTK
wxTextDataObject *obj = new wxTextDataObject; wxTextDataObject *obj = new wxTextDataObject;
obj->SetText(wxString::Format("%d", m_objects_model->GetVolumeIdByItem(item))); obj->SetText(wxString::Format("%d", m_objects_model->GetVolumeIdByItem(item)));
event.SetDataObject(obj); event.SetDataObject(obj);
@ -1575,6 +1582,14 @@ void on_drop(wxDataViewEvent &event)
int from_volume_id = std::stoi(obj.GetText().ToStdString()); int from_volume_id = std::stoi(obj.GetText().ToStdString());
int to_volume_id = m_objects_model->GetVolumeIdByItem(item); int to_volume_id = m_objects_model->GetVolumeIdByItem(item);
#ifdef __WXGTK__
/* Under GTK, DnD moves an item between another two items.
* And event.GetItem() return item, which is under "insertion line"
* So, if we move item down we should to decrease the to_volume_id value
**/
if (to_volume_id > from_volume_id) to_volume_id--;
#endif // __WXGTK__
m_objects_ctrl->Select(m_objects_model->ReorganizeChildren(from_volume_id, to_volume_id, m_objects_ctrl->Select(m_objects_model->ReorganizeChildren(from_volume_id, to_volume_id,
m_objects_model->GetParent(item))); m_objects_model->GetParent(item)));
@ -1583,6 +1598,8 @@ void on_drop(wxDataViewEvent &event)
int cnt = 0; int cnt = 0;
for (int id = from_volume_id; cnt < abs(from_volume_id - to_volume_id); id+=delta, cnt++) for (int id = from_volume_id; cnt < abs(from_volume_id - to_volume_id); id+=delta, cnt++)
std::swap(volumes[id], volumes[id +delta]); std::swap(volumes[id], volumes[id +delta]);
g_prevent_list_events = false;
} }
} //namespace GUI } //namespace GUI