diff --git a/common/single_top.cpp b/common/single_top.cpp index 4501b715c5..8f6807ead1 100644 --- a/common/single_top.cpp +++ b/common/single_top.cpp @@ -138,6 +138,9 @@ struct APP_SINGLE_TOP : public wxApp // Disable overlay scrollbars as they mess up wxWidgets window sizing and cause excessive redraw requests wxSetEnv( wxT( "GTK_OVERLAY_SCROLLING" ), wxT( "0" ) ); + // Set GTK2-style input instead of xinput2. This disables touchscreen and smooth scrolling + // Needed to ensure that we are not getting multiple mouse scroll events + wxSetEnv( wxT( "GDK_CORE_DEVICE_EVENTS" ), wxT( "1" ) ); } #endif diff --git a/include/view/zoom_controller.h b/include/view/zoom_controller.h index fa2eed6ab7..baa0e630ec 100644 --- a/include/view/zoom_controller.h +++ b/include/view/zoom_controller.h @@ -138,7 +138,7 @@ public: double GetScaleForRotation( int aRotation ) override; /// A suitable (magic) scale factor for GTK3 systems - static constexpr double GTK3_SCALE = 0.001; + static constexpr double GTK3_SCALE = 0.002; /// A suitable (magic) scale factor for Mac systems static constexpr double MAC_SCALE = 0.01; diff --git a/kicad/kicad.cpp b/kicad/kicad.cpp index 9ed2b95cb8..ae6e5cda58 100644 --- a/kicad/kicad.cpp +++ b/kicad/kicad.cpp @@ -232,6 +232,10 @@ struct APP_KICAD : public wxApp // Disable overlay scrollbars as they mess up wxWidgets window sizing and cause excessive redraw requests wxSetEnv( wxT( "GTK_OVERLAY_SCROLLING" ), wxT( "0" ) ); + + // Set GTK2-style input instead of xinput2. This disables touchscreen and smooth scrolling + // Needed to ensure that we are not getting multiple mouse scroll events + wxSetEnv( wxT( "GDK_CORE_DEVICE_EVENTS" ), wxT( "1" ) ); } #endif