GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-30 01:54:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Enrico Turri 2018-09-05 15:32:12 +02:00
commit 622e86d9e4
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
xs/src/slic3r/GUI/Field.cpp
View File

@ -231,20 +231,17 @@ namespace Slic3r { namespace GUI {
temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent& evt) temp->Bind(wxEVT_TEXT, ([this](wxCommandEvent& evt)
{ {
#ifdef __WXGTK__ #ifdef __WXGTK__
if (bChangedValueEvent) if (bChangedValueEvent)
change_field_value(evt);
else
bChangedValueEvent = true;
#else
on_change_field();
#endif //__WXGTK__ #endif //__WXGTK__
on_change_field();
}), temp->GetId()); }), temp->GetId());
#ifdef __WXGTK__ #ifdef __WXGTK__
// to correct value update on GTK we should call on_change_field() on // to correct value updating on GTK we should:
// wxEVT_KEY_UP or wxEVT_TEXT_PASTE instead of wxEVT_TEXT // call on_change_field() on wxEVT_KEY_UP instead of wxEVT_TEXT
// and prevent value updating on wxEVT_KEY_DOWN
temp->Bind(wxEVT_KEY_DOWN, &TextCtrl::change_field_value, this);
temp->Bind(wxEVT_KEY_UP, &TextCtrl::change_field_value, this); temp->Bind(wxEVT_KEY_UP, &TextCtrl::change_field_value, this);
temp->Bind(wxEVT_TEXT_PASTE, &TextCtrl::change_field_value, this);
#endif //__WXGTK__ #endif //__WXGTK__
// select all text using Ctrl+A // select all text using Ctrl+A
@ -273,12 +270,8 @@ namespace Slic3r { namespace GUI {
#ifdef __WXGTK__ #ifdef __WXGTK__
void TextCtrl::change_field_value(wxEvent& event) void TextCtrl::change_field_value(wxEvent& event)
{ {
if (event.GetEventType() == wxEVT_TEXT_PASTE) if (bChangedValueEvent = event.GetEventType()==wxEVT_KEY_UP)
bChangedValueEvent = true; on_change_field();
else if (bChangedValueEvent) {
on_change_field();
bChangedValueEvent = false;
}
event.Skip(); event.Skip();
}; };
#endif //__WXGTK__ #endif //__WXGTK__

2
xs/src/slic3r/GUI/Field.hpp
View File

@ -235,7 +235,7 @@ inline bool is_sizer_field(const t_field& obj) { return !is_bad_field(obj) && ob
class TextCtrl : public Field { class TextCtrl : public Field {
using Field::Field; using Field::Field;
#ifdef __WXGTK__ #ifdef __WXGTK__
bool bChangedValueEvent = false; bool bChangedValueEvent = true;
void change_field_value(wxEvent& event); void change_field_value(wxEvent& event);
#endif //__WXGTK__ #endif //__WXGTK__
public: public: