diff options
| author | YuSanka <yusanka@gmail.com> | 2019-10-09 12:22:44 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2019-10-09 12:24:28 +0300 |
| commit | c1bb34cc4dc1fa491da40c5336eff0faa9992843 (patch) | |
| tree | d454ed2239639c146348444b012938b1816edd60 /src/slic3r/GUI/GUI_ObjectManipulation.hpp | |
| parent | 59a6318931ca36781e57d3c3687665967fdb3526 (diff) | |
Some changing in implementation of emulate_kill_focus according to new code architecture.
+ Cleaning of the code from unused parts
Diffstat (limited to 'src/slic3r/GUI/GUI_ObjectManipulation.hpp')
| -rw-r--r-- | src/slic3r/GUI/GUI_ObjectManipulation.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.hpp b/src/slic3r/GUI/GUI_ObjectManipulation.hpp index e25aab678..7d53034b2 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.hpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.hpp @@ -32,6 +32,7 @@ public: void msw_rescale(); void set_value(const wxString& new_value); + void kill_focus(ObjectManipulation *parent); private: double get_value(); @@ -118,7 +119,7 @@ class ObjectManipulation : public OG_Settings #ifndef __APPLE__ // Currently focused option name (empty if none) - std::string m_focused_option; + ManipulationEditor* m_focused_editor {nullptr}; #endif // __APPLE__ wxFlexGridSizer* m_main_grid_sizer; @@ -160,6 +161,7 @@ public: void update_warning_icon_state(const wxString& tooltip); void msw_rescale(); void on_change(const std::string& opt_key, int axis, double new_value); + void set_focused_editor(ManipulationEditor* focused_editor) { m_focused_editor = focused_editor; } private: void reset_settings_value(); @@ -176,9 +178,6 @@ private: void change_scale_value(int axis, double value); void change_size_value(int axis, double value); void do_scale(int axis, const Vec3d &scale) const; - - void on_change(t_config_option_key opt_key, const boost::any& value); - void on_fill_empty_value(const std::string& opt_key); }; }} |