diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2018-09-05 15:12:58 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2018-09-05 15:12:58 +0300 |
| commit | b9e6f8f3e3f69c80fabbdca8c8de19246f26e571 (patch) | |
| tree | 12e446560da2c736d737348c465b1461423c5877 /xs | |
| parent | 011281068b1a6047a5d1eab61cdeeafd10f15176 (diff) | |
| parent | 8ba48f8dc508fcde572514052cfa1acb91644c4f (diff) | |
Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev
Diffstat (limited to 'xs')
| -rw-r--r-- | xs/src/slic3r/GUI/Field.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xs/src/slic3r/GUI/Field.cpp b/xs/src/slic3r/GUI/Field.cpp index 352219853..452e4c90d 100644 --- a/xs/src/slic3r/GUI/Field.cpp +++ b/xs/src/slic3r/GUI/Field.cpp @@ -228,10 +228,13 @@ namespace Slic3r { namespace GUI { }), temp->GetId()); #endif // __WXGTK__ - temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent) + temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent& evt) { #ifdef __WXGTK__ - bChangedValueEvent = true; + if (bChangedValueEvent) + change_field_value(evt); + else + bChangedValueEvent = true; #else on_change_field(); #endif //__WXGTK__ @@ -270,7 +273,9 @@ namespace Slic3r { namespace GUI { #ifdef __WXGTK__ void TextCtrl::change_field_value(wxEvent& event) { - if (bChangedValueEvent) { + if (event.GetEventType() == wxEVT_TEXT_PASTE) + bChangedValueEvent = true; + else if (bChangedValueEvent) { on_change_field(); bChangedValueEvent = false; } |