3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 04:31:15 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Plater: Fix on_notebook_changed

Browse source
This commit is contained in:
Vojtech Kral 2018-11-19 11:54:34 +01:00
parent b950e9e575
commit b1228537d2
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/Plater.cpp
View file

@ -882,7 +882,7 @@ struct Plater::priv
// GUI elements // GUI elements
wxNotebook *notebook; wxNotebook *notebook;
Sidebar *sidebar; Sidebar *sidebar;
wxWindow *panel3d; wxPanel *panel3d;
wxGLCanvas *canvas3D; // TODO: Use GLCanvas3D when we can wxGLCanvas *canvas3D; // TODO: Use GLCanvas3D when we can
Preview *preview; Preview *preview;
@ -1000,7 +1000,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
})) }))
, notebook(new wxNotebook(q, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM)) , notebook(new wxNotebook(q, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxNB_BOTTOM))
, sidebar(new Sidebar(q)) , sidebar(new Sidebar(q))
, panel3d(new wxWindow(notebook, wxID_ANY)) , panel3d(new wxPanel(notebook, wxID_ANY))
, canvas3D(GLCanvas3DManager::create_wxglcanvas(panel3d)) , canvas3D(GLCanvas3DManager::create_wxglcanvas(panel3d))
#if ENABLE_NEW_MENU_LAYOUT #if ENABLE_NEW_MENU_LAYOUT
, project_filename(wxEmptyString) , project_filename(wxEmptyString)
@ -1819,7 +1819,7 @@ void Plater::priv::fix_through_netfabb(const int obj_idx)
void Plater::priv::on_notebook_changed(wxBookCtrlEvent&) void Plater::priv::on_notebook_changed(wxBookCtrlEvent&)
{ {
const auto current_id = notebook->GetCurrentPage()->GetId(); const auto current_id = notebook->GetCurrentPage()->GetId();
if (current_id == canvas3D->GetId()) { if (current_id == panel3d->GetId()) {
if (_3DScene::is_reload_delayed(canvas3D)) { if (_3DScene::is_reload_delayed(canvas3D)) {
// Delayed loading of the 3D scene. // Delayed loading of the 3D scene.
if (this->printer_technology == ptSLA) { if (this->printer_technology == ptSLA) {