Skip to content
Snippets Groups Projects
Commit 49e64bb0 authored by Capucine Berthet's avatar Capucine Berthet Committed by Sébastien Blin
Browse files

UserProfile: resolve display issue

GitLab: #1443

Change-Id: I0334364fbc5cbb84159a66459f25b21a1b8f9271
parent 8dd04cab
Branches
Tags
No related merge requests found
...@@ -36,7 +36,7 @@ BaseModalDialog { ...@@ -36,7 +36,7 @@ BaseModalDialog {
popupContent: Rectangle { popupContent: Rectangle {
color: JamiTheme.backgroundRectangleColor color: JamiTheme.backgroundRectangleColor
width: userProfileDialogLayout.width + 20 width: idRectangle.width + 20
height: userProfileDialogLayout.height + 10 height: userProfileDialogLayout.height + 10
radius: 5 radius: 5
...@@ -69,14 +69,12 @@ BaseModalDialog { ...@@ -69,14 +69,12 @@ BaseModalDialog {
ColumnLayout { ColumnLayout {
id: userProfileDialogLayout id: userProfileDialogLayout
width: Math.min(root.width, 400)
spacing: 10 spacing: 10
RowLayout { RowLayout {
Layout.margins: 10 Layout.margins: 10
Layout.preferredWidth: childrenRect.width
Layout.fillWidth: true
spacing: 10 spacing: 10
Avatar { Avatar {
...@@ -153,8 +151,11 @@ BaseModalDialog { ...@@ -153,8 +151,11 @@ BaseModalDialog {
Rectangle { Rectangle {
Layout.preferredWidth: parent.width id: idRectangle
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: idLayout.width + 20
radius: 5 radius: 5
color: root.backgroundColor color: root.backgroundColor
...@@ -162,12 +163,9 @@ BaseModalDialog { ...@@ -162,12 +163,9 @@ BaseModalDialog {
Layout.preferredHeight: contactId.height + 20 Layout.preferredHeight: contactId.height + 20
Layout.leftMargin: 10 Layout.leftMargin: 10
RowLayout { RowLayout {
id: idLayout id: idLayout
anchors.centerIn: parent anchors.centerIn: parent
anchors.fill: parent
spacing: 15 spacing: 15
Text { Text {
...@@ -185,7 +183,7 @@ BaseModalDialog { ...@@ -185,7 +183,7 @@ BaseModalDialog {
TextEdit { TextEdit {
id: contactId id: contactId
Layout.alignment: Qt.AlignLeft Layout.alignment: Qt.AlignLeft
Layout.preferredWidth: parent.width - identifierText.width - 35 Layout.minimumWidth: 400 - identifierText.width - 2 * root.popupMargins - 35
font.pointSize: JamiTheme.textFontSize font.pointSize: JamiTheme.textFontSize
font.kerning: true font.kerning: true
...@@ -199,7 +197,7 @@ BaseModalDialog { ...@@ -199,7 +197,7 @@ BaseModalDialog {
id: textMetricsContacIdText id: textMetricsContacIdText
font: contactDisplayName.font font: contactDisplayName.font
text: idText text: idText
elideWidth: root.width - 200 elideWidth: root.width - identifierText.width - 2 * root.popupMargins - 60
elide: Qt.ElideMiddle elide: Qt.ElideMiddle
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment