3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Rewrote UI for ObjectManipulation without using of OptionsGrope

Browse source
This commit is contained in:
YuSanka 2019-09-18 15:10:36 +02:00
parent 0890c1417a
commit c9c407cc2b
4 changed files with 354 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,9 @@ class ObjectManipulation : public OG_Settings
wxStaticText* m_scale_Label = nullptr;
wxStaticText* m_rotate_Label = nullptr;
wxStaticText* m_item_name = nullptr;
wxStaticText* m_empty_str = nullptr;
// Non-owning pointers to the reset buttons, so we can hide and show them.
ScalableButton* m_reset_scale_button = nullptr;
ScalableButton* m_reset_rotation_button = nullptr;
@ -81,7 +84,7 @@ class ObjectManipulation : public OG_Settings
Vec3d m_new_rotation;
Vec3d m_new_scale;
Vec3d m_new_size;
bool m_new_enabled;
bool m_new_enabled {true};
bool m_uniform_scale {true};
// Does the object manipulation panel work in World or Local coordinates?
bool m_world_coordinates = true;
@ -96,6 +99,10 @@ class ObjectManipulation : public OG_Settings
std::string m_focused_option;
#endif // __APPLE__
wxFlexGridSizer* m_main_grid_sizer;
wxFlexGridSizer* m_labels_grid_sizer;
wxFlexGridSizer* m_editors_grid_sizer;
public:
ObjectManipulation(wxWindow* parent);
~ObjectManipulation() {}
@ -122,6 +129,7 @@ public:
void emulate_kill_focus();
#endif // __APPLE__
void update_item_name(const wxString &item_name);
void update_warning_icon_state(const wxString& tooltip);
void msw_rescale();