juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified wxCheckListBoxComboPopup::GetAdjustedSize() and create_combochecklist() to size the combo control taking in account the items width

Browse Source
This commit is contained in:
enricoturri1966
2020-04-25 10:36:51 +02:00
parent d8091b7ad7
commit 85676af171
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/wxExtensions.cpp
View File

@@ -197,8 +197,8 @@ wxString wxCheckListBoxComboPopup::GetStringValue() const
wxSize wxCheckListBoxComboPopup::GetAdjustedSize(int minWidth, int prefHeight, int maxHeight)
{
// matches owner wxComboCtrl's width
// and sets height dinamically in dependence of contained items count
// set width dinamically in dependence of items text
// and set height dinamically in dependence of items count
wxComboCtrl* cmb = GetComboCtrl();
if (cmb != nullptr)
@@ -207,7 +207,15 @@ wxSize wxCheckListBoxComboPopup::GetAdjustedSize(int minWidth, int prefHeight, i
unsigned int count = GetCount();
if (count > 0)
size.SetHeight(count * DefaultItemHeight);
{
int max_width = size.x;
for (unsigned int i = 0; i < count; ++i)
{
max_width = std::max(max_width, 60 + GetTextExtent(GetString(i)).x);
}
size.SetWidth(max_width);
size.SetHeight(count * GetTextExtent(GetString(0)).y);
}
else
size.SetHeight(DefaultHeight);