amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

DoubleSlider: Changed behavior of thumbs. New rule: Only active thumb is moving to the new place.

Browse source
This commit is contained in:
YuSanka 2020-02-14 16:44:49 +01:00
parent 23732864ab
commit 860571d51d
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -821,7 +821,7 @@ void Control::draw_cog_icon(wxDC& dc)
void Control::update_thumb_rect(const wxCoord& begin_x, const wxCoord& begin_y, const SelectedSlider& selection) void Control::update_thumb_rect(const wxCoord& begin_x, const wxCoord& begin_y, const SelectedSlider& selection)
{ {
const wxRect& rect = wxRect(begin_x, begin_y, m_thumb_size.x, int(m_thumb_size.y*0.5)); const wxRect& rect = wxRect(begin_x, begin_y + (selection == ssLower ? int(m_thumb_size.y * 0.5) : 0), m_thumb_size.x, int(m_thumb_size.y*0.5));
if (selection == ssLower) if (selection == ssLower)
m_rect_lower_thumb = rect; m_rect_lower_thumb = rect;
else else
@ -839,10 +839,15 @@ int Control::get_value_from_position(const wxCoord x, const wxCoord y)
return int(m_min_value + double(height - SLIDER_MARGIN - y) / step + 0.5); return int(m_min_value + double(height - SLIDER_MARGIN - y) / step + 0.5);
} }
void Control::detect_selected_slider(const wxPoint& pt) bool Control::detect_selected_slider(const wxPoint& pt)
{ {
m_selection = is_point_in_rect(pt, m_rect_lower_thumb) ? ssLower : if (is_point_in_rect(pt, m_rect_lower_thumb))
is_point_in_rect(pt, m_rect_higher_thumb) ? ssHigher : ssUndef; m_selection = ssLower;
else if(is_point_in_rect(pt, m_rect_higher_thumb))
m_selection = ssHigher;
else
return false; // pt doesn't referenced to any thumb
return true;
} }
bool Control::is_point_in_rect(const wxPoint& pt, const wxRect& rect) bool Control::is_point_in_rect(const wxPoint& pt, const wxRect& rect)
@ -907,6 +912,9 @@ void Control::OnLeftDown(wxMouseEvent& event)
m_mouse = maRevertIconClick; m_mouse = maRevertIconClick;
} }
if (m_mouse == maNone)
detect_selected_slider(pos);
event.Skip(); event.Skip();
} }
@ -1055,11 +1063,7 @@ void Control::OnMotion(wxMouseEvent& event)
const wxPoint pos = event.GetLogicalPosition(wxClientDC(this)); const wxPoint pos = event.GetLogicalPosition(wxClientDC(this));
int tick = -1; int tick = -1;
/* Note: Checking "!m_is_one_layer" is commented now because of if (!m_is_left_down && !m_is_right_down)
* it looks like unnecessary and cause a tooltip "One layer" showing when OneLayerLock is on
* #ysFIXME : Delete it after testing
* */
if (!m_is_left_down/* && !m_is_one_layer*/)
{ {
if (is_point_in_rect(pos, m_rect_one_layer_icon)) if (is_point_in_rect(pos, m_rect_one_layer_icon))
m_focus = fiOneLayerIcon; m_focus = fiOneLayerIcon;
@ -1351,16 +1355,12 @@ void Control::OnRightDown(wxMouseEvent& event)
m_mouse = m_ticks.ticks.find(TickCode{ tick }) == m_ticks.ticks.end() ? m_mouse = m_ticks.ticks.find(TickCode{ tick }) == m_ticks.ticks.end() ?
maAddMenu : maEditMenu; maAddMenu : maEditMenu;
} }
else if (m_mode == t_mode::SingleExtruder && is_point_in_rect(pos, get_colored_band_rect())) else if (m_mode == t_mode::SingleExtruder && !detect_selected_slider(pos) && is_point_in_rect(pos, get_colored_band_rect()))
m_mouse = maForceColorEdit; m_mouse = maForceColorEdit;
else if (m_mode == t_mode::MultiAsSingle && is_point_in_rect(pos, m_rect_cog_icon)) else if (m_mode == t_mode::MultiAsSingle && is_point_in_rect(pos, m_rect_cog_icon))
m_mouse = maCogIconMenu; m_mouse = maCogIconMenu;
} }
if (m_mouse != maNone) if (m_mouse != maNone || !detect_selected_slider(pos))
return;
detect_selected_slider(pos);
if (!m_selection)
return; return;
if (m_selection == ssLower) if (m_selection == ssLower)
@ -1795,10 +1795,11 @@ void Control::move_current_thumb_to_pos(wxPoint pos)
if (mouse_val >= 0) if (mouse_val >= 0)
{ {
// if (abs(mouse_val - m_lower_value) < abs(mouse_val - m_higher_value)) { // if (abs(mouse_val - m_lower_value) < abs(mouse_val - m_higher_value)) {
if (mouse_val <= m_lower_value) { // if (mouse_val <= m_lower_value) {
if (m_selection == ssLower) {
SetLowerValue(mouse_val); SetLowerValue(mouse_val);
correct_lower_value(); correct_lower_value();
m_selection = ssLower; // m_selection = ssLower;
} }
else { else {
SetHigherValue(mouse_val); SetHigherValue(mouse_val);

2
src/slic3r/GUI/DoubleSlider.hpp
View file

@ -272,7 +272,7 @@ protected:
void draw_thumb_text(wxDC& dc, const wxPoint& pos, const SelectedSlider& selection) const; void draw_thumb_text(wxDC& dc, const wxPoint& pos, const SelectedSlider& selection) const;
void update_thumb_rect(const wxCoord& begin_x, const wxCoord& begin_y, const SelectedSlider& selection); void update_thumb_rect(const wxCoord& begin_x, const wxCoord& begin_y, const SelectedSlider& selection);
void detect_selected_slider(const wxPoint& pt); bool detect_selected_slider(const wxPoint& pt);
void correct_lower_value(); void correct_lower_value();
void correct_higher_value(); void correct_higher_value();
void move_current_thumb(const bool condition); void move_current_thumb(const bool condition);