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

Fix to last commit (vertical expanding of the icon to correct rendering on OSX)

Browse Source
This commit is contained in:
YuSanka 2018-09-11 11:39:13 +02:00
parent e3bb829e42
commit 775b86a3d8
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View File

@ -249,10 +249,8 @@ void create_objects_ctrl(wxWindow* win, wxBoxSizer*& objects_sz)
#endif // wxUSE_DRAG_AND_DROP && wxUSE_UNICODE
// column 0(Icon+Text) of the view control:
wxDataViewColumn *ret = new wxDataViewColumn(_(L("Name")),
new PrusaIconTextRenderer(wxT("PrusaDataViewIconText")),
0, 200, wxALIGN_LEFT, wxDATAVIEW_COL_RESIZABLE);
m_objects_ctrl->AppendColumn(ret);
m_objects_ctrl->AppendColumn(new wxDataViewColumn(_(L("Name")), new PrusaIconTextRenderer(),
0, 200, wxALIGN_LEFT, wxDATAVIEW_COL_RESIZABLE));
// m_objects_ctrl->AppendIconTextColumn(_(L("Name")), 0, wxDATAVIEW_CELL_INERT, 200,
// wxALIGN_LEFT, wxDATAVIEW_COL_RESIZABLE);

5
xs/src/slic3r/GUI/wxExtensions.cpp
View File

@ -385,8 +385,13 @@ bool PrusaObjectDataViewModelNode::update_settings_digest(const std::vector<std:
wxNullBitmap : categories_icon.at(cat));
bmp = m_bitmap_cache->insert(m_name.ToStdString(), bmps);
}
m_icon.CopyFromBitmap(*bmp);
#ifdef __WXOSX__
if (m_icon.GetWidth() != m_icon.GetHeight())
m_icon.SetHeight(m_icon.GetWidth());
#endif // __WXOSX__
return true;
}

6
xs/src/slic3r/GUI/wxExtensions.hpp
View File

@ -422,9 +422,9 @@ public:
class PrusaIconTextRenderer : public wxDataViewCustomRenderer
{
public:
PrusaIconTextRenderer( const wxString &varianttype = wxT("PrusaDataViewIconText"),
wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT) {}
PrusaIconTextRenderer( wxDataViewCellMode mode = wxDATAVIEW_CELL_INERT,
int align = wxDVR_DEFAULT_ALIGNMENT):
wxDataViewCustomRenderer(wxT("wxDataViewIconText"), mode, wxALIGN_CENTER) {}
bool SetValue(const wxVariant &value);
bool GetValue(wxVariant &value) const;