From e456b5671bfd60cb56e3585f5d5afe46def2352a Mon Sep 17 00:00:00 2001
From: Alfredo Monclus <alfredomonclus@gmail.com>
Date: Mon, 2 Jun 2025 04:40:08 -0600
Subject: [PATCH] Gui: Property editor combobox fix not popping up if the user
 canceled (#21688)

* Gui: Property editor combobox fix not popping up if the user canceled the popup and then try to open it again

fixes #21675

* Update src/Gui/propertyeditor/PropertyItemDelegate.cpp

---------

Co-authored-by: Kacper Donat <kadet1090@gmail.com>
---
 src/Gui/propertyeditor/PropertyItemDelegate.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Gui/propertyeditor/PropertyItemDelegate.cpp b/src/Gui/propertyeditor/PropertyItemDelegate.cpp
index 42ee976a89..0f74bc6ad7 100644
--- a/src/Gui/propertyeditor/PropertyItemDelegate.cpp
+++ b/src/Gui/propertyeditor/PropertyItemDelegate.cpp
@@ -139,6 +139,11 @@ bool PropertyItemDelegate::eventFilter(QObject *o, QEvent *ev)
     }
     else if (ev->type() == QEvent::FocusOut) {
         auto parentEditor = qobject_cast<PropertyEditor*>(this->parent());
+        if (auto* comboBox = qobject_cast<QComboBox*>(o)) {
+            if (parentEditor && parentEditor->activeEditor == comboBox) {
+                parentEditor->activeEditor = nullptr;
+            }
+        }
         auto widget = qobject_cast<QWidget*>(o);
         if (widget && parentEditor && parentEditor->activeEditor
                    && widget != parentEditor->activeEditor) {