Hide indicators corresponding to toolbar-accessible settings if toolbar is expanded

[harmattan/cameraplus] / qml / VideoOverlay.qml

diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml
index 1f71980..866298a 100644 (file)
--- a/qml/VideoOverlay.qml
+++ b/qml/VideoOverlay.qml
@@ -156,18 +156,18 @@ Item {
             Indicator {
                 id: wbIndicator
                 source: visible ? "image://theme/" + cameraTheme.whiteBalanceIndicatorIcon(settings.videoWhiteBalance) : ""
-                visible: settings.videoWhiteBalance != WhiteBalance.Auto
+                visible: settings.videoWhiteBalance != WhiteBalance.Auto && !toolBar.expanded
             }
 
             Indicator {
                 id: cfIndicator
                 source: visible ? "image://theme/" + cameraTheme.colorFilterIndicatorIcon(settings.videoColorFilter) : ""
-                visible: settings.videoColorFilter != ColorTone.Normal
+                visible: settings.videoColorFilter != ColorTone.Normal && !toolBar.expanded
             }
 
             Indicator {
                 id: sceneIndicator
-                visible: settings.videoSceneMode != Scene.Auto
+                visible: settings.videoSceneMode != Scene.Auto && (!toolBar.expanded || overlay.recording)
                 source: visible ? "image://theme/" + cameraTheme.videoSceneModeIndicatorIcon(settings.videoSceneMode) : ""
             }