3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-05 22:37:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
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)
{
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)

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());
}
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::SameLine(ImGui::GetStyle().WindowPadding.x * 14);