From 9dc6699229246406269c502237da5b78303eefb8 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Mon, 20 May 2019 12:29:14 +0200 Subject: [PATCH 1/2] Eliminate some warnings --- src/libslic3r/SLA/SLASupportTree.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libslic3r/SLA/SLASupportTree.cpp b/src/libslic3r/SLA/SLASupportTree.cpp index 1e139ebfb..cb2001024 100644 --- a/src/libslic3r/SLA/SLASupportTree.cpp +++ b/src/libslic3r/SLA/SLASupportTree.cpp @@ -757,8 +757,8 @@ public: template inline const Pillar& pillar(T id) const { static_assert(std::is_integral::value, "Invalid index type"); - assert(id >= 0 && id < m_pillars.size() && - id < std::numeric_limits::max()); + assert(id >= 0 && size_t(id) < m_pillars.size() && + size_t(id) < std::numeric_limits::max()); return m_pillars[size_t(id)]; } From 951f9c1dab7c3ce72d9ae67ce9b90b7bf22632b1 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Mon, 20 May 2019 13:52:58 +0200 Subject: [PATCH 2/2] Reset tooltip in objects list when no item is hovered --- src/slic3r/GUI/GUI_ObjectList.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index 4f7efb849..0e69fc3e6 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -297,13 +297,18 @@ void ObjectList::set_tooltip_for_item(const wxPoint& pt) wxDataViewItem item; wxDataViewColumn* col; HitTest(pt, item, col); - if (!item) return; /* GetMainWindow() return window, associated with wxDataViewCtrl. * And for this window we should to set tooltips. * Just this->SetToolTip(tooltip) => has no effect. */ + if (!item) + { + GetMainWindow()->SetToolTip(""); // hide tooltip + return; + } + if (col->GetTitle() == " " && GetSelectedItemsCount()<2) GetMainWindow()->SetToolTip(_(L("Right button click the icon to change the object settings"))); else if (col->GetTitle() == _("Name"))