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

Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation

Browse source
This commit is contained in:
bubnikv 2019-05-03 19:13:47 +02:00
commit a8241ad7f7
10 changed files with 421 additions and 153 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/GUI_ObjectManipulation.hpp
View file

@ -9,6 +9,7 @@
class wxBitmapComboBox;
class wxStaticText;
class LockButton;
class wxStaticBitmap;
namespace Slic3r {
namespace GUI {
@ -69,6 +70,9 @@ class ObjectManipulation : public OG_Settings
LockButton* m_lock_bnt{ nullptr };
wxBitmapComboBox* m_word_local_combo = nullptr;
ScalableBitmap m_manifold_warning_bmp;
wxStaticBitmap* m_fix_throught_netfab_bitmap;
#ifndef __APPLE__
// Currently focused option name (empty if none)
std::string m_focused_option;
@ -100,6 +104,9 @@ public:
void emulate_kill_focus();
#endif // __APPLE__
void update_warning_icon_state(const wxString& tooltip);
void msw_rescale();
private:
void reset_settings_value();
void update_settings_value(const Selection& selection);