lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-10 12:03:18 +02:00
Code Activity

MainView: apply the new design for the button color of the main view in dark mode

Browse source 
Change-Id: Iedfda66405df58b758e88ff102f8c1a53cbf3a69
This commit is contained in:
Franck LAURENT 2023-03-06 12:14:21 -05:00 • committed by Sébastien Blin
parent 3f2afd2cfb
commit ef4e6c1171
6 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/app/constant/JamiTheme.qml
View file

@ -72,6 +72,8 @@ Item {
property color hoverColor: darkTheme ? "#515151" : "#c7c7c7"
property color pressColor: darkTheme ? "#777" : "#c0c0c0"
property color selectedColor: darkTheme ? "#0e81c5" : "#e0e0e0"
property color smartListHoveredColor: darkTheme ? "#444444" : "#dedede"
property color smartListSelectedColor: darkTheme ? "#515151" : "#d1d1d1"
property color editBackgroundColor: darkTheme ? "#373737" : lightGrey_
property color textColor: primaryForegroundColor
property color textColorHovered: darkTheme? "#cccccc" : "#333333"

4
src/app/mainview/components/AccountItemDelegate.qml
View file

@ -35,9 +35,9 @@ ItemDelegate {
background: Rectangle {
color: {
if (root.pressed)
return Qt.darker(JamiTheme.selectedColor, 1.1)
return JamiTheme.smartListSelectedColor
else if (root.hovered)
return Qt.darker(JamiTheme.selectedColor, 1.05)
return JamiTheme.smartListHoveredColor
else
return JamiTheme.backgroundColor
}

4
src/app/mainview/components/SmartListItemDelegate.qml
View file

@ -247,9 +247,9 @@ ItemDelegate {
background: Rectangle {
color: {
if (root.pressed || root.highlighted)
return Qt.darker(JamiTheme.selectedColor, 1.1)
return JamiTheme.smartListSelectedColor
else if (root.hovered)
return Qt.darker(JamiTheme.selectedColor, 1.05)
return JamiTheme.smartListHoveredColor
else
return "transparent"
}

4
src/app/mainview/components/SwarmDetailsItem.qml
View file

@ -33,7 +33,7 @@ Rectangle {
target: parent
enabled: parent.visible
onHoveredChanged: {
parent.color = hovered ? Qt.darker(JamiTheme.selectedColor, 1.05) : "transparent"
parent.color = hovered ? JamiTheme.smartListHoveredColor : "transparent"
}
}
}
}

2
src/app/mainview/components/SwarmDetailsPanel.qml
View file

@ -616,7 +616,7 @@ Rectangle {
anchors.fill: parent
color: {
if (member.hovered || nameTextEditHover.hovered)
return Qt.darker(JamiTheme.selectedColor, 1.05)
return JamiTheme.smartListHoveredColor
else
return "transparent"
}

4
src/app/settingsview/components/SettingsMenuButton.qml
View file

@ -44,8 +44,8 @@ PushButton {
imageContainerWidth: 40
pressedColor: Qt.lighter(JamiTheme.pressedButtonColor, 1.25)
checkedColor: JamiTheme.selectedColor
hoveredColor: JamiTheme.hoverColor
checkedColor: JamiTheme.smartListSelectedColor
hoveredColor: JamiTheme.smartListHoveredColor
duration: 0
checkable: true