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

Hopefully fixed get_wraped_wxString() and did not introduce new bugs.

Browse Source
This commit is contained in:
Vojtech Bubnik 2022-01-31 11:08:55 +01:00
parent 1a57db092f
commit e3ef90941f
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/slic3r/GUI/MsgDialog.cpp
View File

@ -294,37 +294,38 @@ InfoDialog::InfoDialog(wxWindow* parent, const wxString &title, const wxString&
wxString get_wraped_wxString(const wxString& text_in, size_t line_len /*=80*/) wxString get_wraped_wxString(const wxString& text_in, size_t line_len /*=80*/)
{ {
#ifdef __WXMSW__ #ifdef __WXMSW__
char slash = '\\'; static constexpr const char slash = '\\';
#else #else
char slash = '/'; static constexpr const char slash = '/';
#endif #endif
char space = ' '; static constexpr const char space = ' ';
char new_line = '\n'; static constexpr const char new_line = '\n';
wxString text = text_in; wxString text = text_in;
int idx = -1; int idx = -1;
size_t cur_len = 0; size_t cur_len = 0;
size_t text_len = text.Len(); size_t text_len = text.size();
for (size_t i = 0; i < text_len; i++) { for (size_t i = 0; i < text_len; ++ i) {
cur_len++;
if (text[i] == space || text[i] == slash)
idx = i;
if (text[i] == new_line) { if (text[i] == new_line) {
idx = -1; idx = -1;
cur_len = 0; cur_len = 0;
continue; } else {
} ++ cur_len;
if (text[i] == space || text[i] == slash)
idx = i;
if (cur_len >= line_len && idx >= 0) { if (cur_len >= line_len && idx >= 0) {
if (text[idx] == slash) { if (text[idx] == slash) {
text.insert(static_cast<size_t>(idx) + 1, 1, new_line); text.insert(static_cast<size_t>(++ idx), 1, new_line);
idx++; ++ text_len;
text_len++; ++ i;
} }
else // space else // space
text[idx] = new_line; text[idx] = new_line;
cur_len = i - static_cast<size_t>(idx); cur_len = i - static_cast<size_t>(idx);
idx = -1;
}
} }
} }
return text; return text;