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

Make touchscreen events Windows-only 

They break things on macOS and probably also on GTK
according to the wxWidgets documentation.
This commit is contained in:
Jon Evans 2024-06-09 13:18:32 -04:00
parent 76b2741a92
commit 74517856ca
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d-viewer/3d_canvas/eda_3d_canvas.cpp
View File

@ -149,7 +149,9 @@ EDA_3D_CANVAS::EDA_3D_CANVAS( wxWindow* aParent, const wxGLAttributes& aGLAttrib
wxASSERT( a3DCachePointer != nullptr ); wxASSERT( a3DCachePointer != nullptr );
m_boardAdapter.Set3dCacheManager( a3DCachePointer ); m_boardAdapter.Set3dCacheManager( a3DCachePointer );
#ifdef __WXMSW__
EnableTouchEvents( wxTOUCH_ZOOM_GESTURE | wxTOUCH_PAN_GESTURES | wxTOUCH_ROTATE_GESTURE ); EnableTouchEvents( wxTOUCH_ZOOM_GESTURE | wxTOUCH_PAN_GESTURES | wxTOUCH_ROTATE_GESTURE );
#endif
const wxEventType events[] = const wxEventType events[] =
{ {

2
common/view/wx_view_controls.cpp
View File

@ -133,6 +133,7 @@ WX_VIEW_CONTROLS::WX_VIEW_CONTROLS( VIEW* aView, EDA_DRAW_PANEL_GAL* aParentPane
wxMouseEventHandler( WX_VIEW_CONTROLS::onCaptureLost ), nullptr, this ); wxMouseEventHandler( WX_VIEW_CONTROLS::onCaptureLost ), nullptr, this );
#endif #endif
#ifdef __WXMSW__
if( m_parentPanel->EnableTouchEvents( wxTOUCH_ZOOM_GESTURE | wxTOUCH_PAN_GESTURES ) ) if( m_parentPanel->EnableTouchEvents( wxTOUCH_ZOOM_GESTURE | wxTOUCH_PAN_GESTURES ) )
{ {
m_parentPanel->Connect( wxEVT_GESTURE_ZOOM, m_parentPanel->Connect( wxEVT_GESTURE_ZOOM,
@ -143,6 +144,7 @@ WX_VIEW_CONTROLS::WX_VIEW_CONTROLS( VIEW* aView, EDA_DRAW_PANEL_GAL* aParentPane
wxPanGestureEventHandler( WX_VIEW_CONTROLS::onPanGesture ), nullptr, wxPanGestureEventHandler( WX_VIEW_CONTROLS::onPanGesture ), nullptr,
this ); this );
} }
#endif
m_cursorWarped = false; m_cursorWarped = false;