From 24cdc3eb7a613344c655560c0ef43f8611acdc45 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 4 Apr 2018 23:06:32 +0300
Subject: While changing focus. always focus new control and after unfocus old
 control.

Before this commit in one place all controls can be without focus before
set new focus.
---
 src/gui/focushandler.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/focushandler.cpp b/src/gui/focushandler.cpp
index 306e279ec..5a84b3dd3 100644
--- a/src/gui/focushandler.cpp
+++ b/src/gui/focushandler.cpp
@@ -381,14 +381,14 @@ void FocusHandler::requestFocus(const Widget *const widget)
     {
         mFocusedWidget = mWidgets.at(toBeFocusedIndex);
 
+        Event focusEvent(mFocusedWidget);
+        distributeFocusGainedEvent(focusEvent);
+
         if (oldFocused != nullptr)
         {
-            Event focusEvent(oldFocused);
-            distributeFocusLostEvent(focusEvent);
+            Event oldFocusEvent(oldFocused);
+            distributeFocusLostEvent(oldFocusEvent);
         }
-
-        Event focusEvent(mWidgets.at(toBeFocusedIndex));
-        distributeFocusGainedEvent(focusEvent);
     }
 }
 
-- 
cgit v1.2.3-60-g2f50