haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix view switcher on Mac. 

Solution for MSW/GTK still isn't great.
This commit is contained in:
Jeff Young 2022-01-08 22:23:44 +00:00
parent 6242b40cde
commit e3328e54c4
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/pcb_base_edit_frame.cpp
View File

@ -96,8 +96,15 @@ bool PCB_BASE_EDIT_FRAME::TryBefore( wxEvent& aEvent )
static bool s_presetSwitcherShown = false; static bool s_presetSwitcherShown = false;
static bool s_viewportSwitcherShown = false; static bool s_viewportSwitcherShown = false;
if( !s_presetSwitcherShown && wxGetKeyState( WXK_RAW_CONTROL ) && !wxGetKeyState( WXK_SHIFT ) #ifdef __WXMAC__
&& wxGetKeyState( WXK_TAB ) ) wxKeyCode presetSwitchKey = WXK_RAW_CONTROL;
wxKeyCode viewSwitchKey = WXK_ALT;
#else
wxKeyCode presetSwitchKey = WXK_RAW_CONTROL;
wxKeyCode viewSwitchKey = WXK_WINDOWS_LEFT;
#endif
if( !s_presetSwitcherShown && wxGetKeyState( presetSwitchKey ) && wxGetKeyState( WXK_TAB ) )
{ {
if( m_appearancePanel && this->IsActive() ) if( m_appearancePanel && this->IsActive() )
{ {
@ -105,7 +112,7 @@ bool PCB_BASE_EDIT_FRAME::TryBefore( wxEvent& aEvent )
if( mru.size() > 1 ) if( mru.size() > 1 )
{ {
EDA_VIEW_SWITCHER switcher( this, mru, WXK_RAW_CONTROL ); EDA_VIEW_SWITCHER switcher( this, mru, presetSwitchKey );
s_presetSwitcherShown = true; s_presetSwitcherShown = true;
switcher.ShowModal(); switcher.ShowModal();
@ -120,8 +127,7 @@ bool PCB_BASE_EDIT_FRAME::TryBefore( wxEvent& aEvent )
} }
} }
} }
else if( !s_viewportSwitcherShown && wxGetKeyState( WXK_RAW_CONTROL ) else if( !s_viewportSwitcherShown && wxGetKeyState( viewSwitchKey ) && wxGetKeyState( WXK_TAB ) )
&& wxGetKeyState( WXK_SHIFT ) && wxGetKeyState( WXK_TAB ) )
{ {
if( m_appearancePanel && this->IsActive() ) if( m_appearancePanel && this->IsActive() )
{ {
@ -129,7 +135,7 @@ bool PCB_BASE_EDIT_FRAME::TryBefore( wxEvent& aEvent )
if( mru.size() > 1 ) if( mru.size() > 1 )
{ {
EDA_VIEW_SWITCHER switcher( this, mru, WXK_RAW_CONTROL ); EDA_VIEW_SWITCHER switcher( this, mru, viewSwitchKey );
s_viewportSwitcherShown = true; s_viewportSwitcherShown = true;
switcher.ShowModal(); switcher.ShowModal();