From 222e3ec6ef5b6ffdb9b92c4cbfd95e6fe84d118f Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Wed, 2 Feb 2022 15:25:35 +0100
Subject: [PATCH] Follow-up of cfe8aa48189556156b4799fd1bcb5b51c4ab3c91 - Fixed
 focus when moving between object manipulator fields by tab key or mouse click

---
 src/slic3r/GUI/GUI_ObjectManipulation.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
index 4c1615dd4..98012fa2d 100644
--- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp
+++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp
@@ -1104,8 +1104,8 @@ ManipulationEditor::ManipulationEditor(ObjectManipulation* parent,
         parent->set_focused_editor(nullptr);
 
 #if ENABLE_OBJECT_MANIPULATOR_FOCUS
-        // if the widget loosing focus is not a manipulator field, call kill_focus
-        if (dynamic_cast<ManipulationEditor*>(e.GetWindow()) == nullptr)
+        // if the widgets exchanging focus are both manipulator fields, call kill_focus
+        if (dynamic_cast<ManipulationEditor*>(e.GetEventObject()) != nullptr && dynamic_cast<ManipulationEditor*>(e.GetWindow()) != nullptr)
 #else
         if (!m_enter_pressed)
 #endif // ENABLE_OBJECT_MANIPULATOR_FOCUS