GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-15 20:15:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 7a335590e2770679876a898f1a4a0c3dc6ddeccf.
This commit is contained in:
SoftFever 2024-05-20 20:31:09 +08:00
parent 5914a3a042
commit f08e75efaa
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5202,10 +5202,6 @@ 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](){
@ -5223,6 +5219,8 @@ 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
@ -5927,13 +5925,6 @@ 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,7 +104,6 @@ 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();