From 16137411c4bd8f49a9de0a622d612892f79778c5 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Thu, 28 Nov 2019 16:23:21 +0100 Subject: [PATCH] Fixed icon positioning and color_band scaling for DoubleSlider under OSX --- src/slic3r/GUI/wxExtensions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/wxExtensions.cpp b/src/slic3r/GUI/wxExtensions.cpp index 4a3f05bc1..a6e2b0f64 100644 --- a/src/slic3r/GUI/wxExtensions.cpp +++ b/src/slic3r/GUI/wxExtensions.cpp @@ -2302,7 +2302,7 @@ DoubleSlider::DoubleSlider( wxWindow *parent, m_bmp_thumb_higher = (style == wxSL_HORIZONTAL ? ScalableBitmap(this, "right_half_circle.png") : ScalableBitmap(this, "thumb_up")); m_bmp_thumb_lower = (style == wxSL_HORIZONTAL ? ScalableBitmap(this, "left_half_circle.png" ) : ScalableBitmap(this, "thumb_down")); - m_thumb_size = m_bmp_thumb_lower.bmp().GetSize(); + m_thumb_size = m_bmp_thumb_lower.bmp().GetSize()*(1.0/scale_factor); m_bmp_add_tick_on = ScalableBitmap(this, "colorchange_add"); m_bmp_add_tick_off = ScalableBitmap(this, "colorchange_add_f"); @@ -2797,11 +2797,11 @@ void DoubleSlider::draw_ticks(wxDC& dc) // Draw icon for "Pause print" or "Custom Gcode" if (tick.gcode != Slic3r::ColorChangeCode && tick.gcode != Slic3r::ExtruderChangeCode) { - wxBitmap icon = create_scaled_bitmap(nullptr, tick.gcode == Slic3r::PausePrintCode ? "pause_print" : "edit_gcode"); + wxBitmap icon = create_scaled_bitmap(this, tick.gcode == Slic3r::PausePrintCode ? "pause_print" : "edit_gcode"); wxCoord x_draw, y_draw; is_horizontal() ? x_draw = pos - 0.5 * m_tick_icon_dim : y_draw = pos - 0.5 * m_tick_icon_dim; - is_horizontal() ? y_draw = mid + 22 : x_draw = mid + 22 ; + is_horizontal() ? y_draw = mid + 22 : x_draw = mid + m_thumb_size.x + 3; dc.DrawBitmap(icon, x_draw, y_draw); }