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

Corrected behaviour of drag panning while autopanning is enabled.

This commit is contained in:
Maciej Suminski 2013-09-02 16:26:42 +02:00
parent e8083ae808
commit 8e88a621ba
2 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/view/wx_view_controls.cpp
View File

@ -64,8 +64,14 @@ void WX_VIEW_CONTROLS::onMotion( wxMouseEvent& aEvent )
{ {
m_mousePosition.x = aEvent.GetX(); m_mousePosition.x = aEvent.GetX();
m_mousePosition.y = aEvent.GetY(); m_mousePosition.y = aEvent.GetY();
bool isAutoPanning = false;
if( aEvent.Dragging() ) if( m_autoPanEnabled )
{
isAutoPanning = handleAutoPanning( aEvent );
}
if( !isAutoPanning && aEvent.Dragging() )
{ {
if( m_state == DRAG_PANNING ) if( m_state == DRAG_PANNING )
{ {
@ -80,11 +86,6 @@ void WX_VIEW_CONTROLS::onMotion( wxMouseEvent& aEvent )
aEvent.Skip(); aEvent.Skip();
} }
} }
else
{
if( m_autoPanEnabled )
handleAutoPanning( aEvent );
}
} }
@ -157,7 +158,7 @@ void WX_VIEW_CONTROLS::onButton( wxMouseEvent& aEvent )
m_state = IDLE; m_state = IDLE;
} }
break; break;
}; }
aEvent.Skip(); aEvent.Skip();
} }
@ -190,6 +191,10 @@ void WX_VIEW_CONTROLS::onTimer( wxTimerEvent& aEvent )
wxPostEvent( m_parentPanel, redrawEvent ); wxPostEvent( m_parentPanel, redrawEvent );
} }
break; break;
case IDLE: // Just remove unnecessary warnings
case DRAG_PANNING:
break;
} }
} }
@ -214,7 +219,7 @@ VECTOR2D WX_VIEW_CONTROLS::GetCursorPosition() const
} }
void WX_VIEW_CONTROLS::handleAutoPanning( const wxMouseEvent& aEvent ) bool WX_VIEW_CONTROLS::handleAutoPanning( const wxMouseEvent& aEvent )
{ {
VECTOR2D p( aEvent.GetX(), aEvent.GetY() ); VECTOR2D p( aEvent.GetX(), aEvent.GetY() );
@ -245,7 +250,10 @@ void WX_VIEW_CONTROLS::handleAutoPanning( const wxMouseEvent& aEvent )
{ {
m_panTimer.Stop(); m_panTimer.Stop();
m_state = IDLE; m_state = IDLE;
return false;
} }
return true;
break; break;
case IDLE: case IDLE:
@ -253,7 +261,16 @@ void WX_VIEW_CONTROLS::handleAutoPanning( const wxMouseEvent& aEvent )
{ {
m_state = AUTO_PANNING; m_state = AUTO_PANNING;
m_panTimer.Start( (int) ( 1000.0 / 60.0 ) ); m_panTimer.Start( (int) ( 1000.0 / 60.0 ) );
return true;
} }
return false;
break; break;
case DRAG_PANNING:
return false;
} }
wxASSERT_MSG( false, wxT( "This line should never be reached" ) );
return false; // Should not be reached, just avoid the compiler warnings..
} }

13
include/view/wx_view_controls.h
View File

@ -85,6 +85,8 @@ public:
void SetAutoPan( bool aEnabled ) void SetAutoPan( bool aEnabled )
{ {
m_autoPanEnabled = aEnabled; m_autoPanEnabled = aEnabled;
if( m_state == AUTO_PANNING )
m_state = IDLE;
} }
/** /**
@ -116,8 +118,15 @@ private:
AUTO_PANNING, AUTO_PANNING,
}; };
/// Computes new viewport settings while in autopanning mode /**
void handleAutoPanning( const wxMouseEvent& aEvent ); * Function handleAutoPanning()
* Computes new viewport settings while in autopanning mode.
*
* @param aEvent is an event to be processed and decide if autopanning should happen.
* @return true if it is currently autopanning (ie. autopanning is active and mouse cursor
* is in the area that causes autopanning to happen).
*/
bool handleAutoPanning( const wxMouseEvent& aEvent );
/// Current state of VIEW_CONTROLS /// Current state of VIEW_CONTROLS
State m_state; State m_state;