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 remote-tracking branch 'origin/dev_native' into tm_sla_supports_backend

Browse source 
# Conflicts:
#	src/libslic3r/SLAPrint.hpp
This commit is contained in:
tamasmeszaros 2018-11-13 17:50:17 +01:00
commit 9a93b1d3e9
19 changed files with 441 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -482,18 +482,16 @@ ConfigMenuIDs GUI_App::get_view_mode()
// Update view mode according to selected menu
void GUI_App::update_mode()
{
wxWindowUpdateLocker noUpdates(mainframe->m_plater);
wxWindowUpdateLocker noUpdates(&sidebar());
ConfigMenuIDs mode = wxGetApp().get_view_mode();
obj_list()->get_sizer()->Show(mode == ConfigMenuModeExpert);
sidebar().show_info_sizer(mode == ConfigMenuModeExpert);
sidebar().set_mode_value(mode);
sidebar().show_buttons(mode == ConfigMenuModeExpert);
obj_manipul()->show_object_name(mode == ConfigMenuModeSimple);
obj_list()->update_manipulation_sizer(mode == ConfigMenuModeSimple);
obj_list()->update_selections();
sidebar().Layout();
mainframe->m_plater->Layout();
ConfigOptionMode opt_mode = mode == ConfigMenuModeSimple ? comSimple :
mode == ConfigMenuModeExpert ? comExpert : comAdvanced;