3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed object_list layouts

Browse source
This commit is contained in:
YuSanka 2018-12-21 14:40:25 +01:00
parent 26959d0cde
commit 0fd20d4cdc
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/slic3r/GUI/GUI_App.cpp
View file

@ -143,7 +143,7 @@ bool GUI_App::OnInit()
wxImage::AddHandler(new wxPNGHandler()); wxImage::AddHandler(new wxPNGHandler());
mainframe = new MainFrame(); mainframe = new MainFrame();
sidebar().obj_list()->init_objects(); // propagate model objects to object list sidebar().obj_list()->init_objects(); // propagate model objects to object list
update_mode(); // update_mode(); // do that later
SetTopWindow(mainframe); SetTopWindow(mainframe);
m_printhost_job_queue.reset(new PrintHostJobQueue(mainframe->printhost_queue_dlg())); m_printhost_job_queue.reset(new PrintHostJobQueue(mainframe->printhost_queue_dlg()));
@ -154,8 +154,10 @@ bool GUI_App::OnInit()
if (panel.obj_list()->GetMinHeight() > 200) { if (panel.obj_list()->GetMinHeight() > 200) {
wxWindowUpdateLocker noUpdates_sidebar(&panel); wxWindowUpdateLocker noUpdates_sidebar(&panel);
panel.obj_list()->SetMinSize(wxSize(-1, 200)); panel.obj_list()->SetMinSize(wxSize(-1, 200));
panel.Layout(); // panel.Layout();
} }
update_mode(); // update view mode after fix of the object_list size
// to correct later layouts
}); });
// This makes CallAfter() work // This makes CallAfter() work
@ -287,8 +289,7 @@ void GUI_App::recreate_GUI()
MainFrame* topwindow = dynamic_cast<MainFrame*>(GetTopWindow()); MainFrame* topwindow = dynamic_cast<MainFrame*>(GetTopWindow());
mainframe = new MainFrame(); mainframe = new MainFrame();
sidebar().obj_list()->init_objects(); // propagate model objects to object list sidebar().obj_list()->init_objects(); // propagate model objects to object list
update_mode(); // update_mode(); // do that later
if (topwindow) { if (topwindow) {
SetTopWindow(mainframe); SetTopWindow(mainframe);
topwindow->Destroy(); topwindow->Destroy();
@ -302,8 +303,10 @@ void GUI_App::recreate_GUI()
if (panel.obj_list()->GetMinHeight() > 200) { if (panel.obj_list()->GetMinHeight() > 200) {
wxWindowUpdateLocker noUpdates_sidebar(&panel); wxWindowUpdateLocker noUpdates_sidebar(&panel);
panel.obj_list()->SetMinSize(wxSize(-1, 200)); panel.obj_list()->SetMinSize(wxSize(-1, 200));
panel.Layout(); // panel.Layout();
} }
update_mode(); // update view mode after fix of the object_list size
// to correct later layouts
}); });
mainframe->Show(true); mainframe->Show(true);