From 9522cd1d4f255aac752da1640a874e2a3e04ab4e Mon Sep 17 00:00:00 2001
From: Vojtech Kral <vojtech@kral.hk>
Date: Mon, 11 Mar 2019 11:49:24 +0100
Subject: [PATCH] OnInit: Move preset loading out of EVT_IDLE/once, remove temp
workaround of sidebar scrollbar
---
src/slic3r/GUI/GUI_App.cpp | 16 +++-------------
src/slic3r/GUI/GUI_ObjectList.cpp | 5 +----
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
index 73ff19a9d..afbf6b568 100644
--- a/src/slic3r/GUI/GUI_App.cpp
+++ b/src/slic3r/GUI/GUI_App.cpp
@@ -167,17 +167,6 @@ bool GUI_App::OnInit()
if (app_config->dirty() && app_config->get("autosave") == "1")
app_config->save();
- // ! Temporary workaround for the correct behavior of the Scrolled sidebar panel
- // Do this "manipulations" only once ( after (re)create of the application )
- if (sidebar().obj_list()->GetMinHeight() > 15 * wxGetApp().em_unit())
- {
- wxWindowUpdateLocker noUpdates_sidebar(&sidebar());
- sidebar().obj_list()->SetMinSize(wxSize(-1, 15 * wxGetApp().em_unit()));
-
- // !!! to correct later layouts
- update_mode(); // update view mode after fix of the object_list size
- }
-
this->obj_manipul()->update_if_dirty();
// Preset updating & Configwizard are done after the above initializations,
@@ -205,11 +194,12 @@ bool GUI_App::OnInit()
}
preset_updater->sync(preset_bundle);
});
-
- load_current_presets();
}
});
+ load_current_presets();
+ update_mode(); // update view mode after fix of the object_list size
+
mainframe->Show(true);
m_initialized = true;
return true;
diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp
index eb3744bef..6a605a667 100644
--- a/src/slic3r/GUI/GUI_ObjectList.cpp
+++ b/src/slic3r/GUI/GUI_ObjectList.cpp
@@ -115,10 +115,7 @@ ObjectList::~ObjectList()
void ObjectList::create_objects_ctrl()
{
- // temporary workaround for the correct behavior of the Scrolled sidebar panel:
- // 1. set a height of the list to some big value
- // 2. change it to the normal min value (200) after first whole App updating/layouting
- SetMinSize(wxSize(-1, 3000)); // #ys_FIXME
+ SetMinSize(wxSize(-1, 15 * wxGetApp().em_unit()));
m_sizer = new wxBoxSizer(wxVERTICAL);
m_sizer->Add(this, 1, wxGROW);