[Pkg-privacy-commits] [tails-installer] 83/210: Better transitions between lists

[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 1ebd28010d296bd6383dd92f355a848e3c798d00
Author: Martin Briza <mbriza at redhat.com>
Date:   Fri Apr 17 10:26:32 2015 +0200

    Better transitions between lists
---
 liveusb/components/ImageList.qml | 130 +++++++++++++++------------------------
 liveusb/liveusb.qmlproject.user  |   2 +-
 2 files changed, 52 insertions(+), 80 deletions(-)

diff --git a/liveusb/components/ImageList.qml b/liveusb/components/ImageList.qml
index 0e3b66c..03ce03d 100644
--- a/liveusb/components/ImageList.qml
+++ b/liveusb/components/ImageList.qml
@@ -130,8 +130,15 @@ Item {
     }
 
     Rectangle {
-        clip: true
         z: -1
+        clip: true
+        radius: 6
+        color: "white"
+
+        height: root.viewFullList ? parent.height - 54 + 4 : parent.height - 108
+        Behavior on height {
+            NumberAnimation { duration: root.fadeDuration }
+        }
         anchors {
             top: parent.top
             left: parent.left
@@ -144,86 +151,10 @@ Item {
             color: "#c3c3c3"
             width: 1
         }
-        height: root.viewFullList ? parent.height - 54 + 4 : parent.height - 108
-        Behavior on height {
-            NumberAnimation {
-                duration: root.fadeDuration
-            }
-        }
-
-        Item {
-            anchors.fill: parent
-            enabled: !root.viewFullList
-            opacity: root.viewFullList ? 0.0 : 1.0
-            Behavior on opacity {
-                NumberAnimation {
-                    duration: root.fadeDuration
-                }
-            }
-            Column {
-                id: selectedOsColumn
-                anchors {
-                    top: parent.top
-                    left: parent.left
-                    right: parent.right
-                }
-                Repeater {
-                    model: liveUSBData.titleReleaseModel
-                    delegate: imageDelegate
-                }
-            }
-            Rectangle {
-                anchors {
-                    top: selectedOsColumn.bottom
-                    bottom: parent.bottom
-                    left: parent.left
-                    right: parent.right
-                    margins: 1
-                }
-                radius: 3
-                Column {
-                    anchors.centerIn: parent
-                    spacing: 2
-                    Repeater {
-                        model: 3
-                        Rectangle {
-                            height: 4
-                            width: 4
-                            color: "#bebebe"
-                        }
-                    }
-                }
-                MouseArea {
-                    anchors.fill: parent
-                    onClicked: {
-                        root.viewFullList = true
-                    }
-                    onPressed: {
-                        parent.color = "#ededed"
-                    }
-                    onReleased: {
-                        parent.color = "transparent"
-                    }
-                    onCanceled: {
-                        parent.color = "transparent"
-                    }
-                }
-            }
-        }
-
-        radius: 6
-        color: "white"
     }
 
     ScrollView {
         id: fullList
-        enabled: root.viewFullList
-        opacity: root.viewFullList ? 1.0 : 0.0
-        Behavior on opacity {
-            NumberAnimation {
-                duration: root.fadeDuration
-            }
-        }
         anchors.fill: parent
         ListView {
             id: osListView
@@ -236,10 +167,51 @@ Item {
                 bottomMargin: -anchors.topMargin
             }
             footer: Item {
-                height: 54
+                height: root.viewFullList ? 54 : 36
+                width: osListView.width
+                Rectangle {
+                    visible: !root.viewFullList
+                    anchors.fill: parent
+                    anchors.margins: 1
+                    radius: 3
+                    Column {
+                        anchors.centerIn: parent
+                        spacing: 2
+                        Repeater {
+                            model: 3
+                            Rectangle {
+                                height: 4
+                                width: 4
+                                color: "#bebebe"
+                            }
+                        }
+                    }
+                    MouseArea {
+                        anchors.fill: parent
+                        hoverEnabled: true
+                        onHoveredChanged: {
+                            if (containsMouse && !pressed)
+                                parent.color = "#f8f8f8"
+                            if (!containsMouse)
+                                parent.color = "transparent"
+                        }
+                        onClicked: {
+                            root.viewFullList = true
+                        }
+                        onPressed: {
+                            parent.color = "#ededed"
+                        }
+                        onReleased: {
+                            parent.color = "transparent"
+                        }
+                        onCanceled: {
+                            parent.color = "transparent"
+                        }
+                    }
+                }
             }
 
-            model: liveUSBData.releaseProxyModel
+            model: root.viewFullList ? liveUSBData.releaseProxyModel : liveUSBData.titleReleaseModel
             delegate: imageDelegate
 
             remove: Transition {
diff --git a/liveusb/liveusb.qmlproject.user b/liveusb/liveusb.qmlproject.user
index 1fae4ee..2e6368c 100644
--- a/liveusb/liveusb.qmlproject.user
+++ b/liveusb/liveusb.qmlproject.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.3.2, 2015-04-09T14:37:57. -->
+<!-- Written by QtCreator 3.3.2, 2015-04-16T16:30:08. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

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