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

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

Browse Source
This commit is contained in:
Enrico Turri 2020-03-02 11:42:10 +01:00
commit de77328320
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/GUI_ObjectList.cpp
View File

@ -289,6 +289,7 @@ void ObjectList::create_objects_ctrl()
GetColumn(colName)->SetWidth(20*em); GetColumn(colName)->SetWidth(20*em);
GetColumn(colPrint)->SetWidth(3*em); GetColumn(colPrint)->SetWidth(3*em);
GetColumn(colExtruder)->SetWidth(8*em); GetColumn(colExtruder)->SetWidth(8*em);
GetColumn(colEditing) ->SetWidth(7*em);
} }
} }

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

@ -129,7 +129,8 @@ void OptionsGroup::append_line(const Line& line, wxStaticText** full_Label/* = n
m_options.emplace(opt.opt_id, opt); m_options.emplace(opt.opt_id, opt);
// Set sidetext width for a better alignment of options in line // Set sidetext width for a better alignment of options in line
if (option_set.size() > 1) { // "m_show_modified_btns==true" means that options groups are in tabs
if (option_set.size() > 1 && m_show_modified_btns) {
sidetext_width = Field::def_width_thinner(); sidetext_width = Field::def_width_thinner();
/* Temporary commented till UI-review will be completed /* Temporary commented till UI-review will be completed
if (m_show_modified_btns) // means that options groups are in tabs if (m_show_modified_btns) // means that options groups are in tabs