From 309e8a96af899c612ea26b73fc97d9d377bc9819 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 14 May 2009 15:41:14 +1000
Subject: Flickr demo: Scale the image about the center of the visible area.

---
 demos/declarative/flickr/content/ImageDetails.qml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/demos/declarative/flickr/content/ImageDetails.qml b/demos/declarative/flickr/content/ImageDetails.qml
index d575be9..b8091f2 100644
--- a/demos/declarative/flickr/content/ImageDetails.qml
+++ b/demos/declarative/flickr/content/ImageDetails.qml
@@ -12,6 +12,7 @@ Flipable {
     property string photoDate
     property string photoUrl
     property int rating: 2
+    property var prevScale: 1.0
 
     signal closed
 
@@ -93,7 +94,8 @@ Flipable {
                         // Default scale shows the entire image.
                         if (status == 0 && width != 0) {
                             Slider.minimum = Math.min(Flick.width / width, Flick.height / height);
-                            Slider.value = Math.min(Slider.minimum, 1);
+                            prevScale = Math.min(Slider.minimum, 1);
+                            Slider.value = prevScale;
                         }
                     }
                 }
@@ -109,7 +111,20 @@ Flipable {
             anchors.centeredIn: parent; color: "white"; font.bold: true
         }
 
-        Slider { id: Slider; x: 25; y: 374; visible: { BigImage.status == 0 && maximum > minimum } }
+        Slider {
+            id: Slider; x: 25; y: 374; visible: { BigImage.status == 0 && maximum > minimum }
+            onValueChanged: {
+                if (BigImage.width * value > Flick.width) {
+                    var xoff = (Flick.width/2 + Flick.xPosition) * value / prevScale;
+                    Flick.xPosition = xoff - Flick.width/2;
+                }
+                if (BigImage.height * value > Flick.height) {
+                    var yoff = (Flick.height/2 + Flick.yPosition) * value / prevScale;
+                    Flick.yPosition = yoff - Flick.height/2;
+                }
+                prevScale = value;
+            }
+        }
     }
 
     states: [
-- 
cgit v0.12

c3c3e77febf5974f43'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='text' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><div class='cgit-panel'><b>diff options</b><form method='get' action='.'><input type='hidden' name='id' value='b277241fd2a0f280e98918c3c3e77febf5974f43'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Éric Araujo &lt;merwok@netwok.org&gt;</td><td class='right'>2011-03-21 02:18:58 (GMT)</td></tr>
<tr><th>committer</th><td>Éric Araujo &lt;merwok@netwok.org&gt;</td><td class='right'>2011-03-21 02:18:58 (GMT)</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/oss-git/cpython.git/commit/?id=b277241fd2a0f280e98918c3c3e77febf5974f43'>b277241fd2a0f280e98918c3c3e77febf5974f43</a> (<a href='/oss-git/cpython.git/patch/?id=b277241fd2a0f280e98918c3c3e77febf5974f43'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/oss-git/cpython.git/tree/?id=b277241fd2a0f280e98918c3c3e77febf5974f43'>3f6b253366bfc9638423f7c323595adf74e31ea0</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/oss-git/cpython.git/commit/?id=50dc1a23d8d2e24fe4f344416a8604c4a7c2f60b'>50dc1a23d8d2e24fe4f344416a8604c4a7c2f60b</a> (<a href='/oss-git/cpython.git/diff/?id=b277241fd2a0f280e98918c3c3e77febf5974f43&amp;id2=50dc1a23d8d2e24fe4f344416a8604c4a7c2f60b'>diff</a>)</td></tr><tr><th>parent</th><td colspan='2' class='sha1'><a href='/oss-git/cpython.git/commit/?id=d8c73c650ce5554f3757f17cf0f979a897decf80'>d8c73c650ce5554f3757f17cf0f979a897decf80</a> (<a href='/oss-git/cpython.git/diff/?id=b277241fd2a0f280e98918c3c3e77febf5974f43&amp;id2=d8c73c650ce5554f3757f17cf0f979a897decf80'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/oss-git/cpython.git/snapshot/cpython-b277241fd2a0f280e98918c3c3e77febf5974f43.zip'>cpython-b277241fd2a0f280e98918c3c3e77febf5974f43.zip</a><br/><a href='/oss-git/cpython.git/snapshot/cpython-b277241fd2a0f280e98918c3c3e77febf5974f43.tar.gz'>cpython-b277241fd2a0f280e98918c3c3e77febf5974f43.tar.gz</a><br/><a href='/oss-git/cpython.git/snapshot/cpython-b277241fd2a0f280e98918c3c3e77febf5974f43.tar.bz2'>cpython-b277241fd2a0f280e98918c3c3e77febf5974f43.tar.bz2</a><br/></td></tr></table>
<div class='commit-subject'>Fix some issue references in NEWS<span class='decoration'></span></div><div class='commit-msg'></div>