rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix metadata not resizing properly

Browse Source
This commit is contained in:
Nicolas Werner 2022-03-01 03:12:57 +01:00
parent 23efa8f815
commit 35a2b0e45a
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
resources/qml/TimelineRow.qml
View File

@ -141,6 +141,7 @@ Item {
Layout.column: 0 Layout.column: 0
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: height Layout.preferredHeight: height
Layout.minimumWidth: 80
id: contentItem id: contentItem
blurhash: r.blurhash blurhash: r.blurhash
@ -168,7 +169,7 @@ Item {
metadataWidth: metadata.width metadataWidth: metadata.width
} }
RowLayout { Row {
id: metadata id: metadata
Layout.column: Settings.bubbles? 0 : 1 Layout.column: Settings.bubbles? 0 : 1
Layout.row: Settings.bubbles? 2 : 0 Layout.row: Settings.bubbles? 2 : 0
@ -178,28 +179,33 @@ Item {
Layout.alignment: Qt.AlignTop | Qt.AlignRight Layout.alignment: Qt.AlignTop | Qt.AlignRight
Layout.preferredWidth: implicitWidth Layout.preferredWidth: implicitWidth
visible: !isStateEvent visible: !isStateEvent
spacing: 2
property double scaling: Settings.bubbles? 0.75 : 1 property double scaling: Settings.bubbles? 0.75 : 1
property int iconSize: Math.floor(fontMetrics.ascent*scaling)
StatusIndicator { StatusIndicator {
Layout.alignment: Qt.AlignRight | Qt.AlignTop Layout.alignment: Qt.AlignRight | Qt.AlignTop
Layout.preferredHeight: 16*parent.scaling height: parent.iconSize
Layout.preferredWidth: 16*parent.scaling width: parent.iconSize
status: r.status status: r.status
eventId: r.eventId eventId: r.eventId
anchors.verticalCenter: ts.verticalCenter
} }
Image { Image {
visible: isEdited || eventId == chat.model.edit visible: isEdited || eventId == chat.model.edit
Layout.alignment: Qt.AlignRight | Qt.AlignTop Layout.alignment: Qt.AlignRight | Qt.AlignTop
Layout.preferredHeight: 16*parent.scaling height: parent.iconSize
Layout.preferredWidth: 16*parent.scaling width: parent.iconSize
sourceSize.width: 16 * Screen.devicePixelRatio*parent.scaling sourceSize.width: parent.iconSize * Screen.devicePixelRatio
sourceSize.height: 16 * Screen.devicePixelRatio*parent.scaling sourceSize.height: parent.iconSize * Screen.devicePixelRatio
source: "image://colorimage/:/icons/icons/ui/edit.svg?" + ((eventId == chat.model.edit) ? Nheko.colors.highlight : Nheko.colors.buttonText) source: "image://colorimage/:/icons/icons/ui/edit.svg?" + ((eventId == chat.model.edit) ? Nheko.colors.highlight : Nheko.colors.buttonText)
ToolTip.visible: editHovered.hovered ToolTip.visible: editHovered.hovered
ToolTip.delay: Nheko.tooltipDelay ToolTip.delay: Nheko.tooltipDelay
ToolTip.text: qsTr("Edited") ToolTip.text: qsTr("Edited")
anchors.verticalCenter: ts.verticalCenter
HoverHandler { HoverHandler {
id: editHovered id: editHovered
@ -212,13 +218,15 @@ Item {
encrypted: isEncrypted encrypted: isEncrypted
trust: trustlevel trust: trustlevel
Layout.alignment: Qt.AlignRight | Qt.AlignTop Layout.alignment: Qt.AlignRight | Qt.AlignTop
Layout.preferredHeight: 16*parent.scaling height: parent.iconSize
Layout.preferredWidth: 16*parent.scaling width: parent.iconSize
sourceSize.width: 16 * Screen.devicePixelRatio*parent.scaling sourceSize.width: parent.iconSize * Screen.devicePixelRatio
sourceSize.height: 16 * Screen.devicePixelRatio*parent.scaling sourceSize.height: parent.iconSize * Screen.devicePixelRatio
anchors.verticalCenter: ts.verticalCenter
} }
Label { Label {
id: ts
Layout.alignment: Qt.AlignRight | Qt.AlignTop Layout.alignment: Qt.AlignRight | Qt.AlignTop
Layout.preferredWidth: implicitWidth Layout.preferredWidth: implicitWidth
text: timestamp.toLocaleTimeString(Locale.ShortFormat) text: timestamp.toLocaleTimeString(Locale.ShortFormat)
@ -226,7 +234,7 @@ Item {
ToolTip.visible: ma.hovered ToolTip.visible: ma.hovered
ToolTip.delay: Nheko.tooltipDelay ToolTip.delay: Nheko.tooltipDelay
ToolTip.text: Qt.formatDateTime(timestamp, Qt.DefaultLocaleLongDate) ToolTip.text: Qt.formatDateTime(timestamp, Qt.DefaultLocaleLongDate)
font.pointSize: 10*parent.scaling font.pointSize: fontMetrics.font.pointSize*parent.scaling
HoverHandler { HoverHandler {
id: ma id: ma
} }