diff options
| author | Vojtech Kral <vojtech@kral.hk> | 2019-02-12 16:45:56 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2019-02-12 17:30:42 +0300 |
| commit | 4e18af8453999f87c640e24457281d0feb84c88b (patch) | |
| tree | 3cba291d9c129723288fd3841680b3277d0b666b | |
| parent | 4917cb0f3532ddbe95202aa62e79eccb30fbedfe (diff) | |
ConfigWizard: Fix a wrapping issue on Macversion_1.41.3
| -rw-r--r-- | xs/src/slic3r/GUI/ConfigWizard.cpp | 4 | ||||
| -rw-r--r-- | xs/src/slic3r/GUI/ConfigWizard_private.hpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xs/src/slic3r/GUI/ConfigWizard.cpp b/xs/src/slic3r/GUI/ConfigWizard.cpp index 3fd124bab..d29bd51f1 100644 --- a/xs/src/slic3r/GUI/ConfigWizard.cpp +++ b/xs/src/slic3r/GUI/ConfigWizard.cpp @@ -264,7 +264,7 @@ void ConfigWizardPage::append_text(wxString text) { auto *widget = new wxStaticText(this, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT); widget->Wrap(WRAP_WIDTH); - widget->SetMinSize(wxSize(WRAP_WIDTH, -1)); + widget->SetMinSize(wxSize(WRAP_WIDTH, MIN_HEIGHT)); append(widget); } @@ -283,7 +283,7 @@ PageWelcome::PageWelcome(ConfigWizard *parent) if (wizard_p()->run_reason == ConfigWizard::RR_DATA_EMPTY) { wxString::Format(_(L("Run %s")), ConfigWizard::name()); append_text(wxString::Format( - _(L("Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print.")), + _(L("Hello, welcome to Slic3r Prusa Edition!\nThis %s helps you with the initial configuration; just a few settings and you will be ready to print.")), ConfigWizard::name()) ); } else { diff --git a/xs/src/slic3r/GUI/ConfigWizard_private.hpp b/xs/src/slic3r/GUI/ConfigWizard_private.hpp index d63b6e8b7..212db310c 100644 --- a/xs/src/slic3r/GUI/ConfigWizard_private.hpp +++ b/xs/src/slic3r/GUI/ConfigWizard_private.hpp @@ -30,6 +30,7 @@ namespace GUI { enum { WRAP_WIDTH = 500, + MIN_HEIGHT = 150, MODEL_MIN_WRAP = 150, DIALOG_MARGIN = 15, |