Commit 89847645 authored by Marco Martin's avatar Marco Martin
Browse files

Merge branch 'Plasma/5.19'

parents 57786359 ab0362b4
......@@ -37,7 +37,7 @@ Faces.SensorFace {
// Arbitrary minimumWidth to make easier to align plasmoids in a predictable way
Layout.minimumWidth: Math.max(Kirigami.Units.gridUnit * compactRepresentation.barCount, Kirigami.Units.gridUnit * 8)
Layout.preferredWidth: titleMetrics.width + leftPadding + rightPadding
Layout.preferredWidth: titleMetrics.width
contentItem: ColumnLayout {
Kirigami.Heading {
......
......@@ -34,10 +34,11 @@ Faces.SensorFace {
readonly property bool showLegend: controller.faceConfiguration.showLegend
// Arbitrary minimumWidth to make easier to align plasmoids in a predictable way
Layout.minimumWidth: Kirigami.Units.gridUnit * 8
Layout.preferredWidth: titleMetrics.width + leftPadding + rightPadding
Layout.preferredWidth: titleMetrics.width
contentItem: ColumnLayout {
Kirigami.Heading {
id: heading
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
......
......@@ -36,11 +36,12 @@ Faces.SensorFace {
readonly property bool showLegend: controller.faceConfiguration.showLegend
Layout.minimumWidth: Kirigami.Units.gridUnit * 8
Layout.preferredWidth: titleMetrics.width + leftPadding + rightPadding
Layout.preferredWidth: titleMetrics.width
contentItem: ColumnLayout {
spacing: Kirigami.Units.largeSpacing + Kirigami.Units.smallSpacing
Kirigami.Heading {
id: heading
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
......
......@@ -35,11 +35,12 @@ Faces.SensorFace {
// Arbitrary minimumWidth to make easier to align plasmoids in a predictable way
Layout.minimumWidth: Kirigami.Units.gridUnit * 8
Layout.preferredWidth: titleMetrics.width + leftPadding + rightPadding
Layout.preferredWidth: titleMetrics.width
contentItem: ColumnLayout {
Kirigami.Heading {
id: heading
Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter
elide: Text.ElideRight
......
......@@ -140,7 +140,7 @@ QString Sensor::shortName() const
return d->sensorInfo.name;
}
return d->sensorInfo.name;
return d->sensorInfo.shortName;
}
QString Sensor::description() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment