From 4e18af8453999f87c640e24457281d0feb84c88b Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Tue, 12 Feb 2019 14:45:56 +0100 Subject: [PATCH] ConfigWizard: Fix a wrapping issue on Mac --- xs/src/slic3r/GUI/ConfigWizard.cpp | 4 ++-- 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 3fd124bab2..d29bd51f12 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 d63b6e8b72..212db310c4 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,