GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 13:35:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Start to set up the internal sizer as a wxFlexGridSizer

Browse Source
This commit is contained in:
Joseph Lenox 2018-11-18 11:39:29 -06:00 committed by Joseph Lenox
parent c5e9ee9a46
commit 378330d747
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/GUI/Plater/PresetChooser.cpp
View File

@ -6,8 +6,11 @@ PresetChooser::PresetChooser(wxWindow* parent, Print& print) : PresetChooser(par
PresetChooser::PresetChooser(wxWindow* parent, Print& print, Settings& external_settings, preset_store& external_presets) : PresetChooser::PresetChooser(wxWindow* parent, Print& print, Settings& external_settings, preset_store& external_presets) :
wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, ""), wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL, ""),
_settings(external_settings), _print(print), _presets(external_presets) _local_sizer(new wxFlexGridSizer(3,3,1,2)), _parent(parent), _settings(external_settings), _print(print), _presets(external_presets)
{ {
_local_sizer->AddGrowableCol(1, 1);
_local_sizer->SetFlexibleDirection(wxHORIZONTAL);
for (auto group : { preset_t::Print, preset_t::Material, preset_t::Printer }) { for (auto group : { preset_t::Print, preset_t::Material, preset_t::Printer }) {
wxString name = ""; wxString name = "";
switch(group) { switch(group) {
@ -36,6 +39,8 @@ PresetChooser::PresetChooser(wxWindow* parent, Print& print, Settings& external_
wxTheApp->CallAfter([=]() { this->_on_change_combobox(group, choice);} ); wxTheApp->CallAfter([=]() { this->_on_change_combobox(group, choice);} );
}); });
} }
this->SetSizer(_local_sizer);
} }
void PresetChooser::load(std::array<Presets, preset_types> presets) { void PresetChooser::load(std::array<Presets, preset_types> presets) {

2
src/GUI/Plater/PresetChooser.hpp
View File

@ -64,7 +64,7 @@ public:
/// Cycle through active presets and prompt user to save dirty configs, if necessary. /// Cycle through active presets and prompt user to save dirty configs, if necessary.
bool prompt_unsaved_changes(); bool prompt_unsaved_changes();
private: private:
wxSizer* local_sizer {}; wxFlexGridSizer* _local_sizer {};
void _on_change_combobox(preset_t preset, wxBitmapComboBox* choice); void _on_change_combobox(preset_t preset, wxBitmapComboBox* choice);
chooser_name_map __chooser_names; chooser_name_map __chooser_names;