From c8c5b5da07f11e13775344c93f7c1f96eb5d0285 Mon Sep 17 00:00:00 2001 From: Wayne Stambaugh Date: Sun, 25 Mar 2018 16:12:56 -0400 Subject: [PATCH] Fix zoom to selection in bug in gal canvas. --- common/tool/zoom_tool.cpp | 5 ++++- pcbnew/menubar_footprint_editor.cpp | 2 +- pcbnew/menubar_pcb_editor.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/common/tool/zoom_tool.cpp b/common/tool/zoom_tool.cpp index 98d5cc8416..57fafc432d 100644 --- a/common/tool/zoom_tool.cpp +++ b/common/tool/zoom_tool.cpp @@ -47,7 +47,10 @@ void ZOOM_TOOL::Reset( RESET_REASON aReason ) int ZOOM_TOOL::Main( const TOOL_EVENT& aEvent ) { // This method is called both when the zoom tool is activated (on) or deactivated (off) - bool zoom_tool_is_on = m_frame->GetToolToggled( ID_ZOOM_SELECTION ); + wxMenuBar* menu = m_frame->GetMenuBar(); + + bool zoom_tool_is_on = m_frame->GetToolToggled( ID_ZOOM_SELECTION ) || + ( menu && menu->IsChecked( ID_ZOOM_SELECTION ) ); if( !zoom_tool_is_on ) // This is a tool deselection: do nothing return 0; diff --git a/pcbnew/menubar_footprint_editor.cpp b/pcbnew/menubar_footprint_editor.cpp index ab4fd2699a..a6dcf5fec3 100644 --- a/pcbnew/menubar_footprint_editor.cpp +++ b/pcbnew/menubar_footprint_editor.cpp @@ -238,7 +238,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() text = AddHotkeyName( _( "Zoom to Selection" ), m_hotkeysDescrList, HK_ZOOM_SELECTION ); - AddMenuItem( viewMenu, ID_ZOOM_SELECTION, text, KiBitmap( zoom_area_xpm ) ); + AddMenuItem( viewMenu, ID_ZOOM_SELECTION, text, KiBitmap( zoom_area_xpm ), wxITEM_CHECK ); text = AddHotkeyName( _( "&Redraw" ), m_hotkeysDescrList, HK_ZOOM_REDRAW ); AddMenuItem( viewMenu, ID_ZOOM_REDRAW, text, diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index 8792499077..9be4234a21 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -643,7 +643,7 @@ void prepareViewMenu( wxMenu* aParentMenu, bool aUseGal ) text = AddHotkeyName( _( "Zoom to Selection" ), g_Pcbnew_Editor_Hotkeys_Descr, HK_ZOOM_SELECTION ); - AddMenuItem( aParentMenu, ID_ZOOM_SELECTION, text, KiBitmap( zoom_area_xpm ) ); + AddMenuItem( aParentMenu, ID_ZOOM_SELECTION, text, KiBitmap( zoom_area_xpm ), wxITEM_CHECK ); text = AddHotkeyName( _( "&Redraw" ), g_Pcbnew_Editor_Hotkeys_Descr, HK_ZOOM_REDRAW ); AddMenuItem( aParentMenu, ID_ZOOM_REDRAW, text,