on xenial help sign in
Tablet mode
commitccb9c9b00e018f01d90664714b9bcfea3bf75368 authorAlbert Astals <albert.astals@canonical.com> dateThu 29 May 2014, 16:01 (12 years ago) parent5365ece
2 files changed+9−5
qml/Dash/DashContent.qml+3−1 qml/Dash/DashDepartments.qml+6−4
qml/Dash/DashContent.qml+3−1
@@ -220,8 +220,10 @@ Item {
220220
221221 afterLineChildItem: DashDepartments {
222222 scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
223− width: parent.width
223+ width: parent.width <= units.gu(60) ? parent.width : units.gu(40)
224+ anchors.right: parent.right
224225 windowHeight: dashContent.height
226+ windowWidth: dashContent.width
225227 }
226228 }
227229 }
qml/Dash/DashDepartments.qml+6−4
@@ -21,14 +21,15 @@ AbstractButton {
2121 id: root
2222 objectName: "dashDepartments"
2323
24− property int windowHeight: 0
25−
2624 property var scope: null
2725
2826 property bool showList: false
2927
3028 readonly property var currentDepartment: scope && scope.hasDepartments ? scope.getDepartment(scope.currentDepartmentId) : null
3129
30+ property alias windowWidth: blackRect.width
31+ property alias windowHeight: blackRect.height
32+
3233 // Are we drilling down the tree or up?
3334 property bool isGoingBack: false
3435
@@ -41,11 +42,11 @@ AbstractButton {
4142 }
4243
4344 Rectangle {
45+ id: blackRect
4446 color: "black"
4547 opacity: 0.3
46− width: parent.width
4748 anchors.top: departmentListView.top
48− height: windowHeight
49+ anchors.right: parent.right
4950 visible: departmentListView.currentItem && departmentListView.currentItem.visible
5051 }
5152
@@ -95,6 +96,7 @@ AbstractButton {
9596 objectName: "departmentListView"
9697 orientation: ListView.Horizontal
9798 interactive: false
99+ clip: root.width != windowWidth
98100 model: ListModel {
99101 id: departmentModel
100102 // We have two roles