diff options
author | YuSanka <yusanka@gmail.com> | 2018-11-22 17:12:09 +0300 |
---|---|---|
committer | YuSanka <yusanka@gmail.com> | 2018-11-22 18:09:28 +0300 |
commit | 9d7b4ce41dd02c09880fe41031f9f2911f786502 (patch) | |
tree | bf53cf9555151ce2985a0020ec7be163f11aeede /src/slic3r/GUI/OptionsGroup.cpp | |
parent | 7041e2b877658b2ea2675f4506e0b86738d9e3c5 (diff) |
Position(Displacement)/Rotation/Scale for group selection
Diffstat (limited to 'src/slic3r/GUI/OptionsGroup.cpp')
-rw-r--r-- | src/slic3r/GUI/OptionsGroup.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index 4d70d529e..6f8b9c65c 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -106,7 +106,7 @@ void OptionsGroup::add_undo_buttuns_to_sizer(wxSizer* sizer, const t_field& fiel sizer->Add(field->m_Undo_btn, 0, wxALIGN_CENTER_VERTICAL); } -void OptionsGroup::append_line(const Line& line, wxStaticText** colored_Label/* = nullptr*/) { +void OptionsGroup::append_line(const Line& line, wxStaticText** full_Label/* = nullptr*/) { //! if (line.sizer != nullptr || (line.widget != nullptr && line.full_width > 0)) { if ( (line.sizer != nullptr || line.widget != nullptr) && line.full_width) { if (line.sizer != nullptr) { @@ -191,12 +191,13 @@ void OptionsGroup::append_line(const Line& line, wxStaticText** colored_Label/* label->SetToolTip(line.label_tooltip); } + if (full_Label != nullptr) + *full_Label = label; // Initiate the pointer to the control of the full label, if we need this one. // If there's a widget, build it and add the result to the sizer. if (line.widget != nullptr) { auto wgt = line.widget(parent()); // If widget doesn't have label, don't use border grid_sizer->Add(wgt, 0, wxEXPAND | wxBOTTOM | wxTOP, (wxOSX || line.label.IsEmpty()) ? 0 : 5); - if (colored_Label != nullptr) *colored_Label = label; return; } |