git.iko.soy/unity8
on xenial help sign in
Limit fullLabel width and height
6ed95f2Albert Astals Cid
qml/Launcher/Drawer.qml+9−4
compare with xenial
unifiedsplit
@@ -28,6 +28,7 @@ FocusScope {
28 property int panelWidth: 0
28 property int panelWidth: 0
29 readonly property bool moving: listLoader.item && listLoader.item.moving
29 readonly property bool moving: listLoader.item && listLoader.item.moving
30 readonly property Item searchTextField: searchField
30 readonly property Item searchTextField: searchField
31+ readonly property real delegateWidth: units.gu(10)
31
32
32 signal applicationSelected(string appId)
33 signal applicationSelected(string appId)
33
34
@@ -272,7 +273,7 @@ FocusScope {
272
273
273 model: sortProxyModel
274 model: sortProxyModel
274
275
275− delegateWidth: units.gu(10)
276+ delegateWidth: root.delegateWidth
276 delegateHeight: units.gu(10)
277 delegateHeight: units.gu(10)
277 delegate: drawerDelegateComponent
278 delegate: drawerDelegateComponent
278 }
279 }
@@ -332,7 +333,7 @@ FocusScope {
332 filterLetter: model.letter
333 filterLetter: model.letter
333 dynamicSortFilter: false
334 dynamicSortFilter: false
334 }
335 }
335− delegateWidth: units.gu(10)
336+ delegateWidth: root.delegateWidth
336 delegateHeight: units.gu(10)
337 delegateHeight: units.gu(10)
337 delegate: drawerDelegateComponent
338 delegate: drawerDelegateComponent
338 }
339 }
@@ -413,12 +414,16 @@ FocusScope {
413 active: label.truncated && drawerDelegate.hovered
414 active: label.truncated && drawerDelegate.hovered
414 sourceComponent: Rectangle {
415 sourceComponent: Rectangle {
415 color: UbuntuColors.jet
416 color: UbuntuColors.jet
416− width: fullLabel.width + units.gu(1)
417+ width: fullLabel.contentWidth + units.gu(1)
417 height: fullLabel.height + units.gu(1)
418 height: fullLabel.height + units.gu(1)
418− border.color: UbuntuColors.blue
419 radius: units.dp(4)
419 radius: units.dp(4)
420 Label {
420 Label {
421 id: fullLabel
421 id: fullLabel
422+ width: Math.min(root.delegateWidth * 2, implicitWidth)
423+ wrapMode: Text.Wrap
424+ horizontalAlignment: Text.AlignHCenter
425+ maximumLineCount: 3
426+ elide: Text.ElideRight
422 anchors.centerIn: parent
427 anchors.centerIn: parent
423 text: model.name
428 text: model.name
424 fontSize: "small"
429 fontSize: "small"