diff --git a/resources/icons/down_half_circle.png b/resources/icons/down_half_circle.png index 84aba5c3c..f86a2932c 100644 Binary files a/resources/icons/down_half_circle.png and b/resources/icons/down_half_circle.png differ diff --git a/resources/icons/left_half_circle.png b/resources/icons/left_half_circle.png index c1e8d3a9c..3bdc4c3ee 100644 Binary files a/resources/icons/left_half_circle.png and b/resources/icons/left_half_circle.png differ diff --git a/resources/icons/one_layer_lock_off.png b/resources/icons/one_layer_lock_off.png index 7dc8b0611..f6e61d058 100644 Binary files a/resources/icons/one_layer_lock_off.png and b/resources/icons/one_layer_lock_off.png differ diff --git a/resources/icons/one_layer_lock_on.png b/resources/icons/one_layer_lock_on.png index 41b7ff173..011099972 100644 Binary files a/resources/icons/one_layer_lock_on.png and b/resources/icons/one_layer_lock_on.png differ diff --git a/resources/icons/one_layer_unlock_off.png b/resources/icons/one_layer_unlock_off.png index c3931f8b9..46fabfb05 100644 Binary files a/resources/icons/one_layer_unlock_off.png and b/resources/icons/one_layer_unlock_off.png differ diff --git a/resources/icons/one_layer_unlock_on.png b/resources/icons/one_layer_unlock_on.png index 99e0db5c2..265b92610 100644 Binary files a/resources/icons/one_layer_unlock_on.png and b/resources/icons/one_layer_unlock_on.png differ diff --git a/resources/icons/right_half_circle.png b/resources/icons/right_half_circle.png index 9f182b0b4..ecc8980b3 100644 Binary files a/resources/icons/right_half_circle.png and b/resources/icons/right_half_circle.png differ diff --git a/resources/icons/up_half_circle.png b/resources/icons/up_half_circle.png index 9eea07fda..aac6e32c3 100644 Binary files a/resources/icons/up_half_circle.png and b/resources/icons/up_half_circle.png differ diff --git a/xs/src/slic3r/GUI/wxExtensions.cpp b/xs/src/slic3r/GUI/wxExtensions.cpp index 8ee7881e3..a8ed45e07 100644 --- a/xs/src/slic3r/GUI/wxExtensions.cpp +++ b/xs/src/slic3r/GUI/wxExtensions.cpp @@ -750,8 +750,12 @@ unsigned int PrusaObjectDataViewModel::GetChildren(const wxDataViewItem &parent, return count; } -// ************************************** EXPERIMENTS *************************************** -PrusaDoubleSlider::PrusaDoubleSlider( wxWindow *parent, + +// ---------------------------------------------------------------------------- +// PrusaDoubleSlider +// ---------------------------------------------------------------------------- + +PrusaDoubleSlider::PrusaDoubleSlider(wxWindow *parent, wxWindowID id, int lowerValue, int higherValue, @@ -1449,5 +1453,9 @@ void PrusaLockButton::enter_button(const bool enter) Update(); } +// ************************************** EXPERIMENTS *************************************** + // ***************************************************************************** + + diff --git a/xs/src/slic3r/GUI/wxExtensions.hpp b/xs/src/slic3r/GUI/wxExtensions.hpp index 465101e3f..62e4f4f15 100644 --- a/xs/src/slic3r/GUI/wxExtensions.hpp +++ b/xs/src/slic3r/GUI/wxExtensions.hpp @@ -495,7 +495,12 @@ public: private: wxString m_value; }; -// ******************************* EXPERIMENTS ********************************************** + + +// ---------------------------------------------------------------------------- +// PrusaDoubleSlider +// ---------------------------------------------------------------------------- + enum SelectedSlider { ssUndef, ssLower, @@ -670,6 +675,9 @@ private: int m_lock_icon_dim; }; + + +// ******************************* EXPERIMENTS ********************************************** // ******************************************************************************************