mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:cannot quit layers edit if new project 

Change-Id: Id04a0386ab022283fd42503a1c363dc10535d5c6
This commit is contained in:
liz.li 2022-11-07 20:51:58 +08:00 committed by Lane.Wei
parent 22dd20ab58
commit ba1cb7820a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -397,6 +397,9 @@ std::string GLCanvas3D::LayersEditing::get_tooltip(const GLCanvas3D& canvas) con
void GLCanvas3D::LayersEditing::render_background_texture(const GLCanvas3D& canvas, const Rect& bar_rect) void GLCanvas3D::LayersEditing::render_background_texture(const GLCanvas3D& canvas, const Rect& bar_rect)
{ {
if (!m_enabled)
return;
GLShaderProgram* shader = wxGetApp().get_shader("variable_layer_height"); GLShaderProgram* shader = wxGetApp().get_shader("variable_layer_height");
if (shader == nullptr) if (shader == nullptr)
return; return;
@ -433,6 +436,9 @@ void GLCanvas3D::LayersEditing::render_background_texture(const GLCanvas3D& canv
void GLCanvas3D::LayersEditing::render_curve(const Rect & bar_rect) void GLCanvas3D::LayersEditing::render_curve(const Rect & bar_rect)
{ {
if (!m_enabled)
return;
//FIXME show some kind of legend. //FIXME show some kind of legend.
if (!m_slicing_parameters) if (!m_slicing_parameters)
return; return;
@ -2818,7 +2824,7 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
#else /* __APPLE__ */ #else /* __APPLE__ */
case WXK_CONTROL_A: case WXK_CONTROL_A:
#endif /* __APPLE__ */ #endif /* __APPLE__ */
if (!is_in_painting_mode) if (!is_in_painting_mode && !m_layers_editing.is_enabled())
post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL)); post_event(SimpleEvent(EVT_GLCANVAS_SELECT_ALL));
break; break;
#ifdef __APPLE__ #ifdef __APPLE__