From b1a7ba7f5a10fcd07eb15c2c1d70e8a6c00a4062 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Wed, 16 Sep 2020 11:44:18 -0400
Subject: [PATCH] messagewebview: adapt message webview header in different
scale factor
Change-Id: I4cf7b16663b5bdbb3f0f095d61411f12b02707d1
---
.../components/MessageWebViewHeader.qml | 47 ++++++-------------
1 file changed, 14 insertions(+), 33 deletions(-)
diff --git a/src/mainview/components/MessageWebViewHeader.qml b/src/mainview/components/MessageWebViewHeader.qml
index 0eaaecac1..5c1a8f160 100644
--- a/src/mainview/components/MessageWebViewHeader.qml
+++ b/src/mainview/components/MessageWebViewHeader.qml
@@ -74,70 +74,51 @@ Rectangle {
Rectangle {
id: userNameOrIdRect
- Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
-
-
+ Layout.alignment: Qt.AlignLeft | Qt.AlignTop
// Width + margin.
Layout.preferredWidth: messagingHeaderRect.width
- backToWelcomeViewButton.width - buttonGroup.width - 45
- Layout.preferredHeight: messagingHeaderRect.height
+ Layout.fillHeight: true
+ Layout.topMargin: 7
+ Layout.bottomMargin: 7
Layout.leftMargin: 16
color: "transparent"
ColumnLayout {
id: userNameOrIdColumnLayout
- Layout.alignment: Qt.AlignVCenter
+
anchors.fill: parent
- Label {
+ spacing: 0
+
+ ElidedTextLabel {
id: userAliasLabel
Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
- Layout.preferredWidth: userNameOrIdRect.width
- Layout.preferredHeight: textMetricsuserAliasLabel.boundingRect.height
- Layout.topMargin: userUserNameLabel.text === "" ? 0 : 10
- font.pointSize: JamiTheme.menuFontSize
+ font.pointSize: JamiTheme.textFontSize + 2
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
- text: textMetricsuserAliasLabel.elidedText
- }
-
- TextMetrics {
- id: textMetricsuserAliasLabel
-
- font: userAliasLabel.font
text: userAliasLabelText
- elideWidth: userNameOrIdRect.width
- elide: Qt.ElideMiddle
+ maxWidth: userNameOrIdRect.width
}
- Label {
+ ElidedTextLabel {
id: userUserNameLabel
- visible: (text !== "")
+
Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
- Layout.preferredWidth: userNameOrIdRect.width
- Layout.preferredHeight: textMetricsuserUserNameLabel.boundingRect.height
- Layout.bottomMargin: 10
+ visible: text !== ""
font.pointSize: JamiTheme.textFontSize
color: JamiTheme.faddedLastInteractionFontColor
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
- text: textMetricsuserUserNameLabel.elidedText
- }
-
- TextMetrics {
- id: textMetricsuserUserNameLabel
-
- font: userUserNameLabel.font
text: userUserNameLabelText
- elideWidth: userNameOrIdRect.width
- elide: Qt.ElideMiddle
+ maxWidth: userNameOrIdRect.width
}
}
}
--
GitLab