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

FirmwareDialog: Fix dialog resizing

Browse Source
This commit is contained in:
Vojtech Kral 2018-07-30 14:51:49 +02:00 committed by bubnikv
parent b6d70f5fe8
commit 675e4cfd24
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xs/src/slic3r/GUI/FirmwareDialog.cpp
View File

@ -190,11 +190,13 @@ void FirmwareDialog::priv::find_serial_ports()
void FirmwareDialog::priv::fit_no_shrink() void FirmwareDialog::priv::fit_no_shrink()
{ {
// Ensure content fits into window and window is not shrinked // Ensure content fits into window and window is not shrinked
auto old_size = q->GetSize(); const auto old_size = q->GetSize();
q->Layout(); q->Layout();
q->Fit(); q->Fit();
auto new_size = q->GetSize(); const auto new_size = q->GetSize();
q->SetSize(std::max(old_size.GetWidth(), new_size.GetWidth()), std::max(old_size.GetHeight(), new_size.GetHeight())); const auto new_width = std::max(old_size.GetWidth(), new_size.GetWidth());
const auto new_height = std::max(old_size.GetHeight(), new_size.GetHeight());
q->SetSize(new_width, new_height);
} }
void FirmwareDialog::priv::set_txt_status(const wxString &label) void FirmwareDialog::priv::set_txt_status(const wxString &label)
@ -734,7 +736,7 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
vsizer->Add(grid, 0, wxEXPAND | wxTOP | wxBOTTOM, SPACING); vsizer->Add(grid, 0, wxEXPAND | wxTOP | wxBOTTOM, SPACING);
p->spoiler = new wxCollapsiblePane(panel, wxID_ANY, _(L("Advanced: avrdude output log"))); p->spoiler = new wxCollapsiblePane(panel, wxID_ANY, _(L("Advanced: avrdude output log")), wxDefaultPosition, wxDefaultSize, wxCP_DEFAULT_STYLE | wxCP_NO_TLW_RESIZE);
auto *spoiler_pane = p->spoiler->GetPane(); auto *spoiler_pane = p->spoiler->GetPane();
auto *spoiler_sizer = new wxBoxSizer(wxVERTICAL); auto *spoiler_sizer = new wxBoxSizer(wxVERTICAL);
p->txt_stdout = new wxTextCtrl(spoiler_pane, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY); p->txt_stdout = new wxTextCtrl(spoiler_pane, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);
@ -772,14 +774,16 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
}); });
p->spoiler->Bind(wxEVT_COLLAPSIBLEPANE_CHANGED, [this](wxCollapsiblePaneEvent &evt) { p->spoiler->Bind(wxEVT_COLLAPSIBLEPANE_CHANGED, [this](wxCollapsiblePaneEvent &evt) {
// Dialog size gets screwed up by wxCollapsiblePane, we need to fix it here
if (evt.GetCollapsed()) { if (evt.GetCollapsed()) {
this->SetMinSize(wxSize(MIN_WIDTH, MIN_HEIGHT)); this->SetMinSize(wxSize(MIN_WIDTH, MIN_HEIGHT));
const auto new_height = this->GetSize().GetHeight() - this->p->txt_stdout->GetSize().GetHeight();
this->SetSize(this->GetSize().GetWidth(), new_height);
} else { } else {
this->SetMinSize(wxSize(MIN_WIDTH, MIN_HEIGHT_EXPANDED)); this->SetMinSize(wxSize(MIN_WIDTH, MIN_HEIGHT_EXPANDED));
} }
this->Layout(); this->Layout();
this->p->fit_no_shrink();
}); });
p->btn_close->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { this->Close(); }); p->btn_close->Bind(wxEVT_BUTTON, [this](wxCommandEvent &) { this->Close(); });
@ -793,11 +797,9 @@ FirmwareDialog::FirmwareDialog(wxWindow *parent) :
_(L("Confirmation")), _(L("Confirmation")),
wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION); wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION);
if (dlg.ShowModal() == wxID_YES) { if (dlg.ShowModal() == wxID_YES) {
if (this->p->avrdude) {
this->p->set_txt_status(_(L("Cancelling..."))); this->p->set_txt_status(_(L("Cancelling...")));
this->p->user_cancel(); this->p->user_cancel();
} }
}
} else { } else {
// Start a flashing task // Start a flashing task
this->p->perform_upload(); this->p->perform_upload();