From a111b3ae428a29e739d91279c987afb13f7dd5b1 Mon Sep 17 00:00:00 2001
From: "zhou.xu" <zhou.xu@bambulab.com>
Date: Mon, 13 Jan 2025 17:26:14 +0800
Subject: [PATCH] FIX:fix quick key conflict for gizmo

jira: STUDIO-9775
Change-Id: I66d72525022fb8f73c509ccf1fbd4822f5d07a43
---
 src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp | 6 ++++++
 src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp | 2 +-
 src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
index a10ef3c3a..0bace7e12 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
@@ -27,6 +27,12 @@ GLGizmoAssembly::GLGizmoAssembly(GLCanvas3D& parent, const std::string& icon_fil
     m_measure_mode       = EMeasureMode::ONLY_ASSEMBLY;
 }
 
+bool GLGizmoAssembly::on_init() {
+    GLGizmoMeasure::on_init();
+    m_shortcut_key = WXK_CONTROL_Y;
+    return true;
+}
+
 std::string GLGizmoAssembly::on_get_name() const
 {
     if (!on_is_activable() && m_state == EState::Off) {
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp
index 7046337b6..4804af9c4 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp
@@ -24,7 +24,7 @@ public:
     std::string get_gizmo_entering_text() const override { return _u8L("Entering Assembly gizmo"); }
     std::string get_gizmo_leaving_text() const override { return _u8L("Leaving Assembly gizmo"); }
 protected:
-    //bool on_init() override;
+    bool on_init() override;
     std::string on_get_name() const override;
     bool on_is_activable() const override;
     //void on_render() override;
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
index 4e7832c7a..7157e3af0 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
@@ -38,7 +38,7 @@ bool GLGizmoBrimEars::on_init()
 
     m_new_point_head_diameter = get_brim_default_radius();
 
-    m_shortcut_key = WXK_CONTROL_B;
+    m_shortcut_key = WXK_CONTROL_E;
 
     m_desc["head_diameter"]    = _L("Head diameter");
     m_desc["max_angle"]        = _L("Max angle");