Fix for "Opening photo from file muncher doesn't start gallery" #14
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| /* | ||
| * Copyright (C) 2012 Andrea Bernabei <and.bernabei@gmail.com> | ||
| * | ||
| * You may use this file under the terms of the BSD license as follows: | ||
| * | ||
| * "Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are | ||
| * met: | ||
| * * Redistributions of source code must retain the above copyright | ||
| * notice, this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in | ||
| * the documentation and/or other materials provided with the | ||
| * distribution. | ||
| * * Neither the name of Nemo Mobile nor the names of its contributors | ||
| * may be used to endorse or promote products derived from this | ||
| * software without specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." | ||
| */ | ||
| import QtQuick 1.1 | ||
|
|
||
| Item { | ||
| id: imageItem | ||
| property bool isVideo: false | ||
| property bool pinchEnabled: true | ||
| property bool flickEnabled: pinchImg.totalScale == 1 | ||
| property int pageWidth: 0 | ||
| property int pageHeight: 0 | ||
| property variant doubleClickTimer: timer | ||
| property string source: "" | ||
| property int doubleClickInterval: 350 | ||
| anchors.centerIn: parent | ||
|
|
||
| function resetZoom() { | ||
| if(imageItem.width <= 0) | ||
| return | ||
| if(imageItem.width == imageItem.height) { | ||
| // @todo for some reason first image shown is with | ||
| // width == height causing wrong aspect ratio to be set. | ||
| // Figure out why. This still works. -vranki | ||
| console.log("resetZoom workaround") | ||
| return | ||
| } | ||
| flickImg.contentWidth = imageItem.width | ||
| flickImg.contentHeight = imageItem.height | ||
| flickImg.returnToBounds() | ||
| } | ||
| Item { | ||
| id: rect | ||
|
There was a problem hiding this comment. Unnecessary Item; merge it with the Flickable. |
||
| anchors.centerIn: parent | ||
|
|
||
| width: Math.min(img.width*img.scale, parent.width) | ||
|
There was a problem hiding this comment. Is img.scale ever even set with this new pinch code? |
||
| height: Math.min(img.height*img.scale, parent.height) | ||
| Flickable { | ||
| id: flickImg | ||
|
|
||
| anchors.fill: rect | ||
| transformOrigin: Item.TopLeft | ||
| contentWidth: imageItem.width | ||
| contentHeight: imageItem.height | ||
|
|
||
| PinchArea { | ||
| id: pinchImg | ||
| width: Math.max(flickImg.contentWidth, flickImg.width) | ||
| height: Math.max(flickImg.contentHeight, flickImg.height) | ||
| property real totalScale: flickImg.contentWidth / imageItem.width | ||
| pinch.minimumScale: 1 | ||
| pinch.maximumScale: 5 | ||
|
There was a problem hiding this comment. If these even apply (they're meant to be used with pinch.target), they look wrong: wouldn't that mean you can't do less than 1x or more than 5x in a single pinch gesture, with no relation to the total scale factor? |
||
| property real initialWidth | ||
| property real initialHeight | ||
| onPinchStarted: { | ||
| initialWidth = flickImg.contentWidth | ||
| initialHeight = flickImg.contentHeight | ||
| } | ||
|
|
||
| onPinchUpdated: { | ||
| // adjust content pos due to drag | ||
| flickImg.contentX += pinch.previousCenter.x - pinch.center.x | ||
| flickImg.contentY += pinch.previousCenter.y - pinch.center.y | ||
|
|
||
| if(initialWidth * pinch.scale < imageItem.width) { | ||
| flickImg.contentWidth = imageItem.width | ||
| flickImg.contentHeight = imageItem.height | ||
| return | ||
| } | ||
| if(initialWidth * pinch.scale > imageItem.width*5) { | ||
|
There was a problem hiding this comment. Also not going to limit the total scale factor (because it uses pinch.scale), and this will fail for images where height > width. Calculate the actual effective scale factor as it would be after resize, bound that, and apply it. There was a problem hiding this comment. I was wrong here, because initialWidth is the size at the start of the gesture, and aspect ratio is fixed. This will work as intended. |
||
| flickImg.contentWidth = imageItem.width*5 | ||
| flickImg.contentHeight = imageItem.height*5 | ||
| return | ||
| } | ||
| // resize content | ||
| flickImg.resizeContent(initialWidth * pinch.scale, initialHeight * pinch.scale, pinch.center) | ||
| } | ||
|
|
||
| onPinchFinished: { | ||
| // Move its content within bounds. | ||
| flickImg.returnToBounds() | ||
| } | ||
|
|
||
| Image { | ||
| source: imageItem.source | ||
| id: img | ||
| asynchronous: true | ||
| transformOrigin: Item.TopLeft | ||
| sourceSize.width: 1200 | ||
| width: flickImg.contentWidth | ||
| height: flickImg.contentHeight | ||
|
|
||
| MouseArea { | ||
| anchors.fill: parent | ||
| onClicked: { | ||
| if (!isVideo) { | ||
| if (timer.running) resetZoom() | ||
| else timer.start() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| Timer { | ||
| id: timer | ||
| interval: doubleClickInterval | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why?
Edit: read your explanation from before. Sort of makes sense, but I'd really like to know what exactly is going on and how it could really be fixed.