Merge branch 'release/22.04'

This commit is contained in:
Felix Ernst 2022-04-01 12:17:25 +02:00
commit 0e15ff7f14

View file

@ -872,7 +872,8 @@ bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const
newHoveredWidget->setExpansionAreaHovered(true);
} else {
// make sure we unhover the old one first if old!=new
if (auto oldHoveredWidget = hoveredWidget(); oldHoveredWidget && oldHoveredWidget != newHoveredWidget) {
auto oldHoveredWidget = hoveredWidget();
if (oldHoveredWidget && oldHoveredWidget != newHoveredWidget) {
oldHoveredWidget->setHovered(false);
Q_EMIT itemUnhovered(oldHoveredWidget->index());
}
@ -889,9 +890,11 @@ bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const
// (no-op in this branch for masked hover)
} else {
newHoveredWidget->setHovered(true);
newHoveredWidget->setHoverPosition(mappedPos);
Q_EMIT itemHovered(newHoveredWidget->index());
if (oldHoveredWidget != newHoveredWidget) {
newHoveredWidget->setHovered(true);
Q_EMIT itemHovered(newHoveredWidget->index());
}
}
}
} else {