ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix eliding matrix id and display name in account switcher

Browse Source
This commit is contained in:
Tobias Fella
2022-11-15 01:12:07 +01:00
parent 2f6f91e678
commit 0eeb7ffbc9
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/qml/Component/UserInfo.qml
View File

@@ -148,12 +148,14 @@ QQC2.ToolBar {
} }
} }
ColumnLayout { ColumnLayout {
Layout.fillWidth: true
spacing: 0 spacing: 0
QQC2.Label { QQC2.Label {
id: displayNameLabel id: displayNameLabel
text: Controller.activeConnection.localUser.displayName text: Controller.activeConnection.localUser.displayName
textFormat: Text.PlainText textFormat: Text.PlainText
elide: Text.ElideRight elide: Text.ElideRight
Layout.fillWidth: true
} }
QQC2.Label { QQC2.Label {
text: (Controller.activeConnection.localUser.accountLabel.length > 0 ? (Controller.activeConnection.localUser.accountLabel + " ") : "") + Controller.activeConnection.localUser.id text: (Controller.activeConnection.localUser.accountLabel.length > 0 ? (Controller.activeConnection.localUser.accountLabel + " ") : "") + Controller.activeConnection.localUser.id
@@ -161,11 +163,9 @@ QQC2.ToolBar {
opacity: 0.7 opacity: 0.7
textFormat: Text.PlainText textFormat: Text.PlainText
elide: Text.ElideRight elide: Text.ElideRight
Layout.fillWidth: true
} }
} }
Item {
Layout.fillWidth: true
}
QQC2.ToolButton { QQC2.ToolButton {
icon.name: "system-switch-user" icon.name: "system-switch-user"
onClicked: { onClicked: {
@@ -177,6 +177,8 @@ QQC2.ToolBar {
QQC2.ToolTip.text: text QQC2.ToolTip.text: text
QQC2.ToolTip.visible: hovered QQC2.ToolTip.visible: hovered
QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
Layout.minimumWidth: Layout.preferredWidth
Layout.alignment: Qt.AlignRight
} }
QQC2.ToolButton { QQC2.ToolButton {
icon.name: "list-add" icon.name: "list-add"
@@ -186,6 +188,8 @@ QQC2.ToolBar {
QQC2.ToolTip.text: text QQC2.ToolTip.text: text
QQC2.ToolTip.visible: hovered QQC2.ToolTip.visible: hovered
QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay QQC2.ToolTip.delay: Kirigami.Units.toolTipDelay
Layout.minimumWidth: Layout.preferredWidth
Layout.alignment: Qt.AlignRight
visible: false visible: false
} }
QQC2.ToolButton { QQC2.ToolButton {
@@ -193,6 +197,8 @@ QQC2.ToolBar {
onClicked: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {}, { title: i18n("Configure") }) onClicked: pageStack.pushDialogLayer("qrc:/SettingsPage.qml", {}, { title: i18n("Configure") })
text: i18n("Open Settings") text: i18n("Open Settings")
display: QQC2.AbstractButton.IconOnly display: QQC2.AbstractButton.IconOnly
Layout.minimumWidth: Layout.preferredWidth
Layout.alignment: Qt.AlignRight
QQC2.ToolTip { QQC2.ToolTip {
text: parent.text text: parent.text
} }