GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-10-02 04:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ConfigWizard: Fix a wrapping issue on Mac

Browse Source
This commit is contained in:
Vojtech Kral 2019-02-12 14:45:56 +01:00
parent 4917cb0f35
commit 4e18af8453
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xs/src/slic3r/GUI/ConfigWizard.cpp
View File

@ -264,7 +264,7 @@ void ConfigWizardPage::append_text(wxString text)
{ {
auto *widget = new wxStaticText(this, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT); auto *widget = new wxStaticText(this, wxID_ANY, text, wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
widget->Wrap(WRAP_WIDTH); widget->Wrap(WRAP_WIDTH);
widget->SetMinSize(wxSize(WRAP_WIDTH, -1)); widget->SetMinSize(wxSize(WRAP_WIDTH, MIN_HEIGHT));
append(widget); append(widget);
} }
@ -283,7 +283,7 @@ PageWelcome::PageWelcome(ConfigWizard *parent)
if (wizard_p()->run_reason == ConfigWizard::RR_DATA_EMPTY) { if (wizard_p()->run_reason == ConfigWizard::RR_DATA_EMPTY) {
wxString::Format(_(L("Run %s")), ConfigWizard::name()); wxString::Format(_(L("Run %s")), ConfigWizard::name());
append_text(wxString::Format( 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()) ConfigWizard::name())
); );
} else { } else {

1
xs/src/slic3r/GUI/ConfigWizard_private.hpp
View File

@ -30,6 +30,7 @@ namespace GUI {
enum { enum {
WRAP_WIDTH = 500, WRAP_WIDTH = 500,
MIN_HEIGHT = 150,
MODEL_MIN_WRAP = 150, MODEL_MIN_WRAP = 150,
DIALOG_MARGIN = 15, DIALOG_MARGIN = 15,