GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-18 08:35:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#845 fix CTRL + SHIFT + TAB crash & fix preference windows size

Browse Source
This commit is contained in:
remi durand 2021-01-18 02:15:28 +01:00
parent 87c671877d
commit 446cc200ce
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -866,6 +866,7 @@ boost::any ConfigOptionsGroup::get_config_value(const DynamicPrintConfig& config
case coInts: case coInts:
ret = config.option<ConfigOptionIntsNullable>(opt_key)->get_at(idx); ret = config.option<ConfigOptionIntsNullable>(opt_key)->get_at(idx);
break; break;
case coPoints:
default: default:
break; break;
} }
@ -980,8 +981,6 @@ boost::any ConfigOptionsGroup::get_config_value(const DynamicPrintConfig& config
case coPoints: case coPoints:
if (opt_key == "bed_shape") if (opt_key == "bed_shape")
ret = config.option<ConfigOptionPoints>(opt_key)->values; ret = config.option<ConfigOptionPoints>(opt_key)->values;
if (opt_key == "thumbnails")
ret = get_thumbnails_string(config.option<ConfigOptionPoints>(opt_key)->values);
else else
ret = config.option<ConfigOptionPoints>(opt_key)->get_at(idx); ret = config.option<ConfigOptionPoints>(opt_key)->get_at(idx);
break; break;

9
src/slic3r/GUI/Preferences.cpp
View File

@ -30,6 +30,7 @@ static std::shared_ptr<ConfigOptionsGroup>create_options_tab(const wxString& tit
tab->SetSizer(sizer); tab->SetSizer(sizer);
std::shared_ptr<ConfigOptionsGroup> optgroup = std::make_shared<ConfigOptionsGroup>(tab); std::shared_ptr<ConfigOptionsGroup> optgroup = std::make_shared<ConfigOptionsGroup>(tab);
optgroup->title_width = 40;
optgroup->label_width = 40; optgroup->label_width = 40;
return optgroup; return optgroup;
} }
@ -247,10 +248,11 @@ void PreferencesDialog::build()
def.tooltip = L("If it point to a valid freecad instance (the bin directory or the python executable), you can use the built-in python script to quickly generate geometry."); def.tooltip = L("If it point to a valid freecad instance (the bin directory or the python executable), you can use the built-in python script to quickly generate geometry.");
def.set_default_value(new ConfigOptionString{ app_config->get("freecad_path") }); def.set_default_value(new ConfigOptionString{ app_config->get("freecad_path") });
option = Option(def, "freecad_path"); option = Option(def, "freecad_path");
option.opt.full_width = true; //option.opt.full_width = true;
option.opt.width = 50;
m_optgroup_paths->append_single_option_line(option); m_optgroup_paths->append_single_option_line(option);
m_optgroup_paths->activate(); activate_options_tab(m_optgroup_paths);
// Add "Camera" tab // Add "Camera" tab
m_optgroup_camera = create_options_tab(_L("Camera"), tabs); m_optgroup_camera = create_options_tab(_L("Camera"), tabs);
@ -415,7 +417,8 @@ void PreferencesDialog::accept()
void PreferencesDialog::on_dpi_changed(const wxRect &suggested_rect) void PreferencesDialog::on_dpi_changed(const wxRect &suggested_rect)
{ {
m_optgroup_general->msw_rescale(); m_optgroup_general->msw_rescale();
m_optgroup_camera->msw_rescale(); m_optgroup_paths->msw_rescale();
m_optgroup_camera->msw_rescale();
m_optgroup_gui->msw_rescale(); m_optgroup_gui->msw_rescale();
msw_buttons_rescale(this, em_unit(), { wxID_OK, wxID_CANCEL }); msw_buttons_rescale(this, em_unit(), { wxID_OK, wxID_CANCEL });