3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-31 20:51:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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

Browse source
This commit is contained in:
Enrico Turri 2019-01-14 08:28:08 +01:00
commit 1d81469d97
6 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/Field.cpp
View file

@ -248,6 +248,9 @@ void TextCtrl::BUILD() {
const long style = m_opt.multiline ? wxTE_MULTILINE : wxTE_PROCESS_ENTER/*0*/;
auto temp = new wxTextCtrl(m_parent, wxID_ANY, text_value, wxDefaultPosition, size, style);
#ifdef __WXOSX__
temp->OSXDisableAllSmartSubstitutions();
#endif // __WXOSX__
temp->SetToolTip(get_tooltip_text(text_value));

6
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View file

@ -390,13 +390,13 @@ void ObjectManipulation::update_if_dirty()
m_cache.size = m_new_size;
if (m_cache.rotation(0) != m_new_rotation(0))
m_og->set_value("rotation_x", double_to_string(round_nearest(Geometry::rad2deg(m_new_rotation(0)), 0), 2));
m_og->set_value("rotation_x", double_to_string(Geometry::rad2deg(m_new_rotation(0)), 2));
if (m_cache.rotation(1) != m_new_rotation(1))
m_og->set_value("rotation_y", double_to_string(round_nearest(Geometry::rad2deg(m_new_rotation(1)), 0), 2));
m_og->set_value("rotation_y", double_to_string(Geometry::rad2deg(m_new_rotation(1)), 2));
if (m_cache.rotation(2) != m_new_rotation(2))
m_og->set_value("rotation_z", double_to_string(round_nearest(Geometry::rad2deg(m_new_rotation(2)), 0), 2));
m_og->set_value("rotation_z", double_to_string(Geometry::rad2deg(m_new_rotation(2)), 2));
m_cache.rotation = m_new_rotation;

4
src/slic3r/GUI/MainFrame.cpp
View file

@ -220,6 +220,10 @@ bool MainFrame::can_delete_all() const
void MainFrame::init_menubar()
{
#ifdef __APPLE__
wxMenuBar::SetAutoWindowMenu(false);
#endif
// File menu
wxMenu* fileMenu = new wxMenu;
{

3
src/slic3r/GUI/PrintHostDialogs.cpp
View file

@ -93,7 +93,8 @@ PrintHostQueueDialog::PrintHostQueueDialog(wxWindow *parent)
{
enum { HEIGHT = 800, WIDTH = 400, SPACING = 5 };
SetMinSize(wxSize(HEIGHT, WIDTH));
SetSize(wxSize(HEIGHT, WIDTH));
SetSize(GetMinSize());
auto *topsizer = new wxBoxSizer(wxVERTICAL);