Double click support for the Tool Framework. (c21ae6ef) · Commits · Elphel / kicad-source-mirror

common/drawpanel_gal.cpp

+15 −12

Original line number	Original line	Diff line number	Diff line
	@@ -81,10 +81,13 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
	Connect( wxEVT_MOTION, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_MOTION, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_LEFT_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_LEFT_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_LEFT_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_LEFT_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
			Connect( wxEVT_LEFT_DCLICK, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_RIGHT_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_RIGHT_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_RIGHT_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_RIGHT_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
			Connect( wxEVT_RIGHT_DCLICK, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_MIDDLE_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_MIDDLE_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_MIDDLE_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_MIDDLE_DOWN, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
			Connect( wxEVT_MIDDLE_DCLICK, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_MOUSEWHEEL, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_MOUSEWHEEL, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );
	Connect( wxEVT_CHAR_HOOK, wxEventHandler( EDA_DRAW_PANEL_GAL::skipEvent ) );		Connect( wxEVT_CHAR_HOOK, wxEventHandler( EDA_DRAW_PANEL_GAL::skipEvent ) );
	Connect( wxEVT_KEY_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );		Connect( wxEVT_KEY_UP, wxEventHandler( EDA_DRAW_PANEL_GAL::onEvent ), NULL, this );

common/gal/cairo/cairo_gal.cpp

+11 −8

Original line number	Original line	Diff line number	Diff line
	@@ -60,10 +60,13 @@ CAIRO_GAL::CAIRO_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,
	Connect( wxEVT_MOTION, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_MOTION, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_LEFT_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_LEFT_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
			Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_MIDDLE_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_MIDDLE_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
			Connect( wxEVT_MIDDLE_DCLICK, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
			Connect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	#if defined _WIN32 \|\| defined _WIN64		#if defined _WIN32 \|\| defined _WIN64
	Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );		Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( CAIRO_GAL::skipMouseEvent ) );
	#endif		#endif

common/gal/opengl/opengl_gal.cpp

+11 −8

Original line number	Original line	Diff line number	Diff line
	@@ -73,10 +73,13 @@ OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,
	Connect( wxEVT_MOTION, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );		Connect( wxEVT_MOTION, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
	Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );		Connect( wxEVT_LEFT_DOWN, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
	Connect( wxEVT_LEFT_UP, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );		Connect( wxEVT_LEFT_UP, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
			Connect( wxEVT_LEFT_DCLICK, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
	Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );		Connect( wxEVT_MIDDLE_DOWN, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
	Connect( wxEVT_MIDDLE_UP, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );		Connect( wxEVT_MIDDLE_UP, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
			Connect( wxEVT_MIDDLE_DCLICK, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
	Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );		Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
	Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );		Connect( wxEVT_RIGHT_UP, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
			Connect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
	#if defined _WIN32 \|\| defined _WIN64		#if defined _WIN32 \|\| defined _WIN64
	Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );		Connect( wxEVT_ENTER_WINDOW, wxMouseEventHandler( OPENGL_GAL::skipMouseEvent ) );
	#endif		#endif

common/tool/tool_dispatcher.cpp

+19 −6

Original line number	Original line	Diff line number	Diff line
	@@ -43,10 +43,11 @@ using boost::optional;
	struct TOOL_DISPATCHER::BUTTON_STATE		struct TOOL_DISPATCHER::BUTTON_STATE
	{		{
	BUTTON_STATE( TOOL_MOUSE_BUTTONS aButton, const wxEventType& aDownEvent,		BUTTON_STATE( TOOL_MOUSE_BUTTONS aButton, const wxEventType& aDownEvent,
	const wxEventType& aUpEvent ) :		const wxEventType& aUpEvent, const wxEventType& aDblClickEvent ) :
	button( aButton ),		button( aButton ),
	downEvent( aDownEvent ),		downEvent( aDownEvent ),
	upEvent( aUpEvent )		upEvent( aUpEvent ),
			dblClickEvent( aDblClickEvent )
	{};		{};

	///> Flag indicating that dragging is active for the given button.		///> Flag indicating that dragging is active for the given button.
	@@ -74,6 +75,9 @@ struct TOOL_DISPATCHER::BUTTON_STATE
	///> The type of wxEvent that determines mouse button release.		///> The type of wxEvent that determines mouse button release.
	wxEventType upEvent;		wxEventType upEvent;

			///> The type of wxEvent that determines mouse button double click.
			wxEventType dblClickEvent;

	///> Time stamp for the last mouse button press event.		///> Time stamp for the last mouse button press event.
	wxLongLong downTimestamp;		wxLongLong downTimestamp;

	@@ -89,9 +93,12 @@ struct TOOL_DISPATCHER::BUTTON_STATE
	TOOL_DISPATCHER::TOOL_DISPATCHER( TOOL_MANAGER* aToolMgr, PCB_BASE_FRAME* aEditFrame ) :		TOOL_DISPATCHER::TOOL_DISPATCHER( TOOL_MANAGER* aToolMgr, PCB_BASE_FRAME* aEditFrame ) :
	m_toolMgr( aToolMgr ), m_editFrame( aEditFrame )		m_toolMgr( aToolMgr ), m_editFrame( aEditFrame )
	{		{
	m_buttons.push_back( new BUTTON_STATE( BUT_LEFT, wxEVT_LEFT_DOWN, wxEVT_LEFT_UP ) );		m_buttons.push_back( new BUTTON_STATE( BUT_LEFT, wxEVT_LEFT_DOWN,
	m_buttons.push_back( new BUTTON_STATE( BUT_RIGHT, wxEVT_RIGHT_DOWN, wxEVT_RIGHT_UP ) );		wxEVT_LEFT_UP, wxEVT_LEFT_DCLICK ) );
	m_buttons.push_back( new BUTTON_STATE( BUT_MIDDLE, wxEVT_MIDDLE_DOWN, wxEVT_MIDDLE_UP ) );		m_buttons.push_back( new BUTTON_STATE( BUT_RIGHT, wxEVT_RIGHT_DOWN,
			wxEVT_RIGHT_UP, wxEVT_RIGHT_DCLICK ) );
			m_buttons.push_back( new BUTTON_STATE( BUT_MIDDLE, wxEVT_MIDDLE_DOWN,
			wxEVT_MIDDLE_UP, wxEVT_MIDDLE_DCLICK ) );

	ResetState();		ResetState();
	}		}
	@@ -126,6 +133,7 @@ bool TOOL_DISPATCHER::handleMouseButton( wxEvent& aEvent, int aIndex, bool aMoti

	bool up = type == st->upEvent;		bool up = type == st->upEvent;
	bool down = type == st->downEvent;		bool down = type == st->downEvent;
			bool dblClick = type == st->dblClickEvent;

	int mods = decodeModifiers<wxMouseEvent>( static_cast<wxMouseEvent*>( &aEvent ) );		int mods = decodeModifiers<wxMouseEvent>( static_cast<wxMouseEvent*>( &aEvent ) );
	int args = st->button \| mods;		int args = st->button \| mods;
	@@ -162,6 +170,10 @@ bool TOOL_DISPATCHER::handleMouseButton( wxEvent& aEvent, int aIndex, bool aMoti

	st->dragging = false;		st->dragging = false;
	}		}
			else if( dblClick )
			{
			evt = TOOL_EVENT( TC_MOUSE, TA_MOUSE_DBLCLICK, args );
			}

	if( st->pressed && aMotion )		if( st->pressed && aMotion )
	{		{
	@@ -204,8 +216,9 @@ void TOOL_DISPATCHER::DispatchWxEvent( wxEvent& aEvent )
	type == wxEVT_LEFT_DOWN \|\| type == wxEVT_LEFT_UP \|\|		type == wxEVT_LEFT_DOWN \|\| type == wxEVT_LEFT_UP \|\|
	type == wxEVT_MIDDLE_DOWN \|\| type == wxEVT_MIDDLE_UP \|\|		type == wxEVT_MIDDLE_DOWN \|\| type == wxEVT_MIDDLE_UP \|\|
	type == wxEVT_RIGHT_DOWN \|\| type == wxEVT_RIGHT_UP \|\|		type == wxEVT_RIGHT_DOWN \|\| type == wxEVT_RIGHT_UP \|\|
			type == wxEVT_LEFT_DCLICK \|\| type == wxEVT_MIDDLE_DCLICK \|\| type == wxEVT_RIGHT_DCLICK \|\|
	// Event issued whem mouse retains position in screen coordinates,		// Event issued whem mouse retains position in screen coordinates,
	// but changes in world coordinates (eg. autopanning)		// but changes in world coordinates (e.g. autopanning)
	type == KIGFX::WX_VIEW_CONTROLS::EVT_REFRESH_MOUSE )		type == KIGFX::WX_VIEW_CONTROLS::EVT_REFRESH_MOUSE )
	{		{
	VECTOR2D screenPos = m_toolMgr->GetViewControls()->GetCursorPosition();		VECTOR2D screenPos = m_toolMgr->GetViewControls()->GetCursorPosition();

common/tool/tool_event.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -77,6 +77,7 @@ const std::string TOOL_EVENT::Format() const
	const FlagString actions[] =		const FlagString actions[] =
	{		{
	{ TA_MOUSE_CLICK, "click" },		{ TA_MOUSE_CLICK, "click" },
			{ TA_MOUSE_DBLCLICK, "double click" },
	{ TA_MOUSE_UP, "button-up" },		{ TA_MOUSE_UP, "button-up" },
	{ TA_MOUSE_DOWN, "button-down" },		{ TA_MOUSE_DOWN, "button-down" },
	{ TA_MOUSE_DRAG, "drag" },		{ TA_MOUSE_DRAG, "drag" },

Admin message