GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-07-20 23:24:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix of crash when notification text + hypertext wont fit line length

Browse Source
This commit is contained in:
David Kocik 2021-04-21 17:26:54 +02:00
parent 8b37b02923
commit 14405e66ae
1 changed files with 65 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
src/slic3r/GUI/NotificationManager.cpp
View File

@ -392,7 +392,7 @@ void NotificationManager::PopNotification::count_spaces()
} }
void NotificationManager::PopNotification::init() void NotificationManager::PopNotification::init()
{ {
std::string text = m_text1 + " " + m_hypertext; std::string text = m_text1;
int last_end = 0; int last_end = 0;
m_lines_count = 0; m_lines_count = 0;
@ -441,6 +441,15 @@ void NotificationManager::PopNotification::init()
} }
m_lines_count++; m_lines_count++;
} }
// hypertext calculation
if (!m_hypertext.empty()) {
int prev_end = m_endlines.size() > 1 ? m_endlines[m_endlines.size() - 2] : 0;
if (ImGui::CalcTextSize((text.substr(prev_end, last_end - prev_end) + m_hypertext).c_str()).x > m_window_width - m_window_width_offset) {
m_endlines.push_back(last_end);
m_lines_count++;
}
}
if (m_lines_count == 3) if (m_lines_count == 3)
m_multiline = true; m_multiline = true;
m_initialized = true; m_initialized = true;
@ -469,39 +478,45 @@ void NotificationManager::PopNotification::render_text(ImGuiWrapper& imgui, cons
int last_end = 0; int last_end = 0;
float starting_y = m_line_height/2;//10; float starting_y = m_line_height/2;//10;
float shift_y = m_line_height;// -m_line_height / 20; float shift_y = m_line_height;// -m_line_height / 20;
std::string line;
for (size_t i = 0; i < m_lines_count; i++) { for (size_t i = 0; i < m_lines_count; i++) {
std::string line = m_text1.substr(last_end , m_endlines[i] - last_end); if (m_text1.size() >= m_endlines[i]) {
if(i < m_lines_count - 1) line = m_text1.substr(last_end, m_endlines[i] - last_end);
last_end = m_endlines[i] + (m_text1[m_endlines[i]] == '\n' || m_text1[m_endlines[i]] == ' ' ? 1 : 0); if (i < m_lines_count - 1)
ImGui::SetCursorPosX(x_offset); last_end = m_endlines[i] + (m_text1[m_endlines[i]] == '\n' || m_text1[m_endlines[i]] == ' ' ? 1 : 0);
ImGui::SetCursorPosY(starting_y + i * shift_y); ImGui::SetCursorPosX(x_offset);
imgui.text(line.c_str()); ImGui::SetCursorPosY(starting_y + i * shift_y);
imgui.text(line.c_str());
}
} }
//hyperlink text //hyperlink text
if (!m_hypertext.empty()) if (!m_hypertext.empty()) {
{ render_hypertext(imgui, x_offset + ImGui::CalcTextSize((line + " ").c_str()).x, starting_y + (m_lines_count - 1) * shift_y, m_hypertext);
render_hypertext(imgui, x_offset + ImGui::CalcTextSize(m_text1.substr(m_endlines[m_lines_count - 2] + 1, m_endlines[m_lines_count - 1] - m_endlines[m_lines_count - 2] - 1).c_str()).x, starting_y + (m_lines_count - 1) * shift_y, m_hypertext);
} }
} else { } else {
// line1 // line1
ImGui::SetCursorPosX(x_offset); if (m_text1.size() >= m_endlines[0]) {
ImGui::SetCursorPosY(win_size.y / 2 - win_size.y / 6 - m_line_height / 2); ImGui::SetCursorPosX(x_offset);
imgui.text(m_text1.substr(0, m_endlines[0]).c_str()); ImGui::SetCursorPosY(win_size.y / 2 - win_size.y / 6 - m_line_height / 2);
imgui.text(m_text1.substr(0, m_endlines[0]).c_str());
}
// line2 // line2
std::string line = m_text1.substr(m_endlines[0] + (m_text1[m_endlines[0]] == '\n' || m_text1[m_endlines[0]] == ' ' ? 1 : 0), m_endlines[1] - m_endlines[0] - (m_text1[m_endlines[0]] == '\n' || m_text1[m_endlines[0]] == ' ' ? 1 : 0)); if (m_text1.size() >= m_endlines[0]) {
if (ImGui::CalcTextSize(line.c_str()).x > m_window_width - m_window_width_offset - ImGui::CalcTextSize((".." + _u8L("More")).c_str()).x) std::string line = m_text1.substr(m_endlines[0] + (m_text1[m_endlines[0]] == '\n' || m_text1[m_endlines[0]] == ' ' ? 1 : 0), m_endlines[1] - m_endlines[0] - (m_text1[m_endlines[0]] == '\n' || m_text1[m_endlines[0]] == ' ' ? 1 : 0));
{ if (ImGui::CalcTextSize(line.c_str()).x > m_window_width - m_window_width_offset - ImGui::CalcTextSize((".." + _u8L("More")).c_str()).x) {
line = line.substr(0, line.length() - 6); line = line.substr(0, line.length() - 6);
line += ".."; line += "..";
}else } else
line += " "; line += " ";
ImGui::SetCursorPosX(x_offset); ImGui::SetCursorPosX(x_offset);
ImGui::SetCursorPosY(win_size.y / 2 + win_size.y / 6 - m_line_height / 2); ImGui::SetCursorPosY(win_size.y / 2 + win_size.y / 6 - m_line_height / 2);
imgui.text(line.c_str()); imgui.text(line.c_str());
// "More" hypertext // "More" hypertext
render_hypertext(imgui, x_offset + ImGui::CalcTextSize(line.c_str()).x, win_size.y / 2 + win_size.y / 6 - m_line_height / 2, _u8L("More"), true); render_hypertext(imgui, x_offset + ImGui::CalcTextSize(line.c_str()).x, win_size.y / 2 + win_size.y / 6 - m_line_height / 2, _u8L("More"), true);
}
} }
} else { } else {
//text 1 //text 1
@ -509,16 +524,20 @@ void NotificationManager::PopNotification::render_text(ImGuiWrapper& imgui, cons
float cursor_x = x_offset; float cursor_x = x_offset;
if(m_lines_count > 1) { if(m_lines_count > 1) {
// line1 // line1
ImGui::SetCursorPosX(x_offset); if (m_text1.length() >= m_endlines[0]) {
ImGui::SetCursorPosY(win_size.y / 2 - win_size.y / 6 - m_line_height / 2); ImGui::SetCursorPosX(x_offset);
imgui.text(m_text1.substr(0, m_endlines[0]).c_str()); ImGui::SetCursorPosY(win_size.y / 2 - win_size.y / 6 - m_line_height / 2);
imgui.text(m_text1.substr(0, m_endlines[0]).c_str());
}
// line2 // line2
std::string line = m_text1.substr(m_endlines[0] + (m_text1[m_endlines[0]] == '\n' || m_text1[m_endlines[0]] == ' ' ? 1 : 0)); if (m_text1.length() >= m_endlines[0]) {
cursor_y = win_size.y / 2 + win_size.y / 6 - m_line_height / 2; std::string line = m_text1.substr(m_endlines[0] + (m_text1[m_endlines[0]] == '\n' || m_text1[m_endlines[0]] == ' ' ? 1 : 0));
ImGui::SetCursorPosX(x_offset); cursor_y = win_size.y / 2 + win_size.y / 6 - m_line_height / 2;
ImGui::SetCursorPosY(cursor_y); ImGui::SetCursorPosX(x_offset);
imgui.text(line.c_str()); ImGui::SetCursorPosY(cursor_y);
cursor_x = x_offset + ImGui::CalcTextSize(line.c_str()).x; imgui.text(line.c_str());
cursor_x = x_offset + ImGui::CalcTextSize(line.c_str()).x;
}
} else { } else {
ImGui::SetCursorPosX(x_offset); ImGui::SetCursorPosX(x_offset);
ImGui::SetCursorPosY(cursor_y); ImGui::SetCursorPosY(cursor_y);
@ -526,8 +545,7 @@ void NotificationManager::PopNotification::render_text(ImGuiWrapper& imgui, cons
cursor_x = x_offset + ImGui::CalcTextSize(m_text1.c_str()).x; cursor_x = x_offset + ImGui::CalcTextSize(m_text1.c_str()).x;
} }
//hyperlink text //hyperlink text
if (!m_hypertext.empty()) if (!m_hypertext.empty()) {
{
render_hypertext(imgui, cursor_x + 4, cursor_y, m_hypertext); render_hypertext(imgui, cursor_x + 4, cursor_y, m_hypertext);
} }
@ -901,15 +919,17 @@ void NotificationManager::ExportFinishedNotification::render_text(ImGuiWrapper&
float starting_y = m_line_height / 2;//10; float starting_y = m_line_height / 2;//10;
float shift_y = m_line_height;// -m_line_height / 20; float shift_y = m_line_height;// -m_line_height / 20;
for (size_t i = 0; i < m_lines_count; i++) { for (size_t i = 0; i < m_lines_count; i++) {
std::string line = m_text1.substr(last_end, m_endlines[i] - last_end); if (m_text1.size() >= m_endlines[i]) {
if (i < m_lines_count - 1) std::string line = m_text1.substr(last_end, m_endlines[i] - last_end);
last_end = m_endlines[i] + (m_text1[m_endlines[i]] == '\n' || m_text1[m_endlines[i]] == ' ' ? 1 : 0); if (i < m_lines_count - 1)
ImGui::SetCursorPosX(x_offset); last_end = m_endlines[i] + (m_text1[m_endlines[i]] == '\n' || m_text1[m_endlines[i]] == ' ' ? 1 : 0);
ImGui::SetCursorPosY(starting_y + i * shift_y); ImGui::SetCursorPosX(x_offset);
imgui.text(line.c_str()); ImGui::SetCursorPosY(starting_y + i * shift_y);
//hyperlink text imgui.text(line.c_str());
if ( i == 0 ) { //hyperlink text
render_hypertext(imgui, x_offset + ImGui::CalcTextSize(m_text1.substr(0, last_end).c_str()).x + ImGui::CalcTextSize(" ").x, starting_y, _u8L("Open Folder.")); if ( i == 0 ) {
render_hypertext(imgui, x_offset + ImGui::CalcTextSize(line.c_str()).x + ImGui::CalcTextSize(" ").x, starting_y, _u8L("Open Folder."));
}
} }
} }