Skip to content

Codex/rebuild settings screen with left menu #9314

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 14, 2026
Merged

Codex/rebuild settings screen with left menu #9314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cf771d
fix: adjust tray spacing and account highlight
Rello Jan 14, 2026
b75970e
Merge pull request #21 from Rello/codex/adjust-content-spacing-and-st…
Rello Jan 14, 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
15 changes: 14 additions & 1 deletion src/gui/tray/CurrentAccountHeaderButton.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,21 @@ Button {
id: userLineInstantiator
model: UserModel
delegate: MenuItem {
id: userLineMenuItem
implicitHeight: instantiatedUserLine.height
UserLine {
padding: 0
leftPadding: 0
rightPadding: 0
topPadding: 0
bottomPadding: 0
indicator: null

background: Rectangle {
color: (userLineMenuItem.highlighted || userLineMenuItem.down) ? Style.ncBlue : "transparent"
radius: 0
}

contentItem: UserLine {
id: instantiatedUserLine
width: Math.min(accountMenu.widestMenuItemWidth, accountMenu.maximumWidthAllowed)

Expand Down
16 changes: 8 additions & 8 deletions src/gui/tray/MainWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ ApplicationWindow {
radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
border.width: Style.trayWindowBorderWidth
border.color: palette.dark
color: Style.colorWithoutTransparency(palette.base)
color: Style.colorWithoutTransparency(palette.dark)
}

property int userIndex: 0
Expand Down Expand Up @@ -176,12 +176,12 @@ ApplicationWindow {
visible: false
clip: true

background: Rectangle {
radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
border.width: Style.trayWindowBorderWidth
border.color: palette.dark
color: Style.colorWithoutTransparency(palette.base)
}
background: Rectangle {
radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
border.width: Style.trayWindowBorderWidth
border.color: palette.dark
color: Style.colorWithoutTransparency(palette.dark)
}

property var folderAccountState: ({})
property string fileLocalPath: ""
Expand Down Expand Up @@ -239,7 +239,7 @@ ApplicationWindow {
clip: true

radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
color: Style.colorWithoutTransparency(palette.base)
color: Style.colorWithoutTransparency(palette.dark)

Accessible.role: Accessible.Grouping
Accessible.name: qsTr("Main content")
Expand Down
2 changes: 1 addition & 1 deletion theme/Style/Style.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ QtObject {
property int halfTrayWindowRadius: 5
property int trayWindowBorderWidth: variableSize(1)
property int trayWindowHeaderHeight: variableSize(50)
property int trayHorizontalMargin: 10
property int trayHorizontalMargin: 8
property int trayModalWidth: 380
property int trayModalHeight: 490
property int trayListItemIconSize: accountAvatarSize
Expand Down
Loading