juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 18:42:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix emboss crash when displaying warning information (#11299)

Browse Source 
Revert "FIX:ImGuiInputTextFlags_Multiline should manual input"

This reverts commit bb3f59e18f.
This commit is contained in:
Noisyfox
2025-11-08 00:28:22 +08:00
committed by GitHub
parent 13f94b0559
commit f4d8130451
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps_src/imgui/imgui_widgets.cpp
View File

@@ -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) 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 , callback, user_data);//ImGuiInputTextFlags_Multiline should manual input return InputTextEx(label, NULL, buf, (int)buf_size, size, flags | ImGuiInputTextFlags_Multiline, callback, user_data);
} }
bool ImGui::InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data) bool ImGui::InputTextWithHint(const char* label, const char* hint, char* buf, size_t buf_size, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data)

4
src/slic3r/GUI/IMSlider.cpp
View File

@@ -1186,8 +1186,8 @@ void IMSlider::render_input_custom_gcode(std::string custom_gcode)
strcpy(m_custom_gcode, custom_gcode.c_str()); strcpy(m_custom_gcode, custom_gcode.c_str());
} }
const int text_height = 6; const int text_height = 6;
const ImGuiInputTextFlags flag = ImGuiInputTextFlags_Multiline;
ImGui::InputTextMultiline("##text", m_custom_gcode, sizeof(m_custom_gcode), ImVec2(-1, ImGui::GetTextLineHeight() * text_height), flag); ImGui::InputTextMultiline("##text", m_custom_gcode, sizeof(m_custom_gcode), ImVec2(-1, ImGui::GetTextLineHeight() * text_height));
ImGui::NewLine(); ImGui::NewLine();
ImGui::SameLine(ImGui::GetStyle().WindowPadding.x * 14); ImGui::SameLine(ImGui::GetStyle().WindowPadding.x * 14);