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.

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

remove most usages of transparent background: fix visual regressions #6993

Merged
merged 4 commits into from
Aug 12, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
avoid transparent background in user menu from main dialog
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
  • Loading branch information
mgallien committed Aug 12, 2024
commit 4cbaa1b4a576fb56a7db7c81bae099209456eab4
2 changes: 1 addition & 1 deletion src/gui/tray/CallNotificationDialog.qml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ import Qt5Compat.GraphicalEffects

ApplicationWindow {
id: root
color: palette.base
color: palette.window
flags: Qt.Dialog | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint

readonly property int windowSpacing: 10
2 changes: 1 addition & 1 deletion src/gui/tray/EditFileLocallyLoadingDialog.qml
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ ApplicationWindow {
id: root
flags: Qt.Dialog | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint

color: palette.base
color: palette.window

width: 320
height: contentLayout.implicitHeight
2 changes: 1 addition & 1 deletion src/gui/tray/TrayFolderListItem.qml
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ MenuItem {
Rectangle {
anchors.fill: parent
anchors.margins: Style.normalBorderWidth
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
}
}

2 changes: 1 addition & 1 deletion src/gui/tray/TrayFoldersMenuButton.qml
Original file line number Diff line number Diff line change
@@ -100,7 +100,7 @@ HeaderButton {
width: Style.folderStateIndicatorSize + Style.trayFolderStatusIndicatorSizeOffset
height: width
anchors.centerIn: parent
color: root.hovered ? Style.currentUserHeaderTextColor : palette.base
color: root.hovered ? Style.currentUserHeaderTextColor : palette.window
opacity: Style.trayFolderStatusIndicatorMouseHoverOpacityFactor
radius: width * Style.trayFolderStatusIndicatorRadiusFactor
z: -1
2 changes: 1 addition & 1 deletion src/gui/tray/UnifiedSearchResultListItem.qml
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@ MouseArea {
Rectangle {
id: unifiedSearchResultHoverBackground
anchors.fill: parent
color: parent.containsMouse ? palette.highlight : palette.base
color: parent.containsMouse ? palette.highlight : palette.window
}

Loader {
8 changes: 4 additions & 4 deletions src/gui/tray/UserLine.qml
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ AbstractButton {
anchors.margins: 1
color: (userLine.hovered || userLine.visualFocus) &&
!(userMoreButton.hovered || userMoreButton.visualFocus) ?
palette.highlight : palette.base
palette.highlight : palette.window
}

contentItem: RowLayout {
@@ -149,7 +149,7 @@ AbstractButton {
background: Rectangle {
anchors.fill: parent
anchors.margins: 1
color: userMoreButton.hovered || userMoreButton.visualFocus ? palette.highlight : palette.base
color: userMoreButton.hovered || userMoreButton.visualFocus ? palette.highlight : palette.window
}

contentItem: Image {
@@ -188,7 +188,7 @@ AbstractButton {
Rectangle {
anchors.fill: parent
anchors.margins: 1
color: parent.parent.hovered ? palette.highlight : palette.base
color: parent.parent.hovered ? palette.highlight : palette.window
}
}

@@ -222,7 +222,7 @@ AbstractButton {
Rectangle {
anchors.fill: parent
anchors.margins: 1
color: parent.parent.hovered ? palette.highlight : palette.base
color: parent.parent.hovered ? palette.highlight : palette.window
}
}

18 changes: 9 additions & 9 deletions src/gui/tray/Window.qml
Original file line number Diff line number Diff line change
@@ -308,7 +308,7 @@ ApplicationWindow {

background: Rectangle {
border.color: palette.dark
color: palette.base
color: palette.window
radius: Style.currentAccountButtonRadius
}

@@ -345,7 +345,7 @@ ApplicationWindow {
Rectangle {
anchors.fill: parent
anchors.margins: 1
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
}
}

@@ -397,7 +397,7 @@ ApplicationWindow {
Rectangle {
anchors.fill: parent
anchors.margins: 1
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
}
}

@@ -419,7 +419,7 @@ ApplicationWindow {
Rectangle {
anchors.fill: parent
anchors.margins: 1
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
}
}

@@ -441,7 +441,7 @@ ApplicationWindow {
Rectangle {
anchors.fill: parent
anchors.margins: 1
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
}
}

@@ -452,7 +452,7 @@ ApplicationWindow {
}

background: Rectangle {
color: parent.hovered || parent.visualFocus ? Style.currentUserHeaderTextColor : palette.base
color: parent.hovered || parent.visualFocus ? Style.currentUserHeaderTextColor : palette.window
opacity: 0.2
}

@@ -496,7 +496,7 @@ ApplicationWindow {
height: width
anchors.bottom: currentAccountAvatar.bottom
anchors.right: currentAccountAvatar.right
color: currentAccountButton.hovered ? Style.currentUserHeaderTextColor : palette.base
color: currentAccountButton.hovered ? Style.currentUserHeaderTextColor : palette.window
opacity: Style.trayFolderStatusIndicatorMouseHoverOpacityFactor
radius: width * Style.trayFolderStatusIndicatorRadiusFactor
}
@@ -663,7 +663,7 @@ ApplicationWindow {

background: Rectangle {
border.color: palette.dark
color: palette.base
color: palette.window
radius: 2
}

@@ -699,7 +699,7 @@ ApplicationWindow {
Rectangle {
anchors.fill: parent
anchors.margins: 1
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.base
color: parent.parent.hovered || parent.parent.visualFocus ? palette.highlight : palette.window
}
}