From 8582f7c16a2f9c3915c19df5bc31af598d1e3701 Mon Sep 17 00:00:00 2001 From: Pauli Jarvinen Date: Thu, 29 Mar 2012 16:47:50 +0300 Subject: Fix window focusing problem in Symbian MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The application window didn't receive focus properly on Symbian when minimized window was maximized. This was because the code first tried to set the focus and then made the window visible. However, invisible window doesn't accept focus, so the visibility should be set first and focus only after that. Not having focus properly set caused software input pane to fail to start in the Camera application, as was reported in the error case ou1cimx1#989756. Change-Id: Id659662e7d92205321746ed5a226843382a6ac89 Reviewed-by: Murray Read Reviewed-by: Juha Kukkonen Reviewed-by: Pasi Pentikäinen --- src/gui/kernel/qwidget_s60.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp index c1badc5..93968fbf 100644 --- a/src/gui/kernel/qwidget_s60.cpp +++ b/src/gui/kernel/qwidget_s60.cpp @@ -1203,8 +1203,8 @@ void QWidget::setWindowState(Qt::WindowStates newstate) window->setFocusSafely(false); window->MakeVisible(false); } else if (window && oldstate & Qt::WindowMinimized) { - window->setFocusSafely(true); window->MakeVisible(true); + window->setFocusSafely(true); } #ifdef Q_WS_S60 -- cgit v0.12