From ac4730bc7ed422dbd761979a6a3d033af15af0bd Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 2 Sep 2019 16:46:37 +0200 Subject: [PATCH] Fix of SPE-1015 (Colorchange doesn't work correct on last and first layers) --- src/slic3r/GUI/wxExtensions.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 79116dfc8..a41bb1147 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -2218,7 +2218,8 @@ void DoubleSlider::SetTicksValues(const std::vector& heights) for (auto h : heights) { while (i < m_values.size() && m_values[i].second - 1e-6 < h) ++i; - if (i == m_values.size()) + // don't miss last layer if it is + if (i == m_values.size() && fabs(m_values[i-1].second - h) > EPSILON) return; m_ticks.insert(i-1); } @@ -2293,6 +2294,10 @@ void DoubleSlider::draw_action_icon(wxDC& dc, const wxPoint pt_beg, const wxPoin { const int tick = m_selection == ssLower ? m_lower_value : m_higher_value; + // suppress add tick on first layer + if (tick == 0) + return; + wxBitmap* icon = m_is_action_icon_focesed ? &m_bmp_add_tick_off.bmp() : &m_bmp_add_tick_on.bmp(); if (m_ticks.find(tick) != m_ticks.end()) icon = m_is_action_icon_focesed ? &m_bmp_del_tick_off.bmp() : &m_bmp_del_tick_on.bmp();