Rework implementation as suggested by oclero

oclero · Jan 17, 2025 · fa71b78 · fa71b78
1 parent 5cb32e8
commit fa71b78
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/lib/include/oclero/qlementine/utils/WidgetUtils.hpp b/lib/include/oclero/qlementine/utils/WidgetUtils.hpp
@@ -17,6 +17,8 @@ qreal getDpi(const QWidget* widget);
 
 QWindow* getWindow(const QWidget* widget);
 
+void clearFocus(QWidget* widget, bool recursive);
+
 template<class T>
 T* findFirstParentOfType(QWidget* child) {
   auto* parent = child;

diff --git a/lib/src/utils/WidgetUtils.cpp b/lib/src/utils/WidgetUtils.cpp
@@ -78,4 +78,17 @@ QWindow* getWindow(const QWidget* widget) {
   }
   return nullptr;
 }
+
+void clearFocus(QWidget* widget, bool recursive) {
+  if (widget) {
+    widget->clearFocus();
+
+    if (recursive) {
+      const auto children = widget->findChildren<QWidget*>();
+      for (auto* child : children) {
+        clearFocus(child, recursive);
+      }
+    }
+  }
+}
 } // namespace oclero::qlementine
diff --git a/lib/src/widgets/Expander.cpp b/lib/src/widgets/Expander.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: MIT
 
 #include <oclero/qlementine/widgets/Expander.hpp>
+#include <oclero/qlementine/utils/WidgetUtils.hpp>
 
 #include <QStyle>
 #include <QEvent>
@@ -106,6 +107,7 @@ void Expander::setExpanded(bool expanded) {
     if (_expanded) {
       emit aboutToExpand();
     } else {
+      oclero::qlementine::clearFocus(this, true);
       emit aboutToShrink();
     }