diff options
| author | YuSanka <yusanka@gmail.com> | 2020-02-18 13:09:28 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2020-02-18 13:11:39 +0300 |
| commit | d1e343595680a40e4811914bdcef367b836c7f0e (patch) | |
| tree | 466576ba6df0d2ced0f718e6b4c1e581b06d639a /src/slic3r/GUI/Field.hpp | |
| parent | 18506854318227c7c410bd6bf1bd0486bc8e3c91 (diff) | |
Fixed non-correct TextCtrl's update on wxEVT_KILL_FOCUS (partially related to #3482),
when for Parameter validation dialog "Selecting NO caused no change".
OSX:TextCtrl:wxEVT_KILL_FOCUS: Second call is suppressed
+ Under OSX set a little bit more wider width for Fields
Diffstat (limited to 'src/slic3r/GUI/Field.hpp')
| -rw-r--r-- | src/slic3r/GUI/Field.hpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/slic3r/GUI/Field.hpp b/src/slic3r/GUI/Field.hpp index bd325005e..ca0c77d5c 100644 --- a/src/slic3r/GUI/Field.hpp +++ b/src/slic3r/GUI/Field.hpp @@ -225,10 +225,10 @@ public: bool get_enter_pressed() const { return bEnterPressed; } void set_enter_pressed(bool pressed) { bEnterPressed = pressed; } - // Values of width to "systematic" alignments of fields - static int def_width() { return 7; } - static int def_width_wider() { return 14; } - static int def_width_thinner() { return 4; } + // Values of width to alignments of fields + static int def_width() ; + static int def_width_wider() ; + static int def_width_thinner() ; protected: RevertButton* m_Undo_btn = nullptr; @@ -274,6 +274,11 @@ class TextCtrl : public Field { bool bChangedValueEvent = true; void change_field_value(wxEvent& event); #endif //__WXGTK__ + +#ifdef __WXOSX__ + bool bKilledFocus = false; +#endif // __WXOSX__ + public: TextCtrl(const ConfigOptionDef& opt, const t_config_option_key& id) : Field(opt, id) {} TextCtrl(wxWindow* parent, const ConfigOptionDef& opt, const t_config_option_key& id) : Field(parent, opt, id) {} |