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

UnsavedChangesDialog :: Toggle column is on first place now

Browse Source
This commit is contained in:
YuSanka 2020-08-07 10:21:20 +02:00
parent e709c49e17
commit 08576ad746
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/ExtraRenderers.cpp
View File

@ -159,14 +159,14 @@ wxSize BitmapTextRenderer::GetSize() const
dc.SetFont(GetAttr().GetEffectiveFont(view->GetFont())); dc.SetFont(GetAttr().GetEffectiveFont(view->GetFont()));
size = m_markupText->Measure(dc); size = m_markupText->Measure(dc);
int lines = m_value.GetText().Freq('\n') + 1;
size.SetHeight(size.GetHeight() * lines);
} }
else else
#endif // SUPPORTS_MARKUP && wxHAS_GENERIC_DATAVIEWCTRL #endif // SUPPORTS_MARKUP && wxHAS_GENERIC_DATAVIEWCTRL
size = GetTextExtent(m_value.GetText()); size = GetTextExtent(m_value.GetText());
int lines = m_value.GetText().Freq('\n') + 1;
size.SetHeight(size.GetHeight() * lines);
if (m_value.GetBitmap().IsOk()) if (m_value.GetBitmap().IsOk())
size.x += m_value.GetBitmap().GetWidth() + 4; size.x += m_value.GetBitmap().GetWidth() + 4;
return size; return size;

4
src/slic3r/GUI/UnsavedChangesDialog.cpp
View File

@ -440,10 +440,8 @@ UnsavedChangesDialog::UnsavedChangesDialog(Preset::Type type)
m_tree->AssociateModel(m_tree_model); m_tree->AssociateModel(m_tree_model);
m_tree_model->SetAssociatedControl(m_tree); m_tree_model->SetAssociatedControl(m_tree);
m_tree->AppendColumn(new wxDataViewColumn("", new BitmapTextRenderer(true), UnsavedChangesModel::colIconText, 30 * em, wxALIGN_TOP, wxDATAVIEW_COL_RESIZABLE));
m_tree->AppendToggleColumn(L"\u2714", UnsavedChangesModel::colToggle, wxDATAVIEW_CELL_ACTIVATABLE, 6 * em);//2610,11,12 //2714 m_tree->AppendToggleColumn(L"\u2714", UnsavedChangesModel::colToggle, wxDATAVIEW_CELL_ACTIVATABLE, 6 * em);//2610,11,12 //2714
m_tree->AppendColumn(new wxDataViewColumn("", new BitmapTextRenderer(true), UnsavedChangesModel::colIconText, 30 * em, wxALIGN_TOP, wxDATAVIEW_COL_RESIZABLE));
m_tree->AppendColumn(new wxDataViewColumn("Old value", new BitmapTextRenderer(true), UnsavedChangesModel::colOldValue, 20 * em, wxALIGN_TOP)); m_tree->AppendColumn(new wxDataViewColumn("Old value", new BitmapTextRenderer(true), UnsavedChangesModel::colOldValue, 20 * em, wxALIGN_TOP));
m_tree->AppendColumn(new wxDataViewColumn("New value", new BitmapTextRenderer(true), UnsavedChangesModel::colNewValue, 20 * em, wxALIGN_TOP)); m_tree->AppendColumn(new wxDataViewColumn("New value", new BitmapTextRenderer(true), UnsavedChangesModel::colNewValue, 20 * em, wxALIGN_TOP));

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

@ -134,8 +134,8 @@ class UnsavedChangesModel : public wxDataViewModel
public: public:
enum { enum {
colIconText,
colToggle, colToggle,
colIconText,
colOldValue, colOldValue,
colNewValue, colNewValue,
colMax colMax