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

FIX:fix quick key conflict for gizmo 

jira: STUDIO-9775
Change-Id: I66d72525022fb8f73c509ccf1fbd4822f5d07a43
This commit is contained in:
zhou.xu 2025-01-13 17:26:14 +08:00 committed by lane.wei
parent 979fefffd5
commit a111b3ae42
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Gizmos/GLGizmoAssembly.cpp
View File

@ -27,6 +27,12 @@ GLGizmoAssembly::GLGizmoAssembly(GLCanvas3D& parent, const std::string& icon_fil
m_measure_mode = EMeasureMode::ONLY_ASSEMBLY; 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 std::string GLGizmoAssembly::on_get_name() const
{ {
if (!on_is_activable() && m_state == EState::Off) { if (!on_is_activable() && m_state == EState::Off) {

2
src/slic3r/GUI/Gizmos/GLGizmoAssembly.hpp
View File

@ -24,7 +24,7 @@ public:
std::string get_gizmo_entering_text() const override { return _u8L("Entering Assembly gizmo"); } 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"); } std::string get_gizmo_leaving_text() const override { return _u8L("Leaving Assembly gizmo"); }
protected: protected:
//bool on_init() override; bool on_init() override;
std::string on_get_name() const override; std::string on_get_name() const override;
bool on_is_activable() const override; bool on_is_activable() const override;
//void on_render() override; //void on_render() override;

2
src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
View File

@ -38,7 +38,7 @@ bool GLGizmoBrimEars::on_init()
m_new_point_head_diameter = get_brim_default_radius(); 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["head_diameter"] = _L("Head diameter");
m_desc["max_angle"] = _L("Max angle"); m_desc["max_angle"] = _L("Max angle");