PublicCodeMirror/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-05-23 00:29:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

View toolbar's initialization of icon size moved from GLCanvas3D::GLCanvas3D() to Plater::priv::priv() for OSX build

Browse Source
This commit is contained in:
Enrico Turri
2020-03-02 12:45:04 +01:00
parent 3f69336204
commit 595128a90d
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1471,13 +1471,11 @@ GLCanvas3D::GLCanvas3D(wxGLCanvas* canvas, Bed3D& bed, Camera& camera, GLToolbar
m_timer.SetOwner(m_canvas);
#if ENABLE_RETINA_GL
m_retina_helper.reset(new RetinaHelper(canvas));
#if !ENABLE_NON_STATIC_CANVAS_MANAGER
// set default view_toolbar icons size equal to GLGizmosManager::Default_Icons_Size
#if ENABLE_NON_STATIC_CANVAS_MANAGER
wxGetApp().plater()->get_view_toolbar().set_icons_size(GLGizmosManager::Default_Icons_Size);
#else
m_view_toolbar.set_icons_size(GLGizmosManager::Default_Icons_Size);
#endif // ENABLE_NON_STATIC_CANVAS_MANAGER
#endif
#endif // !ENABLE_NON_STATIC_CANVAS_MANAGER
#endif // ENABLE_RETINA_GL
}
m_selection.set_volumes(&m_volumes.volumes);