GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 21:45:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for #9795 - Text emboss input dialog doesn't allow pasting in text from clipboard

Browse Source
This commit is contained in:
YuSanka 2023-02-20 14:27:31 +01:00
parent 043dccdea0
commit 14c3152ac9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/ImGuiWrapper.cpp
View File

@ -1082,7 +1082,7 @@ void ImGuiWrapper::search_list(const ImVec2& size_, bool (*items_getter)(int, co
// The press on Esc key invokes editing of InputText (removes last changes) // The press on Esc key invokes editing of InputText (removes last changes)
// So we should save previous value... // So we should save previous value...
std::string str = search_str; std::string str = search_str;
ImGui::InputTextEx("", NULL, search_str, 40, search_size, ImGuiInputTextFlags_AutoSelectAll, NULL, NULL); ImGui::InputTextEx("", NULL, search_str, 240, search_size, ImGuiInputTextFlags_AutoSelectAll, NULL, NULL);
edited = ImGui::IsItemEdited(); edited = ImGui::IsItemEdited();
if (edited) if (edited)
hovered_id = 0; hovered_id = 0;
@ -2056,7 +2056,11 @@ const char* ImGuiWrapper::clipboard_get(void* user_data)
const char* res = ""; const char* res = "";
if (wxTheClipboard->Open()) { if (wxTheClipboard->Open()) {
if (wxTheClipboard->IsSupported(wxDF_TEXT)) { if (wxTheClipboard->IsSupported(wxDF_TEXT)
#if wxUSE_UNICODE
|| wxTheClipboard->IsSupported(wxDF_UNICODETEXT)
#endif // wxUSE_UNICODE
) {
wxTextDataObject data; wxTextDataObject data;
wxTheClipboard->GetData(data); wxTheClipboard->GetData(data);