git.iko.soy/unity8
on xenial help sign in
Animate a bit
665a167Albert Astals
qml/Dash/DashDepartments.qml+3−3
compare with xenial
unifiedsplit
@@ -45,7 +45,7 @@ AbstractButton {
45 width: parent.width
45 width: parent.width
46 anchors.top: departmentListView.top
46 anchors.top: departmentListView.top
47 height: windowHeight
47 height: windowHeight
48− visible: showList
48+ visible: departmentListView.currentItem && departmentListView.currentItem.visible
49 }
49 }
50
50
51 Image {
51 Image {
@@ -102,9 +102,9 @@ AbstractButton {
102 onHeightChanged: prevHeight = height;
102 onHeightChanged: prevHeight = height;
103 anchors.top: root.bottom
103 anchors.top: root.bottom
104 delegate: DashDepartmentsList {
104 delegate: DashDepartmentsList {
105− visible: root.showList
105+ visible: height != 0
106 width: departmentListView.width
106 width: departmentListView.width
107− height: department && department.loaded ? Math.min(implicitHeight, departmentListView.maxHeight) : departmentListView.prevHeight
107+ height: !root.showList ? 0 : department && department.loaded ? Math.min(implicitHeight, departmentListView.maxHeight) : departmentListView.prevHeight
108 department: scope.getDepartment(departmentId)
108 department: scope.getDepartment(departmentId)
109 onEnterDepartment: {
109 onEnterDepartment: {
110 scope.loadDepartment(departmentId);
110 scope.loadDepartment(departmentId);
qml/Dash/DashDepartmentsList.qml+7
@@ -39,6 +39,13 @@ Item {
39 }
39 }
40 clip: true
40 clip: true
41
41
42+ Behavior on height {
43+ UbuntuNumberAnimation {
44+ id: heightAnimation
45+ duration: UbuntuAnimation.SnapDuration
46+ }
47+ }
48+
42 Flickable {
49 Flickable {
43 id: flickable
50 id: flickable
44
51