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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/MainFrame.cpp
View file

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

1
src/slic3r/GUI/Monitor.cpp
View file

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

4
src/slic3r/GUI/Notebook.hpp
View file

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

3
src/slic3r/GUI/Tabbook.hpp
View file

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