summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-07-19 22:50:39 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-07-19 22:50:39 +0200
commit3d97a3b4beadf3304c732e66e44d561b08e6bbe5 (patch)
treee6e53f77f29a51c4c0c6bb6b3ef8973ce16adc3c
parent157dc77e2231d8c21e17d91fc59b36e3cb225e2d (diff)
downloadkube-3d97a3b4beadf3304c732e66e44d561b08e6bbe5.tar.gz
kube-3d97a3b4beadf3304c732e66e44d561b08e6bbe5.zip
Anchor the treeview properly
-rw-r--r--framework/qml/InlineAccountSwitcher.qml5
-rw-r--r--framework/qml/TreeView.qml4
2 files changed, 7 insertions, 2 deletions
diff --git a/framework/qml/InlineAccountSwitcher.qml b/framework/qml/InlineAccountSwitcher.qml
index c62cab7d..a9ef95f9 100644
--- a/framework/qml/InlineAccountSwitcher.qml
+++ b/framework/qml/InlineAccountSwitcher.qml
@@ -47,8 +47,11 @@ FocusScope {
47 property variant currentData: model 47 property variant currentData: model
48 property bool isCurrent: (model.accountId == root.currentAccount) 48 property bool isCurrent: (model.accountId == root.currentAccount)
49 49
50 anchors {
51 left: layout.left
52 right: layout.right
53 }
50 height: Kube.Units.gridUnit 54 height: Kube.Units.gridUnit
51 width: root.width
52 Layout.fillHeight: isCurrent 55 Layout.fillHeight: isCurrent
53 56
54 Rectangle { 57 Rectangle {
diff --git a/framework/qml/TreeView.qml b/framework/qml/TreeView.qml
index 7abfe271..445ad673 100644
--- a/framework/qml/TreeView.qml
+++ b/framework/qml/TreeView.qml
@@ -38,7 +38,7 @@ Flickable {
38 38
39 Controls2.ScrollBar.vertical: Controls2.ScrollBar {} 39 Controls2.ScrollBar.vertical: Controls2.ScrollBar {}
40 clip: true 40 clip: true
41 contentWidth: treeView.width 41 contentWidth: root.width
42 contentHeight: treeView.implicitHeight 42 contentHeight: treeView.implicitHeight
43 Kube.ScrollHelper { 43 Kube.ScrollHelper {
44 id: scrollHelper 44 id: scrollHelper
@@ -150,8 +150,10 @@ Flickable {
150 anchors { 150 anchors {
151 verticalCenter: parent.verticalCenter 151 verticalCenter: parent.verticalCenter
152 left: parent.left 152 left: parent.left
153 right: parent.right
153 } 154 }
154 text: styleData.value 155 text: styleData.value
156 elide: Qt.ElideRight
155 color: Kube.Colors.viewBackgroundColor 157 color: Kube.Colors.viewBackgroundColor
156 } 158 }
157 } 159 }