3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

DoubleSlider improvement

Browse source 
+ added thicks selection by mouse in the DoubleSlider
 + Click on the Unlock icon on DoubleSlider => set Min and Max slider values
This commit is contained in:
YuSanka 2018-11-27 11:08:34 +01:00
parent 3f0ea223d1
commit db4ceaa5fa
2 changed files with 39 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/slic3r/GUI/wxExtensions.cpp
View file

@ -1754,6 +1754,23 @@ bool PrusaDoubleSlider::is_point_in_rect(const wxPoint& pt, const wxRect& rect)
return false;
}
int PrusaDoubleSlider::is_point_near_tick(const wxPoint& pt)
{
for (auto tick : m_ticks) {
const wxCoord pos = get_position_from_value(tick);
if (is_horizontal()) {
if (pos - 4 <= pt.x && pt.x <= pos + 4)
return tick;
}
else {
if (pos - 4 <= pt.y && pt.y <= pos + 4)
return tick;
}
}
return -1;
}
void PrusaDoubleSlider::ChangeOneLayerLock()
{
m_is_one_layer = !m_is_one_layer;
@ -1781,12 +1798,33 @@ void PrusaDoubleSlider::OnLeftDown(wxMouseEvent& event)
m_is_left_down = true;
if (is_point_in_rect(pos, m_rect_one_layer_icon)) {
m_is_one_layer = !m_is_one_layer;
if (!m_is_one_layer) {
SetLowerValue(m_min_value);
SetHigherValue(m_max_value);
}
m_selection == ssLower ? correct_lower_value() : correct_higher_value();
if (!m_selection) m_selection = ssHigher;
}
else
detect_selected_slider(pos);
if (!m_selection) {
const auto tick = is_point_near_tick(pos);
if (tick >= 0)
{
if (abs(tick - m_lower_value) < abs(tick - m_higher_value)) {
SetLowerValue(tick);
correct_lower_value();
m_selection = ssLower;
}
else {
SetHigherValue(tick);
correct_higher_value();
m_selection = ssHigher;
}
}
}
Refresh();
Update();
event.Skip();