From d7412d4e54c9339300ac8ff5175c70278fd0d55e Mon Sep 17 00:00:00 2001
From: YuSanka <yusanka@gmail.com>
Date: Tue, 8 Dec 2020 10:11:11 +0100
Subject: [PATCH] Increase min height for the ObjectList. Related to the FR
 #5162

---
 src/slic3r/GUI/GUI_App.cpp        | 17 +++--------------
 src/slic3r/GUI/GUI_ObjectList.cpp | 12 ++++++++++++
 src/slic3r/GUI/GUI_ObjectList.hpp |  1 +
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 74e6d3746..f2827be40 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -933,13 +933,7 @@ bool GUI_App::on_init_inner()
         load_current_presets();
     mainframe->Show(true);
 
-    /* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
-     * change min hight of object list to the normal min value (15 * wxGetApp().em_unit()) 
-     * after first whole Mainframe updating/layouting
-     */
-    const int list_min_height = 15 * em_unit();
-    if (obj_list()->GetMinSize().GetY() > list_min_height)
-        obj_list()->SetMinSize(wxSize(-1, list_min_height));
+    obj_list()->set_min_height();
 
     update_mode(); // update view mode after fix of the object_list size
 
@@ -1150,13 +1144,8 @@ void GUI_App::recreate_GUI(const wxString& msg_name)
     mainframe->Show(true);
 
     dlg.Update(90, _L("Loading of a mode view") + dots);
-    /* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
-    * change min hight of object list to the normal min value (15 * wxGetApp().em_unit())
-    * after first whole Mainframe updating/layouting
-    */
-    const int list_min_height = 15 * em_unit();
-    if (obj_list()->GetMinSize().GetY() > list_min_height)
-        obj_list()->SetMinSize(wxSize(-1, list_min_height));
+
+    obj_list()->set_min_height();
     update_mode();
 
     // #ys_FIXME_delete_after_testing  Do we still need this  ?
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index d9adcf60b..576202594 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -258,6 +258,18 @@ ObjectList::~ObjectList()
 {
 }
 
+void ObjectList::set_min_height()
+{
+    /* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
+    * change min hight of object list to the normal min value (35 * wxGetApp().em_unit())
+    * after first whole Mainframe updating/layouting
+    */
+    const int list_min_height = 35 * wxGetApp().em_unit();
+    if (this->GetMinSize().GetY() > list_min_height)
+        this->SetMinSize(wxSize(-1, list_min_height));
+}
+
+
 void ObjectList::create_objects_ctrl()
 {
     /* Temporary workaround for the correct behavior of the Scrolled sidebar panel:
diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp
index 011da676d..aaea78339 100644
--- a/src/slic3r/GUI/GUI_ObjectList.hpp
+++ b/src/slic3r/GUI/GUI_ObjectList.hpp
@@ -207,6 +207,7 @@ public:
     ObjectList(wxWindow* parent);
     ~ObjectList();
 
+    void set_min_height();
 
     std::map<std::string, wxBitmap> CATEGORY_ICON;