Fix camera size change under Windows (colmap#1401)

ishipachev · Jan 25, 2022 · e47d22a · e47d22a
1 parent ce55703
commit e47d22a
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/ui/model_viewer_widget.cc b/src/ui/model_viewer_widget.cc
@@ -628,14 +628,16 @@ void ModelViewerWidget::mouseMoveEvent(QMouseEvent* event) {
 }
 
 void ModelViewerWidget::wheelEvent(QWheelEvent* event) {
-  if (event->modifiers() & Qt::ControlModifier) {
-    ChangePointSize(event->angleDelta().y());
-  } else if (event->modifiers() & Qt::AltModifier) {
-    ChangeCameraSize(event->angleDelta().y());
-  } else if (event->modifiers() & Qt::ShiftModifier) {
-    ChangeNearPlane(event->angleDelta().y());
+  // We don't mind whether horizontal or vertical scroll.
+  const float delta = event->angleDelta().x() + event->angleDelta().y();
+  if (event->modifiers().testFlag(Qt::ControlModifier)) {
+    ChangePointSize(delta);
+  } else if (event->modifiers().testFlag(Qt::AltModifier)) {
+    ChangeCameraSize(delta);
+  } else if (event->modifiers().testFlag(Qt::ShiftModifier)) {
+    ChangeNearPlane(delta);
   } else {
-    ChangeFocusDistance(event->angleDelta().y());
+    ChangeFocusDistance(delta);
   }
   event->accept();
 }