3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-14 02:07:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/prusa3d/Slic3r into dev

Browse source
This commit is contained in:
Enrico Turri 2018-09-05 14:12:58 +02:00
commit b9e6f8f3e3
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
xs/src/slic3r/GUI/Field.cpp
View file

@ -228,9 +228,12 @@ namespace Slic3r { namespace GUI {
}), temp->GetId()); }), temp->GetId());
#endif // __WXGTK__ #endif // __WXGTK__
temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent) temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent& evt)
{ {
#ifdef __WXGTK__ #ifdef __WXGTK__
if (bChangedValueEvent)
change_field_value(evt);
else
bChangedValueEvent = true; bChangedValueEvent = true;
#else #else
on_change_field(); on_change_field();
@ -270,7 +273,9 @@ namespace Slic3r { namespace GUI {
#ifdef __WXGTK__ #ifdef __WXGTK__
void TextCtrl::change_field_value(wxEvent& event) void TextCtrl::change_field_value(wxEvent& event)
{ {
if (bChangedValueEvent) { if (event.GetEventType() == wxEVT_TEXT_PASTE)
bChangedValueEvent = true;
else if (bChangedValueEvent) {
on_change_field(); on_change_field();
bChangedValueEvent = false; bChangedValueEvent = false;
} }