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

Fix of #4428

Browse source 
Don't update a visibility of the collapse_toolbar: if sidebar is collapsed and "show_collapse_button" doesn't have "true" value

 + Fixed typos in the Preferences.cpp
This commit is contained in:
YuSanka 2020-06-24 11:29:09 +02:00
parent f5c7034f47
commit 990bfc0d76
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2087,9 +2087,6 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
// collapse sidebar according to saved value // collapse sidebar according to saved value
bool is_collapsed = wxGetApp().app_config->get("collapsed_sidebar") == "1"; bool is_collapsed = wxGetApp().app_config->get("collapsed_sidebar") == "1";
sidebar->collapse(is_collapsed); sidebar->collapse(is_collapsed);
// Update an enable of the collapse_toolbar: if sidebar is collapsed, then collapse_toolbar should be visible
if (is_collapsed)
wxGetApp().app_config->set("show_collapse_button", "1");
} }
Plater::priv::~priv() Plater::priv::~priv()

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

@ -161,7 +161,7 @@ void PreferencesDialog::build()
} }
}; };
def.label = L("Show the button for the collapse sidebar"); def.label = L("Show sidebar collapse/expand button");
def.type = coBool; def.type = coBool;
def.tooltip = L("If enabled, the button for the collapse sidebar will be appeared in top right corner of the 3D Scene"); def.tooltip = L("If enabled, the button for the collapse sidebar will be appeared in top right corner of the 3D Scene");
def.set_default_value(new ConfigOptionBool{ app_config->get("show_collapse_button") == "1" }); def.set_default_value(new ConfigOptionBool{ app_config->get("show_collapse_button") == "1" });
@ -353,9 +353,9 @@ void PreferencesDialog::create_icon_size_slider()
void PreferencesDialog::create_settings_mode_widget() void PreferencesDialog::create_settings_mode_widget()
{ {
wxString choices[] = { _L("Old regular layout with tab bar"), wxString choices[] = { _L("Old regular layout with the tab bar"),
_L("New layout without the tab bar on the platter"), _L("New layout without the tab bar on the plater"),
_L("Settings will be shown in non-modal dialog") }; _L("Settings will be shown in the non-modal dialog") };
auto app_config = get_app_config(); auto app_config = get_app_config();
int selection = app_config->get("old_settings_layout_mode") == "1" ? 0 : int selection = app_config->get("old_settings_layout_mode") == "1" ? 0 :