Skip to content

Codex/fix alignment of user account plus icon on macos #9285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rello merged 2 commits into from
Jan 2, 2026
Merged

Codex/fix alignment of user account plus icon on macos #9285

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4b7b7e
fix: align add account icon in tray menu on macos
Rello Jan 2, 2026
ae7a0b1
fix: hide add account row when disabled
Rello Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 41 additions & 5 deletions src/gui/tray/CurrentAccountHeaderButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,27 +123,63 @@ Button {
id: addAccountButton
hoverEnabled: true
visible: Systray.enableAddAccount
height: visible ? implicitHeight : 0
enabled: visible
implicitHeight: Style.trayWindowHeaderHeight

readonly property real addAccountIconSize: Style.accountAvatarSize * Style.smallIconScaleFactor
readonly property real addAccountHorizontalOffset: ( (Style.accountAvatarSize - addAccountIconSize) / 2 ) + Style.accountIconsMenuMargin
readonly property string addAccountIconSource: "image://svgimage-custom-color/add.svg/" + iconColor
property var iconColor: !addAccountButton.enabled
? addAccountButton.palette.mid
: ((addAccountButton.highlighted || addAccountButton.down) && Qt.platform.os !== "windows"
? addAccountButton.palette.highlightedText
: addAccountButton.palette.text)

icon.source: "image://svgimage-custom-color/add.svg/" + iconColor
icon.width: addAccountIconSize
icon.height: addAccountIconSize
leftPadding: addAccountHorizontalOffset
spacing: Style.userLineSpacing
leftPadding: 0
rightPadding: 0
topPadding: 0
bottomPadding: 0
text: qsTr("Add account")
onClicked: UserModel.addAccount()

Accessible.role: Accessible.MenuItem
Accessible.name: qsTr("Add new account")
Accessible.onPressAction: addAccountButton.clicked()

contentItem: Item {
implicitHeight: Style.trayWindowHeaderHeight
implicitWidth: addAccountButton.addAccountHorizontalOffset
+ addAccountButton.addAccountIconSize
+ Style.userLineSpacing
+ addAccountLabel.implicitWidth

RowLayout {
anchors.fill: parent
anchors.leftMargin: addAccountButton.addAccountHorizontalOffset
spacing: Style.userLineSpacing

Image {
source: addAccountButton.addAccountIconSource
sourceSize.width: addAccountButton.addAccountIconSize
sourceSize.height: addAccountButton.addAccountIconSize
Layout.preferredWidth: addAccountButton.addAccountIconSize
Layout.preferredHeight: addAccountButton.addAccountIconSize
Layout.alignment: Qt.AlignVCenter
}

Text {
id: addAccountLabel
text: addAccountButton.text
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
font: addAccountButton.font
Layout.alignment: Qt.AlignVCenter
color: addAccountButton.iconColor
}
}
}
}

MenuSeparator {}
Expand Down
Loading