From 7388947e1f775fd4debebc54dcfb97fef1909f53 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Mon, 2 Mar 2020 11:33:09 +0100 Subject: [PATCH] Fix of #3739 (OSX: set width of "Editing" column to avoid a column narrowing after a recreating of an application caused by a language changing) + Fix related to a bug, reported in #3617, about wrong placement of a "Purging volumes" button translated to the some languages --- src/slic3r/GUI/GUI_ObjectList.cpp | 1 + src/slic3r/GUI/OptionsGroup.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GUI_ObjectList.cpp b/src/slic3r/GUI/GUI_ObjectList.cpp index efb0dd0f9d..66c859799e 100644 --- a/src/slic3r/GUI/GUI_ObjectList.cpp +++ b/src/slic3r/GUI/GUI_ObjectList.cpp @@ -289,6 +289,7 @@ void ObjectList::create_objects_ctrl() GetColumn(colName)->SetWidth(20*em); GetColumn(colPrint)->SetWidth(3*em); GetColumn(colExtruder)->SetWidth(8*em); + GetColumn(colEditing) ->SetWidth(7*em); } } diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index f507f0e4a6..f0b108bd7e 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -129,7 +129,8 @@ void OptionsGroup::append_line(const Line& line, wxStaticText** full_Label/* = n m_options.emplace(opt.opt_id, opt); // 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(); /* Temporary commented till UI-review will be completed if (m_show_modified_btns) // means that options groups are in tabs