From 350246606e2cdae7a381bbd656bbc985d02afea2 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 6 Dec 2021 15:52:19 +0600 Subject: [PATCH 1/2] Remove redundant RtMidi checking --- src/qt/CMakeLists.txt | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt index 96d3ba6d4..a07887e80 100644 --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -4,7 +4,6 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -find_package(PkgConfig) find_package(Threads REQUIRED) add_library(plat STATIC qt.c qt_main.cpp qt_platform.cpp cpp11_thread.cpp) @@ -107,20 +106,6 @@ target_link_libraries( Threads::Threads ) -if (PkgConfig_FOUND) - pkg_check_modules(RTMIDI rtmidi) - if (RTMIDI_FOUND) - target_include_directories(plat PRIVATE ${RTMIDI_INCLUDE_DIRS}) - target_link_directories(plat INTERFACE ${RTMIDI_LIBRARY_DIRS}) - target_link_libraries(plat PRIVATE ${RTMIDI_LIBRARIES}) - target_sources(plat PRIVATE rtmidi_midi.cpp) - else() - target_sources(plat PRIVATE qt_midi.cpp) - endif() -else() - target_sources(plat PRIVATE qt_midi.cpp) -endif() - if (UNIX AND NOT APPLE) find_package(X11 REQUIRED) target_link_libraries(ui PRIVATE X11::X11) From c376cca71ee4e680bb9543d10b3890e34a32e324 Mon Sep 17 00:00:00 2001 From: Cacodemon345 Date: Mon, 6 Dec 2021 16:33:25 +0600 Subject: [PATCH 2/2] Fix mouse wheel scrolling --- src/qt/qt_rendererstack.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp index cbc0b5e44..3df8c8ab2 100644 --- a/src/qt/qt_rendererstack.cpp +++ b/src/qt/qt_rendererstack.cpp @@ -99,7 +99,7 @@ void RendererStack::wheelEvent(QWheelEvent *event) { if (mouse_capture) { - mousedata.deltay += event->pixelDelta().y(); + mousedata.deltaz += event->pixelDelta().y(); } }