projects
/
harmattan
/
cameraplus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reworked preview animation
[harmattan/cameraplus]
/
qml
/
VideoOverlay.qml
diff --git
a/qml/VideoOverlay.qml
b/qml/VideoOverlay.qml
index
24d44aa
..
60e5467
100644
(file)
--- a/
qml/VideoOverlay.qml
+++ b/
qml/VideoOverlay.qml
@@
-35,6
+35,7
@@
Item {
&& dimmer.opacity == 0.0 && !cameraMode.busy
property bool pressed: overlay.recording || capture.pressed ||
zoomSlider.pressed || modeButton.pressed
&& dimmer.opacity == 0.0 && !cameraMode.busy
property bool pressed: overlay.recording || capture.pressed ||
zoomSlider.pressed || modeButton.pressed
+ property bool inhibitDim: recording
signal previewAvailable(string uri)
signal previewAvailable(string uri)
@@
-66,12
+67,20
@@
Item {
ZoomCaptureButton {
id: zoomCapture
ZoomCaptureButton {
id: zoomCapture
- onReleased: overlay.toggleRecording()
}
}
- ZoomCaptureCancel {
+ CaptureControl {
+ id: captureControl
+ capturePressed: capture.pressed
+ zoomPressed: zoomCapture.zoomPressed
+ proximityClosed: proximitySensor.sensorClosed
+ onStartCapture: overlay.toggleRecording()
+ }
+
+ CaptureCancel {
anchors.fill: parent
anchors.fill: parent
- zoomCapture: zoomCapture
+ enabled: captureControl.showCancelBanner
+ onPressed: captureControl.canceled = true
}
CaptureButton {
}
CaptureButton {
@@
-84,9
+93,14
@@
Item {
height: 75
opacity: 0.5
height: 75
opacity: 0.5
- onClicked: overlay.toggleRecording()
+ visible: controlsVisible
- visible: controlsVisible && (!settings.zoomAsShutter && keys.active)
+ onExited: {
+ if (mouseX <= 0 || mouseY <= 0 || mouseX > width || mouseY > height) {
+ // Release outside the button:
+ captureControl.canceled = true
+ }
+ }
}
CameraToolBar {
}
CameraToolBar {
@@
-104,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)
}
@@
-190,10
+204,6
@@
Item {
}
}
}
}
- DisplayState {
- inhibitDim: overlay.recording
- }
-
Connections {
target: Qt.application
onActiveChanged: {
Connections {
target: Qt.application
onActiveChanged: {