Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuSanka <yusanka@gmail.com>2020-09-24 16:41:48 +0300
committerYuSanka <yusanka@gmail.com>2020-09-24 16:41:48 +0300
commit8fb3a44a4e293ca01eb897a5706ef8283c8c9770 (patch)
tree5ba6db5c8a10fdf2c5b88642c270f96898961032 /src/slic3r/GUI/OptionsGroup.cpp
parent52e605069844c02113c93d30f2306c4fb6e2970c (diff)
Fixed highlighting of the searched option
+ Create controls only on the shown and active tab + Line class : deleted unused sizer + In GUI_Utils added TaskTimer class for the print a time of some task duration + BedShapeDialog:: activated options_groups + commented some unused code
Diffstat (limited to 'src/slic3r/GUI/OptionsGroup.cpp')
-rw-r--r--src/slic3r/GUI/OptionsGroup.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp
index d96b0565a..13c577662 100644
--- a/src/slic3r/GUI/OptionsGroup.cpp
+++ b/src/slic3r/GUI/OptionsGroup.cpp
@@ -138,7 +138,6 @@ void OptionsGroup::append_line(const Line& line)
m_lines.emplace_back(line);
if (line.full_width && (
- line.sizer != nullptr ||
line.widget != nullptr ||
!line.get_extra_widgets().empty())
)
@@ -156,14 +155,9 @@ void OptionsGroup::append_line(const Line& line)
void OptionsGroup::activate_line(Line& line)
{
if (line.full_width && (
- line.sizer != nullptr ||
line.widget != nullptr ||
!line.get_extra_widgets().empty())
) {
- if (line.sizer != nullptr) {
- sizer->Add(line.sizer, 0, wxEXPAND | wxALL, wxOSX ? 0 : 15);
- return;
- }
if (line.widget != nullptr) {
sizer->Add(line.widget(this->ctrl_parent()), 0, wxEXPAND | wxALL, wxOSX ? 0 : 15);
return;
@@ -585,7 +579,7 @@ bool ConfigOptionsGroup::is_visible(ConfigOptionMode mode)
bool ConfigOptionsGroup::update_visibility(ConfigOptionMode mode)
{
- if (m_options_mode.empty())
+ if (m_options_mode.empty() || !m_grid_sizer)
return true;
int opt_mode_size = m_options_mode.size();
if (m_grid_sizer->GetEffectiveRowsCount() != opt_mode_size &&