3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed sidebar layouts for selected "Object" and "Layers" items in ObjectList

Browse source
This commit is contained in:
YuSanka 2019-09-04 09:24:44 +02:00
parent 6b95c579af
commit db2319cb5c
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/slic3r/GUI/GUI_ObjectLayers.cpp
View file

@ -135,7 +135,7 @@ wxSizer* ObjectLayers::create_layer(const t_layer_height_range& range)
auto temp = new wxStaticText(m_parent, wxID_ANY, _(L("mm"))); auto temp = new wxStaticText(m_parent, wxID_ANY, _(L("mm")));
temp->SetBackgroundStyle(wxBG_STYLE_PAINT); temp->SetBackgroundStyle(wxBG_STYLE_PAINT);
temp->SetFont(wxGetApp().normal_font()); temp->SetFont(wxGetApp().normal_font());
sizer->Add(temp, 0, wxLEFT|wxRIGHT, wxGetApp().em_unit()); sizer->Add(temp, 0, wxLEFT, wxGetApp().em_unit());
m_grid_sizer->Add(sizer); m_grid_sizer->Add(sizer);
@ -154,16 +154,16 @@ void ObjectLayers::create_layers_list()
sizer->Add(del_btn, 0, wxRIGHT | wxLEFT, em_unit(m_parent)); sizer->Add(del_btn, 0, wxRIGHT | wxLEFT, em_unit(m_parent));
del_btn->Bind(wxEVT_BUTTON, [this, range](wxEvent &event) { del_btn->Bind(wxEVT_BUTTON, [range](wxEvent &) {
wxGetApp().obj_list()->del_layer_range(range); wxGetApp().obj_list()->del_layer_range(range);
}); });
auto add_btn = new ScalableButton(m_parent, wxID_ANY, m_bmp_add); auto add_btn = new ScalableButton(m_parent, wxID_ANY, m_bmp_add);
add_btn->SetToolTip(_(L("Add layer range"))); add_btn->SetToolTip(_(L("Add layer range")));
sizer->Add(add_btn, 0, wxRIGHT, em_unit(m_parent)); sizer->Add(add_btn);
add_btn->Bind(wxEVT_BUTTON, [this, range](wxEvent &event) { add_btn->Bind(wxEVT_BUTTON, [range](wxEvent &) {
wxGetApp().obj_list()->add_layer_range_after_current(range); wxGetApp().obj_list()->add_layer_range_after_current(range);
}); });
} }

8
src/slic3r/GUI/GUI_ObjectManipulation.cpp
View file

@ -625,6 +625,14 @@ void ObjectManipulation::update_reset_buttons_visibility()
m_reset_rotation_button->Show(show_rotation); m_reset_rotation_button->Show(show_rotation);
m_reset_scale_button->Show(show_scale); m_reset_scale_button->Show(show_scale);
m_drop_to_bed_button->Show(show_drop_to_bed); m_drop_to_bed_button->Show(show_drop_to_bed);
// Because of CallAfter we need to layout sidebar after Show/hide of reset buttons one more time
Sidebar& panel = wxGetApp().sidebar();
if (!panel.IsFrozen()) {
panel.Freeze();
panel.Layout();
panel.Thaw();
}
}); });
} }