3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix CheckboxFileDialog, for real this time (I hope)

Browse source
This commit is contained in:
Vojtech Kral 2018-10-19 15:12:38 +02:00
parent b6251dd85b
commit ec0c65a80a
2 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
src/slic3r/GUI/GUI_Utils.cpp
View file

@ -6,7 +6,6 @@
#include <wx/toplevel.h> #include <wx/toplevel.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/panel.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include "libslic3r/Config.hpp" #include "libslic3r/Config.hpp"
@ -16,6 +15,29 @@ namespace Slic3r {
namespace GUI { namespace GUI {
CheckboxFileDialog::ExtraPanel::ExtraPanel(wxWindow *parent)
: wxPanel(parent, wxID_ANY)
{
// WARN: wxMSW does some extra shenanigans to calc the extra control size.
// It first calls the create function with a dummy empty wxDialog parent and saves its size.
// Afterwards, the create function is called again with the real parent.
// Additionally there's no way to pass any extra data to the create function (no closure),
// which is why we have to this stuff here. Grrr!
auto *dlg = dynamic_cast<CheckboxFileDialog*>(parent);
const wxString checkbox_label(dlg != nullptr ? dlg->checkbox_label : wxString());
auto* sizer = new wxBoxSizer(wxHORIZONTAL);
cbox = new wxCheckBox(this, wxID_ANY, checkbox_label);
sizer->AddSpacer(5);
sizer->Add(this->cbox, 0, wxEXPAND | wxALL, 5);
SetSizer(sizer);
sizer->SetSizeHints(this);
}
wxWindow* CheckboxFileDialog::ExtraPanel::ctor(wxWindow *parent) {
return new ExtraPanel(parent);
}
CheckboxFileDialog::CheckboxFileDialog(wxWindow *parent, CheckboxFileDialog::CheckboxFileDialog(wxWindow *parent,
const wxString &checkbox_label, const wxString &checkbox_label,
bool checkbox_value, bool checkbox_value,
@ -29,37 +51,19 @@ CheckboxFileDialog::CheckboxFileDialog(wxWindow *parent,
const wxString &name const wxString &name
) )
: wxFileDialog(parent, message, default_dir, default_file, wildcard, style, pos, size, name) : wxFileDialog(parent, message, default_dir, default_file, wildcard, style, pos, size, name)
, cbox(nullptr) , checkbox_label(checkbox_label)
{ {
if (checkbox_label.IsEmpty()) { if (checkbox_label.IsEmpty()) {
return; return;
} }
extra_control_creator = [this, checkbox_label](wxWindow *parent) -> wxWindow* { SetExtraControlCreator(ExtraPanel::ctor);
wxPanel* panel = new wxPanel(parent, -1);
wxSizer* sizer = new wxBoxSizer(wxHORIZONTAL);
this->cbox = new wxCheckBox(panel, wxID_HIGHEST + 1, checkbox_label);
this->cbox->SetValue(true);
sizer->AddSpacer(5);
sizer->Add(this->cbox, 0, wxEXPAND | wxALL | wxALIGN_CENTER_VERTICAL, 5);
panel->SetSizer(sizer);
sizer->SetSizeHints(panel);
return panel;
};
SetExtraControlCreator(control_creator_trampoline);
} }
bool CheckboxFileDialog::get_checkbox_value() const bool CheckboxFileDialog::get_checkbox_value() const
{ {
return this->cbox != nullptr ? cbox->IsChecked() : false; auto *extra_panel = dynamic_cast<ExtraPanel*>(GetExtraControl());
} return extra_panel != nullptr ? extra_panel->cbox->GetValue() : false;
wxWindow* CheckboxFileDialog::control_creator_trampoline(wxWindow *parent)
{
auto *self = dynamic_cast<CheckboxFileDialog*>(parent);
return self != nullptr ? self->extra_control_creator(parent) : nullptr;
} }

12
src/slic3r/GUI/GUI_Utils.hpp
View file

@ -8,6 +8,7 @@
#include <wx/filedlg.h> #include <wx/filedlg.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/panel.h>
class wxCheckBox; class wxCheckBox;
class wxTopLevelWindow; class wxTopLevelWindow;
@ -37,10 +38,15 @@ public:
bool get_checkbox_value() const; bool get_checkbox_value() const;
private: private:
std::function<wxWindow*(wxWindow*)> extra_control_creator; struct ExtraPanel : public wxPanel
wxCheckBox *cbox; {
wxCheckBox *cbox;
static wxWindow* control_creator_trampoline(wxWindow *); ExtraPanel(wxWindow *parent);
static wxWindow* ctor(wxWindow *parent);
};
wxString checkbox_label;
}; };