Skip to content
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

[stable-3.15] gui/tray: Fix tray window corners #7618

Merged
merged 3 commits into from
Dec 9, 2024
Merged

[stable-3.15] gui/tray: Fix tray window corners #7618

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e9b2986
Re-add transparent tray window colour
claucambra Nov 26, 2024
88199a8
Make tray window item a rectangle with base palette colour
claucambra Nov 26, 2024
bd203fe
Change window background colour to palette window color
claucambra Nov 26, 2024
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
8 changes: 6 additions & 2 deletions src/gui/tray/MainWindow.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ ApplicationWindow {
width: Systray.useNormalWindow ? Style.trayWindowHeight : Style.trayWindowWidth
height: Style.trayWindowHeight
flags: Systray.useNormalWindow ? Qt.Window : Qt.Dialog | Qt.FramelessWindowHint
color: "transparent"

readonly property int maxMenuHeight: Style.trayWindowHeight - Style.trayWindowHeaderHeight - 2 * Style.trayWindowBorderWidth

Expand Down Expand Up @@ -63,7 +64,7 @@ ApplicationWindow {
radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
border.width: Style.trayWindowBorderWidth
border.color: palette.dark
color: palette.base
color: palette.window
}

Connections {
Expand Down Expand Up @@ -221,7 +222,7 @@ ApplicationWindow {
}
}

Item {
Rectangle {
id: trayWindowMainItem

property bool isUnifiedSearchActive: unifiedSearchResultsListViewSkeletonLoader.active
Expand All @@ -234,6 +235,9 @@ ApplicationWindow {
anchors.margins: Style.trayWindowBorderWidth
clip: true

radius: Systray.useNormalWindow ? 0.0 : Style.trayWindowRadius
color: palette.base

Accessible.role: Accessible.Grouping
Accessible.name: qsTr("Nextcloud desktop main dialog")

Expand Down
Loading