projects
/
harmattan
/
cameraplus
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ad739ec
)
Move PreviewImage underneath FocusReticle
author
Mohammed Sameer
<msameer@foolab.org>
Sun, 28 Jul 2013 18:44:11 +0000
(21:44 +0300)
committer
Mohammed Sameer
<msameer@foolab.org>
Sun, 28 Jul 2013 18:44:11 +0000
(21:44 +0300)
It must be like that otherwise PreviewImage steals mouse events from FocusReticle
qml/CameraView.qml
patch
|
blob
|
history
diff --git
a/qml/CameraView.qml
b/qml/CameraView.qml
index
82481d1
..
316af5e
100644
(file)
--- a/
qml/CameraView.qml
+++ b/
qml/CameraView.qml
@@
-111,6
+111,10
@@
Viewfinder {
}
}
+ PreviewImage {
+ id: preview
+ }
+
FocusReticle {
id: focusReticle
cam: cam
@@
-123,10
+127,6
@@
Viewfinder {
status: cam ? cam.autoFocus.status : -1
}
- PreviewImage {
- id: preview
- }
-
Loader {
id: loader
property string src: cam.mode == Camera.VideoMode ? "VideoOverlay.qml" : "ImageOverlay.qml"