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

Disable capture cursor & autopanning for tools in idle state (GAL).

This commit is contained in:
Maciej Suminski 2015-09-21 10:16:23 +02:00
parent 66a9b04487
commit 25d5a2fbfb
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/tools/pcb_editor_control.cpp
View File

@ -217,8 +217,6 @@ int PCB_EDITOR_CONTROL::PlaceModule( const TOOL_EVENT& aEvent )
m_toolMgr->RunAction( COMMON_ACTIONS::selectionClear, true ); m_toolMgr->RunAction( COMMON_ACTIONS::selectionClear, true );
controls->ShowCursor( true ); controls->ShowCursor( true );
controls->SetSnapping( true ); controls->SetSnapping( true );
controls->SetAutoPan( true );
controls->CaptureCursor( true );
Activate(); Activate();
m_frame->SetToolID( ID_PCB_MODULE_BUTT, wxCURSOR_HAND, _( "Add module" ) ); m_frame->SetToolID( ID_PCB_MODULE_BUTT, wxCURSOR_HAND, _( "Add module" ) );
@ -264,14 +262,13 @@ int PCB_EDITOR_CONTROL::PlaceModule( const TOOL_EVENT& aEvent )
{ {
if( !module ) if( !module )
{ {
// Init the new item attributes // Pick the module to be placed
module = m_frame->LoadModuleFromLibrary( wxEmptyString, module = m_frame->LoadModuleFromLibrary( wxEmptyString,
m_frame->Prj().PcbFootprintLibs(), m_frame->Prj().PcbFootprintLibs(),
true, NULL ); true, NULL );
if( module == NULL ) if( module == NULL )
continue; continue;
controls->ShowCursor( false );
module->SetPosition( wxPoint( cursorPos.x, cursorPos.y ) ); module->SetPosition( wxPoint( cursorPos.x, cursorPos.y ) );
// Add all the drawable parts to preview // Add all the drawable parts to preview
@ -282,6 +279,7 @@ int PCB_EDITOR_CONTROL::PlaceModule( const TOOL_EVENT& aEvent )
} }
else else
{ {
// Place the selected module
module->RunOnChildren( boost::bind( &KIGFX::VIEW::Add, view, _1 ) ); module->RunOnChildren( boost::bind( &KIGFX::VIEW::Add, view, _1 ) );
view->Add( module ); view->Add( module );
module->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY ); module->ViewUpdate( KIGFX::VIEW_ITEM::GEOMETRY );
@ -293,9 +291,13 @@ int PCB_EDITOR_CONTROL::PlaceModule( const TOOL_EVENT& aEvent )
preview.Remove( module ); preview.Remove( module );
module->RunOnChildren( boost::bind( &KIGFX::VIEW_GROUP::Remove, &preview, _1 ) ); module->RunOnChildren( boost::bind( &KIGFX::VIEW_GROUP::Remove, &preview, _1 ) );
module = NULL; // to indicate that there is no module that we currently modify module = NULL; // to indicate that there is no module that we currently modify
controls->ShowCursor( true );
} }
bool placing = ( module != NULL );
controls->SetAutoPan( placing );
controls->CaptureCursor( placing );
controls->ShowCursor( !placing );
} }
else if( module && evt->IsMotion() ) else if( module && evt->IsMotion() )
@ -364,8 +366,6 @@ int PCB_EDITOR_CONTROL::PlaceTarget( const TOOL_EVENT& aEvent )
m_toolMgr->RunAction( COMMON_ACTIONS::selectionClear, true ); m_toolMgr->RunAction( COMMON_ACTIONS::selectionClear, true );
controls->SetSnapping( true ); controls->SetSnapping( true );
controls->SetAutoPan( true );
controls->CaptureCursor( true );
Activate(); Activate();
m_frame->SetToolID( ID_PCB_MIRE_BUTT, wxCURSOR_PENCIL, _( "Add layer alignment target" ) ); m_frame->SetToolID( ID_PCB_MIRE_BUTT, wxCURSOR_PENCIL, _( "Add layer alignment target" ) );
@ -424,8 +424,6 @@ int PCB_EDITOR_CONTROL::PlaceTarget( const TOOL_EVENT& aEvent )
delete target; delete target;
controls->SetSnapping( false ); controls->SetSnapping( false );
controls->SetAutoPan( false );
controls->CaptureCursor( false );
view->Remove( &preview ); view->Remove( &preview );
m_frame->SetToolID( ID_NO_TOOL_SELECTED, wxCURSOR_DEFAULT, wxEmptyString ); m_frame->SetToolID( ID_NO_TOOL_SELECTED, wxCURSOR_DEFAULT, wxEmptyString );

4
pcbnew/tools/picker_tool.cpp
View File

@ -93,8 +93,8 @@ void PICKER_TOOL::reset()
{ {
m_cursorSnapping = true; m_cursorSnapping = true;
m_cursorVisible = true; m_cursorVisible = true;
m_cursorCapture = true; m_cursorCapture = false;
m_autoPanning = true; m_autoPanning = false;
m_picking = false; m_picking = false;
m_clickHandler = boost::none; m_clickHandler = boost::none;