From 4ca37a6293409ff857cd7d6a00401bf398aa7191 Mon Sep 17 00:00:00 2001
From: cberthet <capucine.berthet@savoirfairelinux.com>
Date: Thu, 14 Dec 2023 13:41:21 -0500
Subject: [PATCH] AccountComboBox: resolve display issue
GitLab: #1455
Change-Id: Ie572153e1eb89e71f27ba87b2cdd20c74628a1be
---
src/app/mainview/components/AccountComboBox.qml | 13 ++++---------
.../mainview/components/AccountComboBoxPopup.qml | 9 ++++-----
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/app/mainview/components/AccountComboBox.qml b/src/app/mainview/components/AccountComboBox.qml
index 48ff40bf4..180b818d5 100644
--- a/src/app/mainview/components/AccountComboBox.qml
+++ b/src/app/mainview/components/AccountComboBox.qml
@@ -79,7 +79,7 @@ Label {
RowLayout {
id: mainLayout
anchors.fill: parent
- anchors.leftMargin: 15
+ anchors.leftMargin: 5
anchors.rightMargin: 15
spacing: 10
@@ -103,7 +103,7 @@ Label {
RowLayout {
anchors.fill: parent
- anchors.leftMargin: 15
+ anchors.leftMargin: 10
anchors.rightMargin: 15
spacing: 10
@@ -124,15 +124,12 @@ Label {
ColumnLayout {
Layout.fillWidth: true
Layout.fillHeight: true
- Layout.topMargin: 15
- Layout.bottomMargin: 10
- spacing: 5
+ spacing: 2
Text {
id: bestNameText
Layout.fillWidth: true
- Layout.fillHeight: true
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
text: CurrentAccount.bestName
@@ -148,8 +145,7 @@ Label {
id: bestIdText
Layout.fillWidth: true
- Layout.fillHeight: true
- Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
+ Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
visible: text.length && text !== bestNameText.text
@@ -160,7 +156,6 @@ Label {
color: JamiTheme.faddedLastInteractionFontColor
elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft
- verticalAlignment: Text.AlignBottom
}
}
}
diff --git a/src/app/mainview/components/AccountComboBoxPopup.qml b/src/app/mainview/components/AccountComboBoxPopup.qml
index 48585085a..d9e10e0ca 100644
--- a/src/app/mainview/components/AccountComboBoxPopup.qml
+++ b/src/app/mainview/components/AccountComboBoxPopup.qml
@@ -53,7 +53,7 @@ Popup {
Rectangle {
id: comboBox
- height: JamiTheme.accountListItemHeight
+ height: JamiTheme.accountListItemHeight - 5
Layout.fillWidth: true
radius: 5
color: JamiTheme.accountComboBoxBackgroundColor
@@ -83,13 +83,11 @@ Popup {
spacing: 10
Rectangle {
+ id: accountInfoRect
Layout.fillWidth: true
Layout.fillHeight: true
- Layout.rightMargin: 5
- Layout.leftMargin: 5
color: mouseArea.containsMouse ? JamiTheme.hoverColor : JamiTheme.accountComboBoxBackgroundColor
radius: 5
- Layout.topMargin: 5
MouseArea {
id: mouseArea
@@ -163,7 +161,8 @@ Popup {
Layout.preferredWidth: childrenRect.width
Layout.preferredHeight: parent.height
- Layout.rightMargin: 7
+ Layout.rightMargin: 10
+ Layout.topMargin: -7
JamiPushButton {
id: shareButton
--
GitLab