mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-11 00:37:51 -06:00
DoubleSlider issues (1 & 3 from SPE-686)
+ added icon for "Keyboard shortcuts" dialog
This commit is contained in:
parent
17c2f3d813
commit
4c55f1ce9e
3 changed files with 3 additions and 2 deletions
BIN
resources/icons/Slic3r_32px.png
Normal file
BIN
resources/icons/Slic3r_32px.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
|
@ -587,7 +587,8 @@ void Preview::create_double_slider()
|
||||||
auto& config = wxGetApp().preset_bundle->project_config;
|
auto& config = wxGetApp().preset_bundle->project_config;
|
||||||
((config.option<ConfigOptionFloats>("colorprint_heights"))->values) = (m_slider->GetTicksValues());
|
((config.option<ConfigOptionFloats>("colorprint_heights"))->values) = (m_slider->GetTicksValues());
|
||||||
m_schedule_background_process();
|
m_schedule_background_process();
|
||||||
int type = m_choice_view_type->FindString(_(L("Color Print")));
|
bool color_print = !config.option<ConfigOptionFloats>("colorprint_heights")->values.empty();
|
||||||
|
int type = m_choice_view_type->FindString(color_print ? _(L("Color Print")) : _(L("Feature type")) );
|
||||||
if (m_choice_view_type->GetSelection() != type) {
|
if (m_choice_view_type->GetSelection() != type) {
|
||||||
m_choice_view_type->SetSelection(type);
|
m_choice_view_type->SetSelection(type);
|
||||||
if ((0 <= type) && (type < (int)GCodePreviewData::Extrusion::Num_View_Types))
|
if ((0 <= type) && (type < (int)GCodePreviewData::Extrusion::Num_View_Types))
|
||||||
|
|
|
@ -2043,7 +2043,7 @@ void PrusaDoubleSlider::enter_window(wxMouseEvent& event, const bool enter)
|
||||||
// - value decrease (if wxSL_HORIZONTAL)
|
// - value decrease (if wxSL_HORIZONTAL)
|
||||||
void PrusaDoubleSlider::move_current_thumb(const bool condition)
|
void PrusaDoubleSlider::move_current_thumb(const bool condition)
|
||||||
{
|
{
|
||||||
m_is_one_layer = wxGetKeyState(WXK_CONTROL);
|
// m_is_one_layer = wxGetKeyState(WXK_CONTROL);
|
||||||
int delta = condition ? -1 : 1;
|
int delta = condition ? -1 : 1;
|
||||||
if (is_horizontal())
|
if (is_horizontal())
|
||||||
delta *= -1;
|
delta *= -1;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue