3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-23 06:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added a deactivate() function to Tab so when switching tabs it hides … (#5386)

Browse source 
Added a deactivate() function to Tab so when switching tabs it hides the active contents. Also removed clearing of the pages so it's not destroyed each time.

Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
A Koolen-Bourke 2024-05-20 02:20:08 +12:00 • committed by GitHub
parent 01213e58b0
commit 7a335590e2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/slic3r/GUI/Tab.cpp
View file

@ -5199,6 +5199,10 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event)
if (m_active_page == page) if (m_active_page == page)
return false; return false;
if (m_active_page != nullptr) {
m_active_page->deactivate();
}
m_active_page = page; m_active_page = page;
auto throw_if_canceled = std::function<void()>([this](){ auto throw_if_canceled = std::function<void()>([this](){
@ -5216,8 +5220,6 @@ bool Tab::tree_sel_change_delayed(wxCommandEvent& event)
try { try {
m_page_view->Freeze(); m_page_view->Freeze();
// clear pages from the controls
clear_pages();
throw_if_canceled(); throw_if_canceled();
//BBS: GUI refactor //BBS: GUI refactor
@ -5922,6 +5924,13 @@ void Page::activate(ConfigOptionMode mode, std::function<void()> throw_if_cancel
#endif #endif
} }
void Page::deactivate()
{
for (auto group : m_optgroups) {
group->Hide();
}
}
void Page::clear() void Page::clear()
{ {
for (auto group : m_optgroups) for (auto group : m_optgroups)

1
src/slic3r/GUI/Tab.hpp
View file

@ -104,6 +104,7 @@ public:
void reload_config(); void reload_config();
void update_visibility(ConfigOptionMode mode, bool update_contolls_visibility); void update_visibility(ConfigOptionMode mode, bool update_contolls_visibility);
void activate(ConfigOptionMode mode, std::function<void()> throw_if_canceled); void activate(ConfigOptionMode mode, std::function<void()> throw_if_canceled);
void deactivate();
void clear(); void clear();
void msw_rescale(); void msw_rescale();
void sys_color_changed(); void sys_color_changed();