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

3D viewer, main toolbar: fix incorrect parent for 2 widgets. 

Also use SHIFT instead of ALT as modifier to show the viewport list, because
ALT is not usable on Windows, especially combined with TAB
This commit is contained in:
jean-pierre charras 2022-07-29 18:31:49 +02:00
parent 490875e222
commit 3245aec5b5
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3d-viewer/3d_viewer/3d_toolbar.cpp
View File

@ -51,10 +51,11 @@ void EDA_3D_VIEWER_FRAME::ReCreateMainToolbar()
m_mainToolBar->SetAuiManager( &m_auimgr ); m_mainToolBar->SetAuiManager( &m_auimgr );
} }
m_viewportsLabel = new wxStaticText( this, wxID_ANY, _( "Viewports (Alt+Tab):" ) ); // Show the hotkey to open the windows list selector:
m_viewportsLabel = new wxStaticText( m_mainToolBar, wxID_ANY, _( "Viewports (Shift+Tab):" ) );
m_viewportsLabel->Wrap( -1 ); m_viewportsLabel->Wrap( -1 );
m_cbViewports = new wxChoice( this, wxID_ANY ); m_cbViewports = new wxChoice( m_mainToolBar, wxID_ANY );
for( std::pair<const wxString, VIEWPORT3D>& pair : m_viewports ) for( std::pair<const wxString, VIEWPORT3D>& pair : m_viewports )
m_cbViewports->Append( pair.first, static_cast<void*>( &pair.second ) ); m_cbViewports->Append( pair.first, static_cast<void*>( &pair.second ) );

8
3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp
View File

@ -285,11 +285,9 @@ bool EDA_3D_VIEWER_FRAME::TryBefore( wxEvent& aEvent )
{ {
static bool s_viewportSwitcherShown = false; static bool s_viewportSwitcherShown = false;
#ifdef __WXMAC__ // On Windows, the Alt key is not usable, especially with TAB key
wxKeyCode viewSwitchKey = WXK_ALT; // Shift key is OK on all platforms
#else wxKeyCode viewSwitchKey = WXK_SHIFT;
wxKeyCode viewSwitchKey = WXK_WINDOWS_LEFT;
#endif
if( aEvent.GetEventType() != wxEVT_CHAR && aEvent.GetEventType() != wxEVT_CHAR_HOOK ) if( aEvent.GetEventType() != wxEVT_CHAR && aEvent.GetEventType() != wxEVT_CHAR_HOOK )
return wxFrame::TryBefore( aEvent ); return wxFrame::TryBefore( aEvent );