Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 24 insertions, 1 deletions

diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index f35120a..f38765b 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -117,8 +117,10 @@ Item {
 
     Item {
         id: Background
+    
+        anchors.fill: parent
 
-        Image { source: "content/pics/background.png"; opaque: true }
+        Image { source: "content/pics/background.png"; opaque: true; anchors.fill: parent }
 
         GridView {
             id: PhotoGridView; model: FeedModel; delegate: PhotoDelegate; cacheBuffer: 100
@@ -201,4 +203,25 @@ Item {
             (FeedModel.tags=="" ? "Uploads from everyone" : "Recent Uploads tagged " + FeedModel.tags)
         font.size: 16; font.bold: true; color: "white"; style: "Raised"; styleColor: "black"
     }
+
+    Image {
+        source: "content/pics/fingerpoint.png"
+        opacity: finger.pressed ? 0 : 1
+        x: finger.mouseX-16
+        y: finger.mouseY-16
+    }
+
+    Image {
+        source: "content/pics/fingerpoint-pressed.png"
+        opacity: finger.pressed ? 1.0 : 0.0
+        x: finger.mouseX-16
+        y: finger.mouseY-16
+    }
+
+    MouseRegion {
+        // this region is just to show where the finger is (good for videos)
+        id: finger
+        absorb: false
+        anchors.fill: parent
+    }
 }