From 3205961655e5a60cbdf692a51f60e55c6b9941b2 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Fri, 11 Jan 2019 16:32:16 +0100 Subject: [PATCH 1/5] Use OSXDisableAllSmartSubstitutions() for TextCtrl field under OSX --- src/slic3r/GUI/Field.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 817de5d4f..2af2dc27d 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -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)); From c63aff6dda9fcb35049b70998e18b9b041159b3f Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Fri, 11 Jan 2019 17:05:57 +0100 Subject: [PATCH 2/5] Build: Fix deployment target on Mac #1421 --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2677824c..fd8a27e86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -113,10 +113,12 @@ if(WIN32) endif() if (APPLE) - if (NOT CMAKE_OSX_DEPLOYMENT_TARGET) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "OS X Deployment target (SDK version)" FORCE) + message("OS X SDK Path: ${CMAKE_OSX_SYSROOT}") + if (CMAKE_OSX_DEPLOYMENT_TARGET) + message("OS X Deployment Target: ${CMAKE_OSX_DEPLOYMENT_TARGET}") + else () + message("OS X Deployment Target: (default)") endif () - message(STATUS "Mac OS deployment target (SDK version): ${CMAKE_OSX_DEPLOYMENT_TARGET}") endif () if (CMAKE_SYSTEM_NAME STREQUAL "Linux") From 201d7aa5e85797808535dd7098697b3dd2e7f470 Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Fri, 11 Jan 2019 17:06:46 +0100 Subject: [PATCH 3/5] Mac: Disable auto window menu, fix upload queue window size --- src/slic3r/GUI/MainFrame.cpp | 4 ++++ src/slic3r/GUI/PrintHostDialogs.cpp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index e7b44aab0..bea46682f 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -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; { diff --git a/src/slic3r/GUI/PrintHostDialogs.cpp b/src/slic3r/GUI/PrintHostDialogs.cpp index c2a94181e..5790823a1 100644 --- a/src/slic3r/GUI/PrintHostDialogs.cpp +++ b/src/slic3r/GUI/PrintHostDialogs.cpp @@ -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); From 801cf8451736f7e26b534420241c174d7269ae1e Mon Sep 17 00:00:00 2001 From: Vojtech Kral Date: Fri, 11 Jan 2019 17:14:18 +0100 Subject: [PATCH 4/5] doc: Fix a typo --- doc/How to build - Linux et al.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/How to build - Linux et al.md b/doc/How to build - Linux et al.md index e665cd14c..1378d903a 100644 --- a/doc/How to build - Linux et al.md +++ b/doc/How to build - Linux et al.md @@ -17,7 +17,7 @@ where `N` is the number of CPU cores available. Additional CMake flags may be applicable as explained below. -### Dependenciy resolution +### Dependency resolution By default Slic3r looks for dependencies the default way CMake looks for them, ie. in default system locations. On Linux this will typically make Slic3r depend on dynamically loaded libraries from the system, however, Slic3r can be told From b82a9d90903209108bd2eed0d7d960ceb2271059 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Fri, 11 Jan 2019 17:17:23 +0100 Subject: [PATCH 5/5] Fix of #1619 --- src/slic3r/GUI/GUI_ObjectManipulation.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp index dbf429f96..7c6ac111a 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp @@ -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;