Added patch for gizmo icons while mouse hoverdebian

4 files changed, 69 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 35f30bbcb..351f82f46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-prusa-slicer (2.0-1ubuntu1ppa1) bionic; urgency=medium
+prusa-slicer (2.0.tm1-0+bionic1) bionic; urgency=medium
  
-  * Initial release of the new Prusa Slicer
+  * Provided patches for mode switching and gizmo icon size issues on Linux with wx-3.0
+  * Initial release of the new Prusa Slicer for Artful Aardavark
 
  -- Tamas Meszaros <tamas.meszaros@prusa3d.cz>  Tue, 14 May 2019 15:46:05 +0200
diff --git a/debian/copyright b/debian/copyright
index 0ded247bd..1ff3f5903 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,11 +2,8 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://github.com/prusa3d/PrusaSlicer/
 Upstream-Contact: Vojtech Bubnik <bubnikv@gmail.com>
 Upstream-Name: prusa-slicer
-Files-Excluded: src/eigen
-                src/expat
-                src/glew
-                src/avrdude/windows/*.sys
-                src/avrdude/atmel-docs
+License: AGPL-3
+Copyright: 2019, Prusa Research s.r.o <info@prusa3d.com>
 
 Files: *
 Copyright: 2011-2016, Alessandro Ranellucci <alessandro@unterwelt.it>
@@ -199,23 +196,10 @@ Files: src/Shiny/*
 Copyright: 2007-2010 Albin Abedi
 License: Expat
 
-Files: src/poly2tri/*
-Copyright: 2009-2010, Mason Green <mason.green@gmail.com>
-License: BSD-3-clause
-
 Files: src/admesh/*
 Copyright: 1995, Anthony D. Martin
 License: GPL-2+
 
-Files: src/polypartition.*
-Copyright: 2011, Ivan Fratric
-License: Expat
-
-Files: src/polypartition.cpp
-       src/polypartition.h
-Copyright: 2011, Ivan Fratric
-License: Expat
-
 Files: src/libslic3r/Geometry.cpp
 Copyright: 2010-2012, Andrii Sydorchuk
            2013-2016, Alessandro Ranellucci <alessandro@unterwelt.it>
@@ -232,6 +216,10 @@ Copyright: 2008-2015, Nigel Stewart <nigels@users.sourceforge.net>
            2002, Lev Povalahev
 License: BSL-1.0
 
+Files: src/libnest2d/*
+Copyright: 2019, Tamas Meszaros <meszaros.q@gmail.com>
+Licence: AGPL-3
+
 Files: debian/*
 Copyright: 2013, Nicolas Dandrimont <olasd@debian.org>
            2014-2016, Chow Loong Jin <hyperair@debian.org>
diff --git a/debian/patches/fix-gizmo-icon-size.patch b/debian/patches/fix-gizmo-icon-size.patch
new file mode 100644
index 000000000..31cba7cfd
--- /dev/null
+++ b/debian/patches/fix-gizmo-icon-size.patch
@@ -0,0 +1,59 @@
+diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
+index 1280fa6d9..ff2295cd7 100644
+--- a/src/slic3r/GUI/GLCanvas3D.cpp
++++ b/src/slic3r/GUI/GLCanvas3D.cpp
+@@ -4098,8 +4098,8 @@ void GLCanvas3D::_render_gizmos_overlay() const
+ #if ENABLE_RETINA_GL
+     m_gizmos.set_overlay_scale(m_retina_helper->get_scale_factor());
+ #else
+-//     m_gizmos.set_overlay_scale(m_canvas->GetContentScaleFactor());
+-    m_gizmos.set_overlay_scale(wxGetApp().em_unit()*0.1f);//! #ys_FIXME_experiment
++    const float size = int(GLGizmosManager::Default_Icons_Size*wxGetApp().toolbar_icon_scale());
++    m_gizmos.set_overlay_icon_size(size);
+ #endif /* __WXMSW__ */
+ 
+     m_gizmos.render_overlay(*this, m_selection);
+diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
+index 472abd6dc..6773dbd30 100644
+--- a/src/slic3r/GUI/GUI_App.cpp
++++ b/src/slic3r/GUI/GUI_App.cpp
+@@ -390,6 +390,27 @@ void GUI_App::set_label_clr_sys(const wxColour& clr) {
+     app_config->save();
+ }
+ 
++float GUI_App::toolbar_icon_scale(const bool is_limited/* = false*/) const
++{
++#ifdef __APPLE__
++    const float icon_sc = 1.0f; // for Retina display will be used its own scale
++#else
++    const float icon_sc = m_em_unit*0.1f;
++#endif // __APPLE__
++
++    const std::string& use_val  = app_config->get("use_custom_toolbar_size");
++    const std::string& val      = app_config->get("custom_toolbar_size");
++
++    if (val.empty() || use_val.empty() || use_val == "0")
++        return icon_sc;
++
++    int int_val = atoi(val.c_str());
++    if (is_limited && int_val < 50)
++        int_val = 50;
++
++    return 0.01f * int_val * icon_sc;
++}
++
+ void GUI_App::recreate_GUI()
+ {
+     // Weird things happen as the Paint messages are floating around the windows being destructed.
+diff --git a/src/slic3r/GUI/GUI_App.hpp b/src/slic3r/GUI/GUI_App.hpp
+index 1c9a462c6..b70f0dc16 100644
+--- a/src/slic3r/GUI/GUI_App.hpp
++++ b/src/slic3r/GUI/GUI_App.hpp
+@@ -115,6 +115,7 @@ public:
+     const wxFont&   normal_font()           { return m_normal_font; }
+     size_t          em_unit() const         { return m_em_unit; }
+     void            set_em_unit(const size_t em_unit)    { m_em_unit = em_unit; }
++    float           toolbar_icon_scale(const bool is_limited = false) const;
+ 
+     void            recreate_GUI();
+     void            system_info();
diff --git a/debian/patches/series b/debian/patches/series
index 291890d7d..cec2a2108 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 handle-wx-assert-with-boost.patch
 mode-switching-fix.patch
+fix-gizmo-icon-size.patch
 version-name.patch