projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill CameraButtonRow and use the QtQuick Row component
[harmattan/cameraplus]
/
qml
/
VideoOverlay.qml
diff --git
a/qml/VideoOverlay.qml
b/qml/VideoOverlay.qml
index
1210f82
..
60e5467
100644
(file)
--- a/
qml/VideoOverlay.qml
+++ b/
qml/VideoOverlay.qml
@@
-118,11
+118,11
@@
Item {
tools: CameraToolBarTools {
VideoTorchButton {
camera: cam
tools: CameraToolBarTools {
VideoTorchButton {
camera: cam
- visible:
!overlay.cam.quirks.hasQuirk(Quirks.NoVideoTorch)
+ visible:
overlay.cam ? !overlay.cam.quirks.hasQuirk(Quirks.NoVideoTorch) : false
}
VideoSceneButton {
}
VideoSceneButton {
- property bool hide:
(overlay.recording && overlay.cam.quirks.hasQuirk(Quirks.NoSceneModeChangeDuringRecording)) || overlay.cam.quirks.hasQuirk(Quirks.NoNightSceneMode)
+ property bool hide:
overlay.cam ? (overlay.recording && overlay.cam.quirks.hasQuirk(Quirks.NoSceneModeChangeDuringRecording)) || overlay.cam.quirks.hasQuirk(Quirks.NoNightSceneMode) : false
visible: !hide
onClicked: toolBar.push(tools)
}
visible: !hide
onClicked: toolBar.push(tools)
}