sidebar/notifs: normalise non expanded height
Also wrap summary when expanded
This commit is contained in:
parent
688cc213ef
commit
60237cb288
1 changed files with 12 additions and 2 deletions
|
|
@ -13,7 +13,7 @@ StyledRect {
|
||||||
required property Props props
|
required property Props props
|
||||||
required property bool expanded
|
required property bool expanded
|
||||||
|
|
||||||
readonly property real nonAnimHeight: expanded ? summary.implicitHeight + expandedContent.implicitHeight + expandedContent.anchors.topMargin + Appearance.padding.normal * 2 : summary.implicitHeight
|
readonly property real nonAnimHeight: expanded ? summary.implicitHeight + expandedContent.implicitHeight + expandedContent.anchors.topMargin + Appearance.padding.normal * 2 : summaryHeightMetrics.height
|
||||||
|
|
||||||
implicitHeight: nonAnimHeight
|
implicitHeight: nonAnimHeight
|
||||||
|
|
||||||
|
|
@ -34,15 +34,23 @@ StyledRect {
|
||||||
timeStr.anchors.margins: Appearance.padding.normal
|
timeStr.anchors.margins: Appearance.padding.normal
|
||||||
expandedContent.anchors.margins: Appearance.padding.normal
|
expandedContent.anchors.margins: Appearance.padding.normal
|
||||||
summary.width: root.width - Appearance.padding.normal * 2 - timeStr.implicitWidth - Appearance.spacing.small
|
summary.width: root.width - Appearance.padding.normal * 2 - timeStr.implicitWidth - Appearance.spacing.small
|
||||||
|
summary.maximumLineCount: Number.MAX_SAFE_INTEGER
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
transitions: Transition {
|
transitions: Transition {
|
||||||
Anim {
|
Anim {
|
||||||
properties: "margins,width"
|
properties: "margins,width,maximumLineCount"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TextMetrics {
|
||||||
|
id: summaryHeightMetrics
|
||||||
|
|
||||||
|
font: summary.font
|
||||||
|
text: " " // Use this height to prevent weird characters from changing the line height
|
||||||
|
}
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
id: summary
|
id: summary
|
||||||
|
|
||||||
|
|
@ -53,6 +61,8 @@ StyledRect {
|
||||||
text: root.modelData.summary
|
text: root.modelData.summary
|
||||||
color: root.modelData.urgency === "critical" ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
|
color: root.modelData.urgency === "critical" ? Colours.palette.m3onSecondaryContainer : Colours.palette.m3onSurface
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
|
wrapMode: Text.WordWrap
|
||||||
|
maximumLineCount: 1
|
||||||
}
|
}
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue