pop toolbar if we start recording and its depth is greater than 1

[harmattan/cameraplus] / qml / VideoOverlay.qml

diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml
index f9d0672..d1df5bd 100644 (file)
--- a/qml/VideoOverlay.qml
+++ b/qml/VideoOverlay.qml
@@ -156,13 +156,19 @@ 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 && (!toolBar.expanded || overlay.recording)
+                source: visible ? "image://theme/" + cameraTheme.videoSceneModeIndicatorIcon(settings.videoSceneMode) : ""
             }
 
             Indicator {
@@ -252,6 +258,10 @@ Item {
         }
 
         trackerStore.storeVideo(file);
+
+        if (toolBar.depth() > 1) {
+            toolBar.pop()
+        }
     }
 
     function startRecording() {