FIX: [STUDIO-2825] ctrl + tab only switch main pages

Change-Id: I10ed43929e4b757fb7c5415ba23a78ded1f2c7d0
(cherry picked from commit 10983c4d177b772e8eda264e5a9957218f779435)
This commit is contained in:
chunmao.guo 2023-05-18 17:33:50 +08:00 committed by Lane.Wei
parent 3dc94b6f12
commit de895e573a
4 changed files with 6 additions and 6 deletions

View file

@ -962,7 +962,6 @@ void MainFrame::init_tabpanel()
else if (panel == m_monitor) {
//monitor
}
#ifndef __APPLE__
if (sel == tp3DEditor) {
m_topbar->EnableUndoRedoItems();
@ -972,6 +971,9 @@ void MainFrame::init_tabpanel()
}
#endif
if (panel)
panel->SetFocus();
/*switch (sel) {
case TabPosition::tpHome:
show_option(false);

View file

@ -202,6 +202,7 @@ MonitorPanel::~MonitorPanel()
auto title = m_tabpanel->GetPageText(m_tabpanel->GetSelection());
m_media_file_panel->SwitchStorage(title == _L("SD Card"));
}
page->SetFocus();
}, m_tabpanel->GetId());
//m_status_add_machine_panel = new AddMachinePanel(m_tabpanel);

View file

@ -30,7 +30,6 @@ public:
wxString GetPageText(size_t n) const;
private:
wxWindow* m_parent;
wxFlexGridSizer* m_buttons_sizer;
wxBoxSizer* m_sizer;
// BBS: use Button
@ -398,9 +397,6 @@ private:
unsigned m_showTimeout,
m_hideTimeout;
ButtonsListCtrl* m_ctrl{ nullptr };
};
//#endif // _WIN32
#endif // slic3r_Notebook_hpp_

View file

@ -261,7 +261,8 @@ public:
{
if (event.IsWindowChange()) {
// change pages
AdvanceSelection(event.GetDirection());
//AdvanceSelection(event.GetDirection());
this->GetGrandParent()->HandleWindowEvent(event);
}
else {
// we get this event in 3 cases