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

notification init() at first render, not notification creation. Hopefully a fix of issue #4647.

Browse source
This commit is contained in:
David Kocik 2020-08-26 10:49:42 +02:00
parent a81afce1b8
commit 3984326ee3
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,13 +49,17 @@ NotificationManager::PopNotification::PopNotification(const NotificationData &n,
, m_text2 (n.text2) , m_text2 (n.text2)
, m_evt_handler (evt_handler) , m_evt_handler (evt_handler)
{ {
init(); //init();
} }
NotificationManager::PopNotification::~PopNotification() NotificationManager::PopNotification::~PopNotification()
{ {
} }
NotificationManager::PopNotification::RenderResult NotificationManager::PopNotification::render(GLCanvas3D& canvas, const float& initial_y) NotificationManager::PopNotification::RenderResult NotificationManager::PopNotification::render(GLCanvas3D& canvas, const float& initial_y)
{ {
if (!m_initialized)
{
init();
}
if (m_finished) if (m_finished)
return RenderResult::Finished; return RenderResult::Finished;
if (m_close_pending) { if (m_close_pending) {
@ -228,6 +232,7 @@ void NotificationManager::PopNotification::init()
} }
m_lines_count++; m_lines_count++;
} }
m_initialized = true;
} }
void NotificationManager::PopNotification::set_next_window_size(ImGuiWrapper& imgui) void NotificationManager::PopNotification::set_next_window_size(ImGuiWrapper& imgui)
{ {

1
src/slic3r/GUI/NotificationManager.hpp
View file

@ -121,6 +121,7 @@ public:
const NotificationData m_data; const NotificationData m_data;
int m_id; int m_id;
bool m_initialized { false };
// Main text // Main text
std::string m_text1; std::string m_text1;
// Clickable text // Clickable text