From 85676af17131eebebd61ed747d7827d2411bb9e0 Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Sat, 25 Apr 2020 10:36:51 +0200
Subject: [PATCH] Modified wxCheckListBoxComboPopup::GetAdjustedSize() and
 create_combochecklist() to size the combo control taking in account the items
 width

---
 src/slic3r/GUI/GUI.cpp          |  6 ++++++
 src/slic3r/GUI/wxExtensions.cpp | 14 +++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp
index dd9ddcab8..a66396b27 100644
--- a/src/slic3r/GUI/GUI.cpp
+++ b/src/slic3r/GUI/GUI.cpp
@@ -271,9 +271,12 @@ void create_combochecklist(wxComboCtrl* comboCtrl, const std::string& text, cons
         //  On the other side, with this line the combo box popup cannot be closed by clicking on the combo button on Windows 10.
         comboCtrl->UseAltPopupWindow();
 
+		int max_width = 0;
+
         comboCtrl->EnablePopupAnimation(false);
         comboCtrl->SetPopupControl(popup);
 		wxString title = from_u8(text);
+		max_width = std::max(max_width, 60 + comboCtrl->GetTextExtent(title).x);
 		popup->SetStringValue(title);
 		popup->Bind(wxEVT_CHECKLISTBOX, [popup](wxCommandEvent& evt) { popup->OnCheckListBox(evt); });
         popup->Bind(wxEVT_LISTBOX, [popup](wxCommandEvent& evt) { popup->OnListBoxSelection(evt); });
@@ -289,9 +292,12 @@ void create_combochecklist(wxComboCtrl* comboCtrl, const std::string& text, cons
 		for (size_t i = 0; i < items_str.size(); i += 2)
 		{
 			wxString label = from_u8(items_str[i]);
+			max_width = std::max(max_width, 60 + popup->GetTextExtent(label).x);
 			popup->Append(label);
 			popup->Check(i / 2, items_str[i + 1] == "1");
 		}
+
+		comboCtrl->SetMinClientSize(wxSize(max_width, -1));
 	}
 }
 
diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp
index b3f279196..3e55f6ae3 100644
--- a/src/slic3r/GUI/wxExtensions.cpp
+++ b/src/slic3r/GUI/wxExtensions.cpp
@@ -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);