diff options
| -rw-r--r-- | src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp b/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp index 0b6ab80fc..c4e0ea1a8 100644 --- a/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp +++ b/src/plugins/android/src/mediacapture/qandroidcamerafocuscontrol.cpp @@ -234,25 +234,24 @@ void QAndroidCameraFocusControl::updateFocusZones(QCameraFocusZone::FocusZoneSta // create a focus zone (50x50 pixel) around the focus point m_focusZones.clear(); - if (m_actualFocusPoint.isNull()) - return; - - QSize viewportSize = m_session->camera()->previewSize(); + if (!m_actualFocusPoint.isNull()) { + QSize viewportSize = m_session->camera()->previewSize(); - if (!viewportSize.isValid()) - return; + if (!viewportSize.isValid()) + return; - QSizeF focusSize(50.f / viewportSize.width(), 50.f / viewportSize.height()); - float x = qBound(qreal(0), - m_actualFocusPoint.x() - (focusSize.width() / 2), - 1.f - focusSize.width()); - float y = qBound(qreal(0), - m_actualFocusPoint.y() - (focusSize.height() / 2), - 1.f - focusSize.height()); + QSizeF focusSize(50.f / viewportSize.width(), 50.f / viewportSize.height()); + float x = qBound(qreal(0), + m_actualFocusPoint.x() - (focusSize.width() / 2), + 1.f - focusSize.width()); + float y = qBound(qreal(0), + m_actualFocusPoint.y() - (focusSize.height() / 2), + 1.f - focusSize.height()); - QRectF area(QPointF(x, y), focusSize); + QRectF area(QPointF(x, y), focusSize); - m_focusZones.append(QCameraFocusZone(area, status)); + m_focusZones.append(QCameraFocusZone(area, status)); + } emit focusZonesChanged(); } |