From 8226f744137bcdd4265a6da87794992315c7b280 Mon Sep 17 00:00:00 2001 From: Filip Sykala Date: Tue, 14 Sep 2021 10:02:01 +0200 Subject: [PATCH] Emboss open by context menu only --- resources/icons/emboss.svg | 63 ----------------------- src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 9 ++-- src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp | 7 ++- src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp | 1 + src/slic3r/GUI/Gizmos/GLGizmosManager.cpp | 2 +- 5 files changed, 12 insertions(+), 70 deletions(-) delete mode 100644 resources/icons/emboss.svg diff --git a/resources/icons/emboss.svg b/resources/icons/emboss.svg deleted file mode 100644 index fdea19b774..0000000000 --- a/resources/icons/emboss.svg +++ /dev/null @@ -1,63 +0,0 @@ - -image/svg+xml - - - - - - - - - - - - diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index 53880530f9..641cb9e781 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -39,10 +39,8 @@ public: using namespace Slic3r; using namespace Slic3r::GUI; -GLGizmoEmboss::GLGizmoEmboss(GLCanvas3D & parent, - const std::string &icon_filename, - unsigned int sprite_id) - : GLGizmoBase(parent, icon_filename, sprite_id) +GLGizmoEmboss::GLGizmoEmboss(GLCanvas3D &parent) + : GLGizmoBase(parent, M_ICON_FILENAME, -2) , m_font_list({ {"NotoSans Regular", Slic3r::resources_dir() + "/fonts/NotoSans-Regular.ttf"}, {"NotoSans CJK", Slic3r::resources_dir() + "/fonts/NotoSansCJK-Regular.ttc"}}) @@ -528,3 +526,6 @@ std::string GLGizmoEmboss::create_volume_name() text = text.substr(0, max_len - 3) + " .."; return _u8L("Text") + ": " + text; } + +// any existing icon filename to not influence GUI +const std::string GLGizmoEmboss::M_ICON_FILENAME = "cut.svg"; diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp index 154b2b0a43..9560218ef3 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp @@ -19,7 +19,7 @@ namespace Slic3r::GUI { class GLGizmoEmboss : public GLGizmoBase { public: - GLGizmoEmboss(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id); + GLGizmoEmboss(GLCanvas3D& parent); virtual ~GLGizmoEmboss(); void set_volume_type(ModelVolumeType volume_type) { m_volume_type = volume_type; } @@ -33,7 +33,7 @@ protected: virtual void on_render_for_picking() override; virtual void on_render_input_window(float x, float y, float bottom_limit) override; virtual bool on_is_activable() const override; - virtual bool on_is_selectable() const override { return true; } + virtual bool on_is_selectable() const override { return false; } virtual void on_set_state() override; private: @@ -81,6 +81,9 @@ private: // actual volume ModelVolume *m_volume; ModelVolumeType m_volume_type; + + // only temporary solution + static const std::string M_ICON_FILENAME; }; } // namespace Slic3r::GUI diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp index 8d0e5e5626..30cf0de148 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp @@ -101,6 +101,7 @@ private: const std::string tr_detail_level; const std::string tr_decimate_ratio; + // only temporary solution static const std::string M_ICON_FILENAME; }; diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp index 2d1184f2e7..100cfbf52d 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp @@ -106,7 +106,7 @@ bool GLGizmosManager::init() m_gizmos.emplace_back(new GLGizmoFdmSupports(m_parent, "fdm_supports.svg", 7)); m_gizmos.emplace_back(new GLGizmoSeam(m_parent, "seam.svg", 8)); m_gizmos.emplace_back(new GLGizmoMmuSegmentation(m_parent, "mmu_segmentation.svg", 9)); - m_gizmos.emplace_back(new GLGizmoEmboss(m_parent, "emboss.svg", 10)); // TODO: fix icon + m_gizmos.emplace_back(new GLGizmoEmboss(m_parent)); m_gizmos.emplace_back(new GLGizmoSimplify(m_parent)); m_common_gizmos_data.reset(new CommonGizmosDataPool(&m_parent));