GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-09 01:29:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENABLE_LAYOUT_NO_RESTART -> Refactoring of MainFrame::update_layout()

Browse Source
This commit is contained in:
enricoturri1966 2020-06-12 12:35:17 +02:00
parent 42a8a4aa77
commit 04514f009e
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/slic3r/GUI/MainFrame.cpp
View File

@ -251,19 +251,21 @@ void MainFrame::update_layout()
if (m_layout == ESettingsLayout::Old) { if (m_layout == ESettingsLayout::Old) {
m_plater->Reparent(this); m_plater->Reparent(this);
m_tabpanel->RemovePage(m_tabpanel->FindPage(m_plater)); m_tabpanel->RemovePage(m_tabpanel->FindPage(m_plater));
GetSizer()->Hide(m_tabpanel);
GetSizer()->Detach(m_tabpanel); GetSizer()->Detach(m_tabpanel);
} } else {
else { GetSizer()->Hide(m_plater);
GetSizer()->Detach(m_plater);
if (m_layout == ESettingsLayout::New) { if (m_layout == ESettingsLayout::New) {
GetSizer()->Detach(m_plater); GetSizer()->Hide(m_tabpanel);
GetSizer()->Detach(m_tabpanel); GetSizer()->Detach(m_tabpanel);
m_tabpanel->DeletePage(m_tabpanel->FindPage(m_plater_page)); m_tabpanel->DeletePage(m_tabpanel->FindPage(m_plater_page));
} m_plater_page = nullptr;
else { } else {
if (m_settings_dialog.IsShown()) if (m_settings_dialog.IsShown())
m_settings_dialog.Close(); m_settings_dialog.Close();
GetSizer()->Detach(m_plater); m_settings_dialog.GetSizer()->Hide(m_tabpanel);
m_settings_dialog.GetSizer()->Detach(m_tabpanel); m_settings_dialog.GetSizer()->Detach(m_tabpanel);
m_tabpanel->Reparent(this); m_tabpanel->Reparent(this);
} }
@ -280,36 +282,35 @@ void MainFrame::update_layout()
m_plater->Reparent(m_tabpanel); m_plater->Reparent(m_tabpanel);
m_tabpanel->InsertPage(0, m_plater, _L("Plater")); m_tabpanel->InsertPage(0, m_plater, _L("Plater"));
GetSizer()->Add(m_tabpanel, 1, wxEXPAND); GetSizer()->Add(m_tabpanel, 1, wxEXPAND);
m_tabpanel->Show(); GetSizer()->Show(m_tabpanel);
} } else {
else { GetSizer()->Add(m_plater, 1, wxEXPAND);
GetSizer()->Show(m_plater);
if (m_layout == ESettingsLayout::New) { if (m_layout == ESettingsLayout::New) {
GetSizer()->Add(m_plater, 1, wxEXPAND);
GetSizer()->Add(m_tabpanel, 1, wxEXPAND); GetSizer()->Add(m_tabpanel, 1, wxEXPAND);
GetSizer()->Hide(m_tabpanel);
m_plater_page = new wxPanel(m_tabpanel); m_plater_page = new wxPanel(m_tabpanel);
m_tabpanel->InsertPage(0, m_plater_page, _L("Plater")); // empty panel just for Plater tab */ m_tabpanel->InsertPage(0, m_plater_page, _L("Plater")); // empty panel just for Plater tab */
} } else {
else {
GetSizer()->Add(m_plater, 1, wxEXPAND);
m_plater->Show();
m_tabpanel->Reparent(&m_settings_dialog); m_tabpanel->Reparent(&m_settings_dialog);
m_settings_dialog.GetSizer()->Add(m_tabpanel, 1, wxEXPAND); m_settings_dialog.GetSizer()->Add(m_tabpanel, 1, wxEXPAND);
m_settings_dialog.GetSizer()->Show(m_tabpanel);
} }
} }
#ifdef __APPLE__ //#ifdef __APPLE__
// Using SetMinSize() on Mac messes up the window position in some cases // // Using SetMinSize() on Mac messes up the window position in some cases
// cf. https://groups.google.com/forum/#!topic/wx-users/yUKPBBfXWO0 // // cf. https://groups.google.com/forum/#!topic/wx-users/yUKPBBfXWO0
// So, if we haven't possibility to set MinSize() for the MainFrame, // // So, if we haven't possibility to set MinSize() for the MainFrame,
// set the MinSize() as a half of regular for the m_plater and m_tabpanel, when settings layout is in slNew mode // // set the MinSize() as a half of regular for the m_plater and m_tabpanel, when settings layout is in slNew mode
// Otherwise, MainFrame will be maximized by height // // Otherwise, MainFrame will be maximized by height
if (m_layout == ESettingsLayout::New) { // if (m_layout == ESettingsLayout::New) {
wxSize size = wxGetApp().get_min_size(); // wxSize size = wxGetApp().get_min_size();
size.SetHeight(int(0.5 * size.GetHeight())); // size.SetHeight(int(0.5 * size.GetHeight()));
m_plater->SetMinSize(size); // m_plater->SetMinSize(size);
m_tabpanel->SetMinSize(size); // m_tabpanel->SetMinSize(size);
} // }
#endif //#endif
Layout(); Layout();
Thaw(); Thaw();
@ -455,7 +456,7 @@ void MainFrame::init_tabpanel()
Tab* tab = dynamic_cast<Tab*>(panel); Tab* tab = dynamic_cast<Tab*>(panel);
// There shouldn't be a case, when we try to select a tab, which doesn't support a printer technology // There shouldn't be a case, when we try to select a tab, which doesn't support a printer technology
if (panel == nullptr || (tab && ! tab->supports_printer_technology(m_plater->printer_technology()))) if (panel == nullptr || (tab != nullptr && !tab->supports_printer_technology(m_plater->printer_technology())))
return; return;
auto& tabs_list = wxGetApp().tabs_list; auto& tabs_list = wxGetApp().tabs_list;
@ -1501,8 +1502,13 @@ void MainFrame::select_tab(size_t tab/* = size_t(-1)*/)
#else #else
else if (m_layout == slNew) { else if (m_layout == slNew) {
#endif // ENABLE_LAYOUT_NO_RESTART #endif // ENABLE_LAYOUT_NO_RESTART
#if ENABLE_LAYOUT_NO_RESTART
GetSizer()->Show(m_plater, tab == 0);
GetSizer()->Show(m_tabpanel, tab != 0);
#else
m_plater->Show(tab == 0); m_plater->Show(tab == 0);
m_tabpanel->Show(tab != 0); m_tabpanel->Show(tab != 0);
#endif // ENABLE_LAYOUT_NO_RESTART
// plater should be focused for correct navigation inside search window // plater should be focused for correct navigation inside search window
if (tab == 0 && m_plater->canvas3D()->is_search_pressed()) if (tab == 0 && m_plater->canvas3D()->is_search_pressed())
@ -1510,7 +1516,7 @@ void MainFrame::select_tab(size_t tab/* = size_t(-1)*/)
Layout(); Layout();
} }
// when tab == -1, it means we should to show the last selected tab // when tab == -1, it means we should show the last selected tab
#if ENABLE_LAYOUT_NO_RESTART #if ENABLE_LAYOUT_NO_RESTART
m_tabpanel->SetSelection(tab == (size_t)(-1) ? m_last_selected_tab : (m_layout == ESettingsLayout::Dlg && tab != 0) ? tab - 1 : tab); m_tabpanel->SetSelection(tab == (size_t)(-1) ? m_last_selected_tab : (m_layout == ESettingsLayout::Dlg && tab != 0) ? tab - 1 : tab);
#else #else
@ -1721,13 +1727,7 @@ SettingsDialog::SettingsDialog(MainFrame* mainframe)
SetMinSize(min_size); SetMinSize(min_size);
SetSize(GetMinSize()); SetSize(GetMinSize());
#endif #endif
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
//#if !ENABLE_LAYOUT_NO_RESTART
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
Layout(); Layout();
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
//#endif // !ENABLE_LAYOUT_NO_RESTART
//@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
} }
void SettingsDialog::on_dpi_changed(const wxRect& suggested_rect) void SettingsDialog::on_dpi_changed(const wxRect& suggested_rect)