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

Fix of too long text in download notification

Browse source
This commit is contained in:
David Kocik 2023-01-27 13:15:13 +01:00
parent 3e6302d4f3
commit 7ecfaec739
1 changed files with 15 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/slic3r/GUI/NotificationManager.cpp
View file

@ -1062,18 +1062,6 @@ void NotificationManager::ProgressBarWithCancelNotification::render_bar(ImGuiWra
imgui.text(text.c_str());
}
//------URLDownloadNotification----------------
void NotificationManager::URLDownloadNotification::render_close_button(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y)
@ -1259,6 +1247,20 @@ void NotificationManager::URLDownloadNotification::trigger_user_action_callback(
void NotificationManager::URLDownloadNotification::render_bar(ImGuiWrapper& imgui, const float win_size_x, const float win_size_y, const float win_pos_x, const float win_pos_y)
{
auto shorten_to_line = [this](const std::string& text, bool dots) -> std::string {
std::string line = text;
bool did_shorten = false;
while (ImGui::CalcTextSize(line.c_str()).x > m_window_width - m_window_width_offset) {
line = line.substr(0, line.length() - 1);
did_shorten = true;
}
if (did_shorten && dots) {
line = line.substr(0, line.length() - 2);
line += "...";
}
return line;
};
ProgressBarNotification::render_bar(imgui, win_size_x, win_size_y, win_pos_x, win_pos_y);
std::string text;
if (m_percentage < 0.f) {
@ -1272,7 +1274,7 @@ void NotificationManager::URLDownloadNotification::render_bar(ImGuiWrapper& imgu
}
ImGui::SetCursorPosX(m_left_indentation);
ImGui::SetCursorPosY(win_size_y / 2 + win_size_y / 6 - (m_multiline ? 0 : m_line_height / 4));
imgui.text(text.c_str());
imgui.text(shorten_to_line(text, true).c_str());
}
void NotificationManager::URLDownloadNotification::count_spaces()
@ -1281,44 +1283,6 @@ void NotificationManager::URLDownloadNotification::count_spaces()
m_window_width_offset = m_line_height * 6;
}
//------PrintHostUploadNotification----------------
void NotificationManager::PrintHostUploadNotification::init()
{