mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-19 00:11:21 +00:00
Merge branch 'release/22.04'
This commit is contained in:
commit
0e15ff7f14
|
@ -872,7 +872,8 @@ bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const
|
||||||
newHoveredWidget->setExpansionAreaHovered(true);
|
newHoveredWidget->setExpansionAreaHovered(true);
|
||||||
} else {
|
} else {
|
||||||
// make sure we unhover the old one first if old!=new
|
// 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);
|
oldHoveredWidget->setHovered(false);
|
||||||
Q_EMIT itemUnhovered(oldHoveredWidget->index());
|
Q_EMIT itemUnhovered(oldHoveredWidget->index());
|
||||||
}
|
}
|
||||||
|
@ -889,11 +890,13 @@ bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const
|
||||||
|
|
||||||
// (no-op in this branch for masked hover)
|
// (no-op in this branch for masked hover)
|
||||||
} else {
|
} else {
|
||||||
newHoveredWidget->setHovered(true);
|
|
||||||
newHoveredWidget->setHoverPosition(mappedPos);
|
newHoveredWidget->setHoverPosition(mappedPos);
|
||||||
|
if (oldHoveredWidget != newHoveredWidget) {
|
||||||
|
newHoveredWidget->setHovered(true);
|
||||||
Q_EMIT itemHovered(newHoveredWidget->index());
|
Q_EMIT itemHovered(newHoveredWidget->index());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// unhover any currently hovered expansion and text+icon widgets
|
// unhover any currently hovered expansion and text+icon widgets
|
||||||
unhoverOldHoveredWidget();
|
unhoverOldHoveredWidget();
|
||||||
|
|
Loading…
Reference in a new issue