Commit 3e570c1a authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Fix cursor shape issue after block command in modedit and libedit

parent 6c4b6767

eeschema/block_libedit.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -183,7 +183,7 @@ bool LIB_EDIT_FRAME::HandleBlockEnd( wxDC* DC ) 
        GetScreen()->m_BlockLocate.m_Command = BLOCK_IDLE;

        GetScreen()->m_BlockLocate.m_Command = BLOCK_IDLE;

        GetScreen()->SetCurItem( NULL );

        GetScreen()->SetCurItem( NULL );

        DrawPanel->SetMouseCapture( NULL, NULL );

        DrawPanel->SetMouseCapture( NULL, NULL );

        SetToolID( GetToolId(), DrawPanel->GetDefaultCursor(), wxEmptyString );

        SetToolID( GetToolId(), DrawPanel->GetCurrentCursor(), wxEmptyString );

        DrawPanel->Refresh( true );

        DrawPanel->Refresh( true );

    }

    }
@@ -269,7 +269,7 @@ void LIB_EDIT_FRAME::HandleBlockPlace( wxDC* DC ) 
    GetScreen()->SetCurItem( NULL );

    GetScreen()->SetCurItem( NULL );

    DrawPanel->SetMouseCapture( NULL, NULL );

    DrawPanel->SetMouseCapture( NULL, NULL );

    DrawPanel->Refresh( true );

    DrawPanel->Refresh( true );

    SetToolID( GetToolId(), DrawPanel->GetDefaultCursor(), wxEmptyString );

    SetToolID( GetToolId(), DrawPanel->GetCurrentCursor(), wxEmptyString );

}

}

gerbview/block.cpp

+4 −2
Original line number Original line Diff line number Diff line
@@ -136,8 +136,9 @@ void WinEDA_GerberFrame::HandleBlockPlace( wxDC* DC ) 
        break;

        break;

    }

    }





    DrawPanel->SetMouseCapture( NULL, NULL );

    DrawPanel->EndMouseCapture( );

    DrawPanel->EndMouseCapture( );

    DrawPanel->SetCursor( DrawPanel->GetCurrentCursor() );

    SetToolID( GetToolId(), DrawPanel->GetCurrentCursor(), wxEmptyString );

    GetScreen()->SetModify();

    GetScreen()->SetModify();

    GetScreen()->ClearBlockCommand();

    GetScreen()->ClearBlockCommand();
@@ -212,8 +213,9 @@ bool WinEDA_GerberFrame::HandleBlockEnd( wxDC* DC ) 
    if( ! nextcmd )

    if( ! nextcmd )

    {

    {

        GetScreen()->ClearBlockCommand();

        GetScreen()->ClearBlockCommand();

        DrawPanel->SetMouseCapture( NULL, NULL );

        DrawPanel->EndMouseCapture( );

        DrawPanel->EndMouseCapture( );

        DrawPanel->SetCursor( DrawPanel->GetCurrentCursor() );

        SetToolID( GetToolId(), DrawPanel->GetCurrentCursor(), wxEmptyString );

        DisplayToolMsg( wxEmptyString );

        DisplayToolMsg( wxEmptyString );

    }

    }

pcbnew/block_module_editor.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -194,7 +194,7 @@ bool WinEDA_ModuleEditFrame::HandleBlockEnd( wxDC* DC ) 
        GetScreen()->ClearBlockCommand();

        GetScreen()->ClearBlockCommand();

        SetCurItem( NULL );

        SetCurItem( NULL );

        DrawPanel->SetMouseCapture( NULL, NULL );

        DrawPanel->SetMouseCapture( NULL, NULL );

        SetToolID( GetToolId(), DrawPanel->GetDefaultCursor(), wxEmptyString );

        SetToolID( GetToolId(), DrawPanel->GetCurrentCursor(), wxEmptyString );

        DrawPanel->Refresh( true );

        DrawPanel->Refresh( true );

    }

    }
@@ -276,7 +276,7 @@ void WinEDA_ModuleEditFrame::HandleBlockPlace( wxDC* DC ) 
    SetCurItem( NULL );

    SetCurItem( NULL );

    DrawPanel->SetMouseCapture( NULL, NULL );

    DrawPanel->SetMouseCapture( NULL, NULL );

    DrawPanel->Refresh( true );

    DrawPanel->Refresh( true );

    SetToolID( GetToolId(), DrawPanel->GetDefaultCursor(), wxEmptyString );

    SetToolID( GetToolId(), DrawPanel->GetCurrentCursor(), wxEmptyString );

}

}

pcbnew/dialogs/dialog_general_options.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -126,6 +126,10 @@ void PCB_EDIT_FRAME::OnSelectOptionToolbar( wxCommandEvent& event ) 




    case ID_TB_OPTIONS_SHOW_RATSNEST:

    case ID_TB_OPTIONS_SHOW_RATSNEST:

        SetElementVisibility( RATSNEST_VISIBLE, state );

        SetElementVisibility( RATSNEST_VISIBLE, state );

        if( state && (GetBoard()->m_Status_Pcb & LISTE_RATSNEST_ITEM_OK) == 0 )

        {

            Compile_Ratsnest( NULL, true );

        }

        DrawPanel->Refresh();

        DrawPanel->Refresh();

        break;

        break;