diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-04-25 10:56:17 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-04-25 12:01:00 +0300 |
| commit | ee92918ac7fbf71fcf234356f137232fe3174829 (patch) | |
| tree | a395fbb0e86cf72b5f3b39a983f0d3041c13f219 | |
| parent | ab7d642fc3e7757d6ba993b599716a27422e9f9b (diff) | |
images and tweaks to photo gallery
Change-Id: I23b63f0e031d41d8bb7980307f1d2443cfebbbe8
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| -rw-r--r-- | basicsuite/Photo Gallery/main.qml | 6 | ||||
| -rw-r--r-- | images/image20606.jpg | bin | 0 -> 192750 bytes | |||
| -rw-r--r-- | images/image20654.jpg | bin | 0 -> 553401 bytes | |||
| -rw-r--r-- | images/image21238.jpg | bin | 0 -> 266778 bytes | |||
| -rw-r--r-- | images/image27324.jpg | bin | 0 -> 284663 bytes | |||
| -rw-r--r-- | images/image28551.jpg | bin | 0 -> 623773 bytes | |||
| -rw-r--r-- | images/image29108.jpg | bin | 0 -> 419122 bytes | |||
| -rw-r--r-- | images/image31477.jpg | bin | 0 -> 313219 bytes | |||
| -rw-r--r-- | images/image4584.jpg | bin | 0 -> 530226 bytes | |||
| -rw-r--r-- | images/image5786.jpg | bin | 0 -> 228649 bytes | |||
| -rw-r--r-- | images/image5900.jpg | bin | 0 -> 388205 bytes | |||
| -rw-r--r-- | images/image7286.jpg | bin | 0 -> 497085 bytes | |||
| -rw-r--r-- | images/image7916.jpg | bin | 0 -> 306747 bytes |
13 files changed, 1 insertions, 5 deletions
diff --git a/basicsuite/Photo Gallery/main.qml b/basicsuite/Photo Gallery/main.qml index d3bedba..fa0e577 100644 --- a/basicsuite/Photo Gallery/main.qml +++ b/basicsuite/Photo Gallery/main.qml @@ -201,11 +201,10 @@ Item { var targetScale; // Rotation needed... - if (imageIsLandscape != screenIsLandscape) { + if (imageIsLandscape != screenIsLandscape && width != height) { root.targetRotation = 90; var aspect = width / height var screenAspect = root.height / root.width - print("Aspect ratios in portrait: ", aspect, screenAspect); if (aspect > screenAspect) { targetScale = root.height / width @@ -216,7 +215,6 @@ Item { root.targetRotation = 0; var aspect = height / width; var screenAspect = root.height / root.width - print("Aspect ratios in portrait: ", aspect, screenAspect); if (aspect > screenAspect) { targetScale = root.height / height @@ -231,8 +229,6 @@ Item { width = root.size height = root.size; - print("BigImage size: ", width, height, targetWidth, targetHeight); - finalizeEnterLargeAnimation.running = true; } } diff --git a/images/image20606.jpg b/images/image20606.jpg Binary files differnew file mode 100644 index 0000000..803273e --- /dev/null +++ b/images/image20606.jpg diff --git a/images/image20654.jpg b/images/image20654.jpg Binary files differnew file mode 100644 index 0000000..b7e8733 --- /dev/null +++ b/images/image20654.jpg diff --git a/images/image21238.jpg b/images/image21238.jpg Binary files differnew file mode 100644 index 0000000..dd5b4cf --- /dev/null +++ b/images/image21238.jpg diff --git a/images/image27324.jpg b/images/image27324.jpg Binary files differnew file mode 100644 index 0000000..e84b485 --- /dev/null +++ b/images/image27324.jpg diff --git a/images/image28551.jpg b/images/image28551.jpg Binary files differnew file mode 100644 index 0000000..83d4ca2 --- /dev/null +++ b/images/image28551.jpg diff --git a/images/image29108.jpg b/images/image29108.jpg Binary files differnew file mode 100644 index 0000000..9dc8758 --- /dev/null +++ b/images/image29108.jpg diff --git a/images/image31477.jpg b/images/image31477.jpg Binary files differnew file mode 100644 index 0000000..ff8c606 --- /dev/null +++ b/images/image31477.jpg diff --git a/images/image4584.jpg b/images/image4584.jpg Binary files differnew file mode 100644 index 0000000..29e66c5 --- /dev/null +++ b/images/image4584.jpg diff --git a/images/image5786.jpg b/images/image5786.jpg Binary files differnew file mode 100644 index 0000000..c2628b9 --- /dev/null +++ b/images/image5786.jpg diff --git a/images/image5900.jpg b/images/image5900.jpg Binary files differnew file mode 100644 index 0000000..3d4ce89 --- /dev/null +++ b/images/image5900.jpg diff --git a/images/image7286.jpg b/images/image7286.jpg Binary files differnew file mode 100644 index 0000000..12484c2 --- /dev/null +++ b/images/image7286.jpg diff --git a/images/image7916.jpg b/images/image7916.jpg Binary files differnew file mode 100644 index 0000000..64f67c5 --- /dev/null +++ b/images/image7916.jpg |
