mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 00:37:51 -06:00
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
This commit is contained in:
commit
8b85e09062
26 changed files with 3610 additions and 3669 deletions
|
@ -30,9 +30,6 @@ namespace GUI {
|
|||
View3D::View3D(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_toolbar, Model* model, DynamicPrintConfig* config, BackgroundSlicingProcess* process)
|
||||
: m_canvas_widget(nullptr)
|
||||
, m_canvas(nullptr)
|
||||
#if !ENABLE_IMGUI
|
||||
, m_gizmo_widget(nullptr)
|
||||
#endif // !ENABLE_IMGUI
|
||||
{
|
||||
init(parent, bed, camera, view_toolbar, model, config, process);
|
||||
}
|
||||
|
@ -67,17 +64,8 @@ bool View3D::init(wxWindow* parent, Bed3D& bed, Camera& camera, GLToolbar& view_
|
|||
m_canvas->enable_gizmos(true);
|
||||
m_canvas->enable_toolbar(true);
|
||||
|
||||
#if !ENABLE_IMGUI
|
||||
m_gizmo_widget = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize);
|
||||
m_gizmo_widget->SetSizer(new wxBoxSizer(wxVERTICAL));
|
||||
m_canvas->set_external_gizmo_widgets_parent(m_gizmo_widget);
|
||||
#endif // !ENABLE_IMGUI
|
||||
|
||||
wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL);
|
||||
main_sizer->Add(m_canvas_widget, 1, wxALL | wxEXPAND, 0);
|
||||
#if !ENABLE_IMGUI
|
||||
main_sizer->Add(m_gizmo_widget, 0, wxALL | wxEXPAND, 0);
|
||||
#endif // !ENABLE_IMGUI
|
||||
|
||||
SetSizer(main_sizer);
|
||||
SetMinSize(GetSize());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue