From: Mohammed Sameer <msameer@foolab.org>
Date: Wed, 7 Aug 2013 00:26:50 +0000 (+0300)
Subject: Hide indicators corresponding to toolbar-accessible settings if toolbar is expanded
X-Git-Url: http://cgit.sxemacs.org/?p=harmattan%2Fcameraplus;a=commitdiff_plain;h=10585acc01502833c6f6b4df0d11f06806cce8d7

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

diff --git a/qml/ImageOverlay.qml b/qml/ImageOverlay.qml
index 58f9453..e62c6e0 100644
--- a/qml/ImageOverlay.qml
+++ b/qml/ImageOverlay.qml
@@ -173,6 +173,7 @@ Item {
 
             Indicator {
                 id: flashIndicator
+                visible: !toolBar.expanded
                 source: "image://theme/" + cameraTheme.flashIndicatorIcon(settings.imageFlashMode)
             }
 
@@ -186,24 +187,24 @@ Item {
             Indicator {
                 id: wbIndicator
                 source: visible ? "image://theme/" + cameraTheme.whiteBalanceIndicatorIcon(settings.imageWhiteBalance) : ""
-                visible: settings.imageWhiteBalance != WhiteBalance.Auto
+                visible: settings.imageWhiteBalance != WhiteBalance.Auto && !toolBar.expanded
             }
 
             Indicator {
                 id: cfIndicator
                 source: visible ? "image://theme/" + cameraTheme.colorFilterIndicatorIcon(settings.imageColorFilter) : ""
-                visible: settings.imageColorFilter != ColorTone.Normal
+                visible: settings.imageColorFilter != ColorTone.Normal && !toolBar.expanded
             }
 
             Indicator {
                 id: isoIndicator
-                visible: settings.imageIso != 0
+                visible: settings.imageIso != 0 && !toolBar.expanded
                 source: visible ? "image://theme/" + cameraTheme.isoIcon(settings.imageIso) : ""
             }
 
             Indicator {
                 id: sceneIndicator
-                visible: settings.imageSceneMode != Scene.Auto
+                visible: settings.imageSceneMode != Scene.Auto && !toolBar.expanded
                 source: visible ? "image://theme/" + cameraTheme.imageSceneModeIndicatorIcon(settings.imageSceneMode) : ""
             }
 
diff --git a/qml/VideoOverlay.qml b/qml/VideoOverlay.qml
index 1f71980..866298a 100644
--- 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) : ""
             }