From bb3f59e18fc1dbd639752be345f1dcb386951c72 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Mon, 9 Jun 2025 10:10:12 +0800 Subject: [PATCH] FIX:ImGuiInputTextFlags_Multiline should manual input jira: STUDIO-12598 Change-Id: I7ad169d69bdbf04bb93329d7d23a5f4851123c76 (cherry picked from commit 86641262ac3d0a8a690126bdff64860bddc28114) --- deps_src/imgui/imgui_widgets.cpp | 2 +- src/slic3r/GUI/IMSlider.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps_src/imgui/imgui_widgets.cpp b/deps_src/imgui/imgui_widgets.cpp index 65f0bc5260..df3cea066a 100644 --- a/deps_src/imgui/imgui_widgets.cpp +++ b/deps_src/imgui/imgui_widgets.cpp @@ -4415,7 +4415,7 @@ bool ImGui::InputText(const char* label, char* buf, size_t buf_size, ImGuiInputT bool ImGui::InputTextMultiline(const char* label, char* buf, size_t buf_size, const ImVec2& size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) { - return InputTextEx(label, NULL, buf, (int)buf_size, size, flags | ImGuiInputTextFlags_Multiline, callback, user_data); + return InputTextEx(label, NULL, buf, (int) buf_size, size, flags , callback, user_data);//ImGuiInputTextFlags_Multiline should manual input } bool ImGui::InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) diff --git a/src/slic3r/GUI/IMSlider.cpp b/src/slic3r/GUI/IMSlider.cpp index 78c2668fa7..81b10ebd75 100644 --- a/src/slic3r/GUI/IMSlider.cpp +++ b/src/slic3r/GUI/IMSlider.cpp @@ -1186,8 +1186,8 @@ void IMSlider::render_input_custom_gcode(std::string custom_gcode) strcpy(m_custom_gcode, custom_gcode.c_str()); } const int text_height = 6; - - ImGui::InputTextMultiline("##text", m_custom_gcode, sizeof(m_custom_gcode), ImVec2(-1, ImGui::GetTextLineHeight() * text_height)); + const ImGuiInputTextFlags flag = ImGuiInputTextFlags_Multiline; + ImGui::InputTextMultiline("##text", m_custom_gcode, sizeof(m_custom_gcode), ImVec2(-1, ImGui::GetTextLineHeight() * text_height), flag); ImGui::NewLine(); ImGui::SameLine(ImGui::GetStyle().WindowPadding.x * 14);