lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-03 22:35:45 +02:00
Code Activity

context menu: fix colored items on menu regen

Browse source 
Change-Id: I59e68da48195292cbaa50021f0d677010ffb5a52
This commit is contained in:
Andreas Traczyk 2020-10-09 17:59:07 -04:00 • committed by Ming Rui Zhang
parent eea8e291d3
commit da026ab226
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/commoncomponents/GeneralMenuItem.qml
View file

@ -39,9 +39,17 @@ MenuItem {
signal clicked
contentItem: Rectangle {
contentItem: AbstractButton {
id: menuItemContentRect
background: Rectangle {
id: background
anchors.fill: parent
anchors.leftMargin: 1
anchors.rightMargin: 1
color: "transparent"
}
anchors.fill: parent
ResponsiveImage {
id: contextMenuItemImage
@ -75,7 +83,18 @@ MenuItem {
verticalAlignment: Text.AlignVCenter
}
color: "transparent"
onReleased: menuItem.clicked()
states: [
State {
name: "hovered"; when: hovered
PropertyChanges { target: background; color: JamiTheme.hoverColor }
},
State {
name: "normal"; when: !hovered
PropertyChanges { target: background; color: "white" }
}
]
}
onIconSourceChanged: {
@ -85,6 +104,8 @@ MenuItem {
}
}
highlighted: true
background: Rectangle {
id: contextMenuBackgroundRect
@ -98,24 +119,6 @@ MenuItem {
border.width: 0
color: menuItem.down ? JamiTheme.normalButtonColor : "white"
MouseArea {
anchors.fill: parent
hoverEnabled: true
onPressed: {
contextMenuBackgroundRect.color = JamiTheme.pressColor
}
onReleased: {
contextMenuBackgroundRect.color = JamiTheme.normalButtonColor
menuItem.clicked()
}
onEntered: {
contextMenuBackgroundRect.color = JamiTheme.hoverColor
}
onExited: {
contextMenuBackgroundRect.color = "white"
}
}
CustomBorder {
commonBorder: false
lBorderwidth: leftBorderWidth