Merge branch 'Plasma/5.2'

11 years ago · 0cc91e9c9e
parent eab4f80b83 c4f2719818
commit 0cc91e9c9e
1 changed files with 2 additions and 0 deletions
--- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml
@ -52,6 +52,8 @@ Item {
            PlasmaComponents.Label {
                id: detailsLabel
                width: modelData.value ? parent.width - detailsLayout.leftColumnWidth - units.smallSpacing : detailsLayout.leftColumnWidth + units.smallSpacing
+                elide: Text.ElideRight
+                wrapMode: Text.NoWrap
                onPaintedWidthChanged: { // horrible HACK to get a column layout
                    if (paintedWidth > detailsLayout.leftColumnWidth) {
                        detailsLayout.leftColumnWidth = paintedWidth