mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:cannot input 'L' in custom gcode dialog 

Change-Id: Ib30420fdb57816d4e8e3a6cd7b327c09737f3b86
(cherry picked from commit 71278d55c410bb36210d7aaa8e938ae5bfddbbcf)
This commit is contained in:
liz.li 2022-10-12 14:54:17 +08:00 committed by Lane.Wei
parent bea9a0854e
commit ca4db188ea
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/slic3r/GUI/GUI_Preview.cpp
View File

@ -506,7 +506,8 @@ void Preview::update_layers_slider_from_canvas(wxKeyEvent &event)
IMSlider *m_layers_slider = m_canvas->get_gcode_viewer().get_layers_slider();
IMSlider *m_moves_slider = m_canvas->get_gcode_viewer().get_moves_slider();
if (key == 'L') {
m_layers_slider->switch_one_layer_mode();
if(!m_layers_slider->switch_one_layer_mode())
event.Skip();
m_canvas->set_as_dirty();
}
/*else if (key == WXK_SHIFT)

6
src/slic3r/GUI/IMSlider.cpp
View File

@ -705,8 +705,11 @@ bool IMSlider::check_ticks_changed_event(Type type)
// switch on/off one layer mode
void IMSlider::switch_one_layer_mode()
bool IMSlider::switch_one_layer_mode()
{
if (m_show_custom_gcode_window)
return false;
m_is_one_layer = !m_is_one_layer;
if (!m_is_one_layer) {
SetLowerValue(m_min_value);
@ -715,6 +718,7 @@ void IMSlider::switch_one_layer_mode()
m_selection == ssLower ? correct_lower_value() : correct_higher_value();
if (m_selection == ssUndef) m_selection = ssHigher;
set_as_dirty();
return true;
}
void IMSlider::draw_background(const ImRect& groove) {

2
src/slic3r/GUI/IMSlider.hpp
View File

@ -265,7 +265,7 @@ public:
void add_code_as_tick(Type type, int selected_extruder = -1);
void post_ticks_changed_event(Type type = Custom);
bool check_ticks_changed_event(Type type);
void switch_one_layer_mode();
bool switch_one_layer_mode();
bool render(int canvas_width, int canvas_height);