diff options
| author | YuSanka <yusanka@gmail.com> | 2020-02-13 17:28:04 +0300 |
|---|---|---|
| committer | YuSanka <yusanka@gmail.com> | 2020-02-14 11:52:27 +0300 |
| commit | 1399696b042358b70a5835ec4611de3bd0857149 (patch) | |
| tree | 751949da84e1efc234afdd45658d5504f9eb590b /src/slic3r/GUI/OptionsGroup.cpp | |
| parent | f8c5855d559e175f28464d574c9173ef175368a8 (diff) | |
DoubleSlider: Suppressed manipulation for sequential print.
+ some code refactoring
+ experiment with alignment of several options inside the Line
Diffstat (limited to 'src/slic3r/GUI/OptionsGroup.cpp')
| -rw-r--r-- | src/slic3r/GUI/OptionsGroup.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index 4e964ff74..444f92bf7 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -129,8 +129,11 @@ 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) + if (option_set.size() > 1) { sidetext_width = Field::def_width_thinner(); + if (m_show_modified_btns) // means that options groups are in tabs + sublabel_width = Field::def_width(); + } // add mode value for current line to m_options_mode if (!option_set.empty()) @@ -248,15 +251,16 @@ void OptionsGroup::append_line(const Line& line, wxStaticText** full_Label/* = n ConfigOptionDef option = opt.opt; wxSizer* sizer_tmp = sizer; // add label if any - if (option.label != "") { + if (!option.label.empty()) { //! To correct translation by context have to use wxGETTEXT_IN_CONTEXT macro from wxWidget 3.1.1 wxString str_label = (option.label == L_CONTEXT("Top", "Layers") || option.label == L_CONTEXT("Bottom", "Layers")) ? _CTX(option.label, "Layers") : _(option.label); - label = new wxStaticText(this->ctrl_parent(), wxID_ANY, str_label + ": ", wxDefaultPosition, wxDefaultSize); + label = new wxStaticText(this->ctrl_parent(), wxID_ANY, str_label + ": ", wxDefaultPosition, //wxDefaultSize); + wxSize(sublabel_width != -1 ? sublabel_width * wxGetApp().em_unit() : -1, -1), wxALIGN_RIGHT); label->SetBackgroundStyle(wxBG_STYLE_PAINT); label->SetFont(wxGetApp().normal_font()); - sizer_tmp->Add(label, 0, /*wxALIGN_RIGHT |*/ wxALIGN_CENTER_VERTICAL, 0); + sizer_tmp->Add(label, 0, wxALIGN_CENTER_VERTICAL, 0); } // add field |