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

Linux specific: Fixed ObjectDataViewModel::GetColumnType()

Browse Source 
When "string" type was returned, strange editing TextControl was appeared.
+ Added check of the selection for ObjectList::toggle_printable_state() function
This commit is contained in:
YuSanka 2021-05-10 17:57:17 +02:00
parent 426d2cd725
commit b87c03fc09
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@ -3909,6 +3909,8 @@ void ObjectList::toggle_printable_state()
{
wxDataViewItemArray sels;
GetSelections(sels);
if (sels.IsEmpty())
return;
wxDataViewItem frst_item = sels[0];

9
src/slic3r/GUI/ObjectDataViewModel.cpp
View File

@ -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());

2
src/slic3r/GUI/ObjectDataViewModel.hpp
View File

@ -316,7 +316,7 @@ public:
// 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,