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

Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

Browse source
This commit is contained in:
enricoturri1966 2020-05-25 07:07:49 +02:00
commit ed252f1741
24 changed files with 209 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/Plater.cpp
View file

@ -773,7 +773,9 @@ Sidebar::Sidebar(Plater *parent)
p->scrolled->SetScrollbars(0, 100, 1, 2);
SetFont(wxGetApp().normal_font());
#ifndef __APPLE__
SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
#endif
// Sizer in the scrolled area
auto *scrolled_sizer = new wxBoxSizer(wxVERTICAL);
@ -1110,7 +1112,7 @@ void Sidebar::sys_color_changed()
p->object_list->sys_color_changed();
p->object_manipulation->sys_color_changed();
// p->object_settings->msw_rescale();
// p->object_layers->msw_rescale();
p->object_layers->sys_color_changed();
// btn...->msw_rescale() updates icon on button, so use it
p->btn_send_gcode->msw_rescale();
@ -4382,7 +4384,7 @@ void Sidebar::set_btn_label(const ActionButtonType btn_type, const wxString& lab
// Plater / Public
Plater::Plater(wxWindow *parent, MainFrame *main_frame)
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxSize(76 * wxGetApp().em_unit(), 49 * wxGetApp().em_unit()))
: wxPanel(parent, wxID_ANY, wxDefaultPosition, wxGetApp().get_min_size())
, p(new priv(this, main_frame))
{
// Initialization performed in the private c-tor