3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-17 03:37:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use the wxDataViewIconTextRenderer instead of the DataViewBitmapTextRenderer under GTK

Browse source
This commit is contained in:
YuSanka 2020-08-10 09:45:32 +02:00
parent c4569c93f2
commit 8b74ae4568
2 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/slic3r/GUI/UnsavedChangesDialog.hpp
View file

@ -18,6 +18,12 @@ namespace GUI{
class ModelNode;
WX_DEFINE_ARRAY_PTR(ModelNode*, ModelNodePtrArray);
// On all of 3 different platforms Bitmap+Text icon column looks different
// because of Markup text is missed or not implemented.
// As a temporary workaround, we will use:
// MSW - DataViewBitmapText (our custom renderer wxBitmap + wxString, supported Markup text)
// OSX - -//-, but Markup text is not implemented right now
// GTK - wxDataViewIconText (wxWidgets for GTK renderer wxIcon + wxString, supported Markup text)
class ModelNode
{
wxWindow* m_parent_win{ nullptr };
@ -47,7 +53,11 @@ class ModelNode
public:
bool m_toggle {true};
#ifdef __linux__
wxIcon m_icon;
#else
wxBitmap m_icon;
#endif //__linux__
wxBitmap m_old_color_bmp;
wxBitmap m_new_color_bmp;
wxString m_text;