3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Modified rendering of DoubleSlider::Control when disabled

Browse source
This commit is contained in:
enricoturri1966 2020-10-08 12:50:29 +02:00
parent cf013d5ab3
commit 3fdc48452e
2 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/slic3r/GUI/DoubleSlider.cpp
View file

@ -447,26 +447,29 @@ void Control::render()
// and only in a case of no-empty m_values
draw_colored_band(dc);
// draw line
draw_scroll_line(dc, lower_pos, higher_pos);
if (this->IsEnabled()) {
// draw line
draw_scroll_line(dc, lower_pos, higher_pos);
// draw color print ticks
draw_ticks(dc);
// draw color print ticks
draw_ticks(dc);
// draw both sliders
draw_thumbs(dc, lower_pos, higher_pos);
// draw both sliders
draw_thumbs(dc, lower_pos, higher_pos);
// draw lock/unlock
draw_one_layer_icon(dc);
// draw revert bitmap (if it's shown)
draw_revert_icon(dc);
// draw lock/unlock
draw_one_layer_icon(dc);
// draw cog bitmap (if it's shown)
draw_cog_icon(dc);
// draw revert bitmap (if it's shown)
draw_revert_icon(dc);
// draw mouse position
draw_tick_on_mouse_position(dc);
// draw cog bitmap (if it's shown)
draw_cog_icon(dc);
// draw mouse position
draw_tick_on_mouse_position(dc);
}
}
void Control::draw_action_icon(wxDC& dc, const wxPoint pt_beg, const wxPoint pt_end)

4
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -1173,8 +1173,10 @@ void Preview::update_moves_slider()
void Preview::enable_moves_slider(bool enable)
{
if (m_moves_slider != nullptr)
if (m_moves_slider != nullptr && m_moves_slider->IsEnabled() != enable) {
m_moves_slider->Enable(enable);
m_moves_slider->Refresh();
}
}
#else
void Preview::update_double_slider_from_canvas(wxKeyEvent & event)