[Pkg-privacy-commits] [tails-installer] 117/210: Make the window resizeable again

[Intrigeri]

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to tag 3.90.0
in repository tails-installer.

commit f2043666f272c6e7a4131128b572110675a1d2ba
Author: Martin Briza <mbriza at redhat.com>
Date:   Wed Jul 8 13:33:42 2015 +0200

    Make the window resizeable again
---
 liveusb/components/ImageList.qml | 27 +++++++++++++++++++--------
 liveusb/liveusb.qml              |  4 ++++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/liveusb/components/ImageList.qml b/liveusb/components/ImageList.qml
index 492eb54..d737386 100644
--- a/liveusb/components/ImageList.qml
+++ b/liveusb/components/ImageList.qml
@@ -128,21 +128,32 @@ Item {
         Component.onCompleted: update()
     }
 
+    ParallelAnimation {
+        id: moveUp
+        NumberAnimation {
+            target: whiteBackground
+            property: "y"
+            to: 54
+        }
+    }
+
     Rectangle {
+        id: whiteBackground
         z: -1
         clip: true
         radius: 6
         color: "white"
+        y: liveUSBData.releaseProxyModel.isFront ? parent.height / 2 - height / 2 : 54
 
-        height: !liveUSBData.releaseProxyModel.isFront ? parent.height - 54 + 4 : parent.height - 108
-        Behavior on height {
+        //height: !liveUSBData.releaseProxyModel.isFront ? parent.height - 54 + 4 : parent.height - 108
+        height: liveUSBData.releaseProxyModel.isFront ? 84 * 4 + 36 : parent.height
+
+        /*Behavior on height {
             NumberAnimation { duration: root.fadeDuration }
-        }
+        }*/
         anchors {
-            top: parent.top
             left: parent.left
             right: parent.right
-            topMargin: 54
             rightMargin: 64
             leftMargin: anchors.rightMargin
         }
@@ -162,8 +173,7 @@ Item {
                 fill: parent
                 leftMargin: 64
                 rightMargin: anchors.leftMargin - (fullList.width - fullList.viewport.width)
-                topMargin: 54
-                bottomMargin: -anchors.topMargin
+                topMargin: whiteBackground.y
             }
             footer: Item {
                 height: !liveUSBData.releaseProxyModel.isFront ? 54 : 36
@@ -195,6 +205,7 @@ Item {
                                 parent.color = "transparent"
                         }
                         onClicked: {
+                            moveUp.start()
                             liveUSBData.releaseProxyModel.isFront = false
                         }
                         onPressed: {
@@ -214,7 +225,7 @@ Item {
             delegate: imageDelegate
 
             remove: Transition {
-                NumberAnimation { properties: "x"; to: -width; duration: 300 }
+                NumberAnimation { properties: "x"; to: width; duration: 300 }
             }
             removeDisplaced: Transition {
                 NumberAnimation { properties: "x,y"; duration: 300 }
diff --git a/liveusb/liveusb.qml b/liveusb/liveusb.qml
index dc824b6..5ae26a5 100644
--- a/liveusb/liveusb.qml
+++ b/liveusb/liveusb.qml
@@ -9,10 +9,14 @@ import "components"
 
 ApplicationWindow {
     id: mainWindow
+    /*
     minimumWidth: 800
     minimumHeight: 480
     maximumHeight: minimumHeight
     maximumWidth: minimumWidth
+    */
+    width: 800
+    height: 480
     title: qsTranslate("", "Fedora LiveUSB Creator")
 
     SystemPalette {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git