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

AccountComboBox: resolve display issue

GitLab: #1455

Change-Id: Ie572153e1eb89e71f27ba87b2cdd20c74628a1be
parent e2da7777
No related branches found
No related tags found
No related merge requests found
...@@ -79,7 +79,7 @@ Label { ...@@ -79,7 +79,7 @@ Label {
RowLayout { RowLayout {
id: mainLayout id: mainLayout
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 15 anchors.leftMargin: 5
anchors.rightMargin: 15 anchors.rightMargin: 15
spacing: 10 spacing: 10
...@@ -103,7 +103,7 @@ Label { ...@@ -103,7 +103,7 @@ Label {
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 15 anchors.leftMargin: 10
anchors.rightMargin: 15 anchors.rightMargin: 15
spacing: 10 spacing: 10
...@@ -124,15 +124,12 @@ Label { ...@@ -124,15 +124,12 @@ Label {
ColumnLayout { ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.topMargin: 15 spacing: 2
Layout.bottomMargin: 10
spacing: 5
Text { Text {
id: bestNameText id: bestNameText
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
text: CurrentAccount.bestName text: CurrentAccount.bestName
...@@ -148,8 +145,7 @@ Label { ...@@ -148,8 +145,7 @@ Label {
id: bestIdText id: bestIdText
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
visible: text.length && text !== bestNameText.text visible: text.length && text !== bestNameText.text
...@@ -160,7 +156,6 @@ Label { ...@@ -160,7 +156,6 @@ Label {
color: JamiTheme.faddedLastInteractionFontColor color: JamiTheme.faddedLastInteractionFontColor
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignBottom
} }
} }
} }
......
...@@ -53,7 +53,7 @@ Popup { ...@@ -53,7 +53,7 @@ Popup {
Rectangle { Rectangle {
id: comboBox id: comboBox
height: JamiTheme.accountListItemHeight height: JamiTheme.accountListItemHeight - 5
Layout.fillWidth: true Layout.fillWidth: true
radius: 5 radius: 5
color: JamiTheme.accountComboBoxBackgroundColor color: JamiTheme.accountComboBoxBackgroundColor
...@@ -83,13 +83,11 @@ Popup { ...@@ -83,13 +83,11 @@ Popup {
spacing: 10 spacing: 10
Rectangle { Rectangle {
id: accountInfoRect
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
Layout.rightMargin: 5
Layout.leftMargin: 5
color: mouseArea.containsMouse ? JamiTheme.hoverColor : JamiTheme.accountComboBoxBackgroundColor color: mouseArea.containsMouse ? JamiTheme.hoverColor : JamiTheme.accountComboBoxBackgroundColor
radius: 5 radius: 5
Layout.topMargin: 5
MouseArea { MouseArea {
id: mouseArea id: mouseArea
...@@ -163,7 +161,8 @@ Popup { ...@@ -163,7 +161,8 @@ Popup {
Layout.preferredWidth: childrenRect.width Layout.preferredWidth: childrenRect.width
Layout.preferredHeight: parent.height Layout.preferredHeight: parent.height
Layout.rightMargin: 7 Layout.rightMargin: 10
Layout.topMargin: -7
JamiPushButton { JamiPushButton {
id: shareButton id: shareButton
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment