Linux specific: Fixed ObjectDataViewModel::GetColumnType()

When "string" type was returned, strange editing TextControl was appeared. + Added check of the selection for ObjectList::toggle_printable_state() function
prusa3d · May 10, 2021 · b87c03f · b87c03f
1 parent 426d2cd
commit b87c03f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -3909,6 +3909,8 @@ void ObjectList::toggle_printable_state()
 {
  wxDataViewItemArray sels;
  GetSelections(sels);
+ if (sels.IsEmpty())
+ return;
 
  wxDataViewItem frst_item = sels[0];
 

diff --git a/src/slic3r/GUI/ObjectDataViewModel.cpp b/src/slic3r/GUI/ObjectDataViewModel.cpp
@@ -1180,6 +1180,15 @@ int ObjectDataViewModel::GetExtruderNumber(const wxDataViewItem& item) const
  return atoi(node->m_extruder.c_str());
 }
 
+wxString ObjectDataViewModel::GetColumnType(unsigned int col) const
+{
+ if (col == colName || col == colExtruder)
+ return wxT("DataViewBitmapText");
+ if (col == colPrint || col == colEditing)
+ return wxT("DataViewBitmap");
+ return wxT("string");
+}
+
 void ObjectDataViewModel::GetValue(wxVariant &variant, const wxDataViewItem &item, unsigned int col) const
 {
  wxASSERT(item.IsOk());

diff --git a/src/slic3r/GUI/ObjectDataViewModel.hpp b/src/slic3r/GUI/ObjectDataViewModel.hpp
@@ -316,7 +316,7 @@ class ObjectDataViewModel :public wxDataViewModel
  // helper methods to change the model
 
  unsigned int GetColumnCount() const override { return 3;}
- wxString GetColumnType(unsigned int col) const override{ return wxT("string"); }
+ wxString GetColumnType(unsigned int col) const override;
 
  void GetValue( wxVariant &variant,
  const wxDataViewItem &item,