From: Felix Ernst <fe.a.ernst@gmail.com>
Date: Fri, 1 Apr 2022 10:17:25 +0000 (+0200)
Subject: Merge branch 'release/22.04'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/0e15ff7f146550216940440e80e1f498ac6248f8?hp=-c

Merge branch 'release/22.04'
---

0e15ff7f146550216940440e80e1f498ac6248f8
diff --combined src/kitemviews/kitemlistcontroller.cpp
index 966dc822b,9f54fad2c..02b0ccfeb
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@@ -13,11 -13,10 +13,11 @@@
  #include "kitemlistview.h"
  #include "private/kitemlistkeyboardsearchmanager.h"
  #include "private/kitemlistrubberband.h"
 -#include "private/ktwofingerswipe.h"
 -#include "private/ktwofingertap.h"
  #include "views/draganddrophelper.h"
  
 +#include <KTwoFingerSwipe>
 +#include <KTwoFingerTap>
 +
  #include <QAccessible>
  #include <QApplication>
  #include <QDrag>
@@@ -872,7 -871,8 +872,8 @@@ bool KItemListController::hoverMoveEven
              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 -889,11 +890,11 @@@
  
                  // (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 {