Fix for #9795 - Text emboss input dialog doesn't allow pasting in text from clipboard
This commit is contained in:
parent
043dccdea0
commit
14c3152ac9
1 changed files with 6 additions and 2 deletions
|
@ -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)
|
||||
// So we should save previous value...
|
||||
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();
|
||||
if (edited)
|
||||
hovered_id = 0;
|
||||
|
@ -2056,7 +2056,11 @@ const char* ImGuiWrapper::clipboard_get(void* user_data)
|
|||
const char* res = "";
|
||||
|
||||
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;
|
||||
wxTheClipboard->GetData(data);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue