Merge pull request #4616 from bluerobotics/wheelevents

Disable scrolling on QGCComboBox

src/QmlControls/QGCComboBox.qml

@@ -39,4 +39,24 @@ ComboBox {
             }
         }
     }
+
+    // Capture Wheel events to disable scrolling options in ComboBox.
+    // As a side effect, this also prevents scrolling the page when
+    // mouse is over a ComboBox, but this would also the case when
+    // scrolling items in the ComboBox is enabled.
+    MouseArea {
+        anchors.fill: parent
+        onWheel: {
+            // do nothing
+            wheel.accepted = true;
+        }
+        onPressed: {
+            // propogate to ComboBox
+            mouse.accepted = false;
+        }
+        onReleased: {
+            // propogate to ComboBox
+            mouse.accepted = false;
+        }
+    }
 }