From 7af07fd912ebac22d61e0670a991a9e7cb2367ea Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Thu, 5 Dec 2019 12:22:24 +0100 Subject: Forces even size and disable compression for toolbar icon texture to try to solve artifacts on OsX Catalina --- src/slic3r/GUI/GLToolbar.cpp | 7 ++++++- src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp index 63387bf2d..c35d1afe4 100644 --- a/src/slic3r/GUI/GLToolbar.cpp +++ b/src/slic3r/GUI/GLToolbar.cpp @@ -1207,7 +1207,12 @@ bool GLToolbar::generate_icons_texture() const states.push_back(std::make_pair(1, true)); } - bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, (unsigned int)(m_layout.icons_size * m_layout.scale), true); + unsigned int sprite_size_px = (unsigned int)(m_layout.icons_size * m_layout.scale); + // force even size + if (sprite_size_px % 2 != 0) + sprite_size_px += 1; + + bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, sprite_size_px, false); if (res) m_icons_texture_dirty = false; diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 3bad1b0a3..40362349b 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -1062,7 +1062,12 @@ bool GLGizmosManager::generate_icons_texture() const states.push_back(std::make_pair(0, false)); states.push_back(std::make_pair(0, true)); - bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, (unsigned int)(m_overlay_icons_size * m_overlay_scale), true); + unsigned int sprite_size_px = (unsigned int)(m_overlay_icons_size * m_overlay_scale); + // force even size + if (sprite_size_px % 2 != 0) + sprite_size_px += 1; + + bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, sprite_size_px, false); if (res) m_icons_texture_dirty = false; -- cgit v1.2.3 From 16d852df250d3b885a1e077a253c39846ed47df4 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Thu, 5 Dec 2019 14:43:18 +0100 Subject: Follow-up of c370bb7141360776f603c9eec679e8d276dda56b -> Do not force even size of toolbars icon textures --- src/slic3r/GUI/GLToolbar.cpp | 6 +++--- src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/slic3r/GUI/GLToolbar.cpp b/src/slic3r/GUI/GLToolbar.cpp index c35d1afe4..7801cede7 100644 --- a/src/slic3r/GUI/GLToolbar.cpp +++ b/src/slic3r/GUI/GLToolbar.cpp @@ -1208,9 +1208,9 @@ bool GLToolbar::generate_icons_texture() const } unsigned int sprite_size_px = (unsigned int)(m_layout.icons_size * m_layout.scale); - // force even size - if (sprite_size_px % 2 != 0) - sprite_size_px += 1; +// // force even size +// if (sprite_size_px % 2 != 0) +// sprite_size_px += 1; bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, sprite_size_px, false); if (res) diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 40362349b..c7d3e2b4e 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -1063,9 +1063,9 @@ bool GLGizmosManager::generate_icons_texture() const states.push_back(std::make_pair(0, true)); unsigned int sprite_size_px = (unsigned int)(m_overlay_icons_size * m_overlay_scale); - // force even size - if (sprite_size_px % 2 != 0) - sprite_size_px += 1; +// // force even size +// if (sprite_size_px % 2 != 0) +// sprite_size_px += 1; bool res = m_icons_texture.load_from_svg_files_as_sprites_array(filenames, states, sprite_size_px, false); if (res) -- cgit v1.2.3