git.iko.soy/unity8
on xenial help sign in
Tablet mode
ccb9c9bAlbert Astals
qml/Dash/DashContent.qml+3−1
compare with xenial
unifiedsplit
@@ -220,8 +220,10 @@ Item {
220
220
221 afterLineChildItem: DashDepartments {
221 afterLineChildItem: DashDepartments {
222 scope: dashContentList.currentItem ? dashContentList.currentItem.theScope : null
222 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
224 windowHeight: dashContent.height
225 windowHeight: dashContent.height
226+ windowWidth: dashContent.width
225 }
227 }
226 }
228 }
227 }
229 }
qml/Dash/DashDepartments.qml+6−4
@@ -21,14 +21,15 @@ AbstractButton {
21 id: root
21 id: root
22 objectName: "dashDepartments"
22 objectName: "dashDepartments"
23
23
24− property int windowHeight: 0
25−
26 property var scope: null
24 property var scope: null
27
25
28 property bool showList: false
26 property bool showList: false
29
27
30 readonly property var currentDepartment: scope && scope.hasDepartments ? scope.getDepartment(scope.currentDepartmentId) : null
28 readonly property var currentDepartment: scope && scope.hasDepartments ? scope.getDepartment(scope.currentDepartmentId) : null
31
29
30+ property alias windowWidth: blackRect.width
31+ property alias windowHeight: blackRect.height
32+
32 // Are we drilling down the tree or up?
33 // Are we drilling down the tree or up?
33 property bool isGoingBack: false
34 property bool isGoingBack: false
34
35
@@ -41,11 +42,11 @@ AbstractButton {
41 }
42 }
42
43
43 Rectangle {
44 Rectangle {
45+ id: blackRect
44 color: "black"
46 color: "black"
45 opacity: 0.3
47 opacity: 0.3
46− width: parent.width
47 anchors.top: departmentListView.top
48 anchors.top: departmentListView.top
48− height: windowHeight
49+ anchors.right: parent.right
49 visible: departmentListView.currentItem && departmentListView.currentItem.visible
50 visible: departmentListView.currentItem && departmentListView.currentItem.visible
50 }
51 }
51
52
@@ -95,6 +96,7 @@ AbstractButton {
95 objectName: "departmentListView"
96 objectName: "departmentListView"
96 orientation: ListView.Horizontal
97 orientation: ListView.Horizontal
97 interactive: false
98 interactive: false
99+ clip: root.width != windowWidth
98 model: ListModel {
100 model: ListModel {
99 id: departmentModel
101 id: departmentModel
100 // We have two roles
102 // We have two roles