Compare commits
1 Commits
master
...
work/carl/
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fbd81b4eda |
@@ -50,10 +50,10 @@ Flow {
|
|||||||
Kirigami.Theme.inherit: false
|
Kirigami.Theme.inherit: false
|
||||||
Kirigami.Theme.colorSet: Kirigami.Theme.View
|
Kirigami.Theme.colorSet: Kirigami.Theme.View
|
||||||
radius: height / 2
|
radius: height / 2
|
||||||
shadow.size: Kirigami.Units.smallSpacing
|
shadow {
|
||||||
shadow.color: !model.hasLocalUser ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
|
size: Kirigami.Units.smallSpacing
|
||||||
border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
|
color: !model.hasLocalUser ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
|
||||||
border.width: 1
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onClicked: reactionClicked(model.reaction)
|
onClicked: reactionClicked(model.reaction)
|
||||||
|
|||||||
@@ -520,7 +520,9 @@ ColumnLayout {
|
|||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
Kirigami.Theme.colorSet: Kirigami.Theme.View
|
Kirigami.Theme.colorSet: Kirigami.Theme.View
|
||||||
color: {
|
color: {
|
||||||
if (root.author.isLocalUser) {
|
if (mainContainer.hovered) {
|
||||||
|
return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
|
||||||
|
} else if (root.author.isLocalUser) {
|
||||||
return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
|
return Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
|
||||||
} else if (root.showHighlight) {
|
} else if (root.showHighlight) {
|
||||||
return Kirigami.Theme.positiveBackgroundColor
|
return Kirigami.Theme.positiveBackgroundColor
|
||||||
@@ -528,11 +530,11 @@ ColumnLayout {
|
|||||||
return Kirigami.Theme.backgroundColor
|
return Kirigami.Theme.backgroundColor
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
radius: Kirigami.Units.smallSpacing
|
radius: Kirigami.Units.largeSpacing
|
||||||
shadow.size: Kirigami.Units.smallSpacing
|
shadow {
|
||||||
shadow.color: root.showHighlight ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
|
size: Kirigami.Units.smallSpacing
|
||||||
border.color: Kirigami.ColorUtils.tintWithAlpha(color, Kirigami.Theme.textColor, 0.15)
|
color: root.isHighlighted ? Qt.rgba(0.0, 0.0, 0.0, 0.10) : Qt.rgba(Kirigami.Theme.textColor.r, Kirigami.Theme.textColor.g, Kirigami.Theme.textColor.b, 0.10)
|
||||||
border.width: 1
|
}
|
||||||
|
|
||||||
Behavior on color {
|
Behavior on color {
|
||||||
enabled: isTemporaryHighlighted
|
enabled: isTemporaryHighlighted
|
||||||
@@ -543,7 +545,7 @@ ColumnLayout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
background: Rectangle {
|
background: Rectangle {
|
||||||
visible: mainContainer.hovered
|
visible: mainContainer.hovered && Config.compactLayout
|
||||||
color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
|
color: Kirigami.ColorUtils.tintWithAlpha(Kirigami.Theme.backgroundColor, Kirigami.Theme.highlightColor, 0.15)
|
||||||
radius: Kirigami.Units.smallSpacing
|
radius: Kirigami.Units.smallSpacing
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user