Commit 50193f17 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Resolved HOME hot key conflict between menu entry (Zoom Page) and event... 

Resolved HOME hot key conflict between menu entry (Zoom Page) and event assigned to the hot key in the ACTION_MANAGER.
Conflicts:
	pcbnew/menubar_pcbframe.cpp
parent 6b222d19

common/tool/tool_manager.cpp

+1 −2
Original line number Diff line number Diff line
@@ -513,7 +513,6 @@ bool TOOL_MANAGER::ProcessEvent( TOOL_EVENT& aEvent ) 
    if( m_view->IsDirty() )

    {

        PCB_EDIT_FRAME* f = static_cast<PCB_EDIT_FRAME*>( GetEditFrame() );

        if( f->IsGalCanvasActive() )

        f->GetGalCanvas()->Refresh();    // fixme: ugly hack, provide a method in TOOL_DISPATCHER.

    }

pcbnew/menubar_pcbframe.cpp

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() 
    AddMenuItem( viewMenu, ID_ZOOM_OUT, text, HELP_ZOOM_OUT, KiBitmap( zoom_out_xpm ) );



    text = AddHotkeyName( _( "&Fit on Screen" ), g_Pcbnew_Editor_Hokeys_Descr,

                          HK_ZOOM_AUTO );

                          HK_ZOOM_AUTO, IS_ACCELERATOR  );

    AddMenuItem( viewMenu, ID_ZOOM_PAGE, text, HELP_ZOOM_FIT,

                 KiBitmap( zoom_fit_in_page_xpm ) );

pcbnew/tools/selection_tool.cpp

+2 −1
Original line number Diff line number Diff line
@@ -254,7 +254,8 @@ bool SELECTION_TOOL::selectSingle( const VECTOR2I& aWhere, bool aAllowDisambigua 
        }



        // Check if among the selection candidates there is only one instance of preferred type

        if( item = prefer( collector, types ) )

        item = prefer( collector, types );

        if( item )

        {

            toggleSelection( item );