From 59af3c8a86554ed934033c89800d106b74bbe64a Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Mon, 7 May 2018 21:24:08 -0500 Subject: [PATCH] Stub out more of the sizers so people implementing can see their work immediately. --- src/GUI/Plater.cpp | 25 +++++++++++++++++++++++++ src/GUI/Plater.hpp | 4 ++++ 2 files changed, 29 insertions(+) diff --git a/src/GUI/Plater.cpp b/src/GUI/Plater.cpp index ecee4435a..70c6b7010 100644 --- a/src/GUI/Plater.cpp +++ b/src/GUI/Plater.cpp @@ -111,6 +111,31 @@ Plater::Plater(wxWindow* parent, const wxString& title, std::shared_ptrright_sizer; +// $right_sizer->Add($presets, 0, wxEXPAND | wxTOP, 10) if defined $presets; +// $right_sizer->Add($buttons_sizer, 0, wxEXPAND | wxBOTTOM, 5); +// $right_sizer->Add($self->{settings_override_panel}, 1, wxEXPAND, 5); +// $right_sizer->Add($object_info_sizer, 0, wxEXPAND, 0); +// $right_sizer->Add($print_info_sizer, 0, wxEXPAND, 0); +// $right_sizer->Hide($print_info_sizer); + + auto hsizer {new wxBoxSizer(wxHORIZONTAL)}; + hsizer->Add(this->preview_notebook, 1, wxEXPAND | wxTOP, 1); + hsizer->Add(right_sizer, 0, wxEXPAND | wxLEFT | wxRIGHT, 3); + + auto sizer {new wxBoxSizer(wxVERTICAL)}; + if (this->htoolbar != nullptr) sizer->Add(this->htoolbar, 0, wxEXPAND, 0); + if (this->btoolbar != nullptr) sizer->Add(this->btoolbar, 0, wxEXPAND, 0); + sizer->Add(hsizer, 1, wxEXPAND,0); + + sizer->SetSizeHints(this); + this->SetSizer(sizer); + } void Plater::add() { Log::info(LogChannel, L"Called Add function"); diff --git a/src/GUI/Plater.hpp b/src/GUI/Plater.hpp index 8e47b0a7d..9e86eb265 100644 --- a/src/GUI/Plater.hpp +++ b/src/GUI/Plater.hpp @@ -59,6 +59,10 @@ private: std::stack redo {}; wxNotebook* preview_notebook {new wxNotebook(this, -1, wxDefaultPosition, wxSize(335,335), wxNB_BOTTOM)}; + wxBoxSizer* right_sizer {new wxBoxSizer(wxVERTICAL)}; + + wxToolBar* htoolbar {nullptr}; //< toolbar for non-MSW platforms. + wxBoxSizer* btoolbar {nullptr}; //< button-based toolbar for Windows Plate2D* canvas2D {nullptr}; //< 2D plater canvas Plate3D* canvas3D {nullptr}; //< 3D plater canvas