Merge lp:~saviq/qtubuntu/revert-application.active into lp:qtubuntu

[Michał Sawicz]

Revert r298 that broke Qt.application.state

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:302
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/290/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/81
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/81/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/290/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

I think the fix should be as simple as not deleting the code that the original MP removed, instead of reverting everything.

[Daniel d'Andrada (dandrader)]

> I think the fix should be as simple as not deleting the code that the original
> MP removed, instead of reverting everything.

Hmmm, actually the problem is not that as we don't have to send the deprecated events since Qt feeds the deprecated API from the new one.

It's about a behavioral change really, as that new code is more accurate but it maybe hit some bug, like after unlock the foreground app doesn't have focus or something. investigating.

[Daniel d'Andrada (dandrader)]

Rejecting this one in favor of the proper fix:
https://code.launchpad.net/~dandrader/qtubuntu/appState-lp1528668/+merge/281286

review: Disapprove

Unmerged revisions

302. By Michał Sawicz on 2015-12-22

Revert r298 that broke Qt.application.state

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2015-12-07 16:20:47 +0000
+++ src/ubuntumirclient/input.cpp	2015-12-22 20:14:57 +0000
@@ -240,16 +240,9 @@
             if (focused) {
                 mPendingFocusGainedEvents--;
                 ubuntuEvent->window->handleSurfaceFocused();
-                QWindowSystemInterface::handleWindowActivated(ubuntuEvent->window->window(), Qt::ActiveWindowFocusReason);
-                if (qGuiApp->applicationState() == Qt::ApplicationInactive) {
-                    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
-                }
             } else if(!mPendingFocusGainedEvents) {
                 DLOG("[ubuntumirclient QPA] No windows have focus");
                 QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason);
-                if (qGuiApp->applicationState() == Qt::ApplicationActive) {
-                    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
-                }
             }
         }
         break;

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2015-11-20 15:43:25 +0000
+++ src/ubuntumirclient/integration.cpp	2015-12-22 20:14:57 +0000
@@ -46,11 +46,8 @@
     Q_UNUSED(options)
     Q_UNUSED(context)
     DASSERT(context != NULL);
-    if (qGuiApp->focusWindow()) {
-        QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
-    } else {
-        QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
-    }
+    QCoreApplication::postEvent(QCoreApplication::instance(),
+                                new QEvent(QEvent::ApplicationActivate));
 }
 
 static void aboutToStopCallback(UApplicationArchive *archive, void* context)
@@ -64,7 +61,8 @@
     } else {
         qWarning("UbuntuClientIntegration aboutToStopCallback(): no input context");
     }
-    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationSuspended);
+    QCoreApplication::postEvent(QCoreApplication::instance(),
+                                new QEvent(QEvent::ApplicationDeactivate));
 }
 
 UbuntuClientIntegration::UbuntuClientIntegration()
@@ -177,9 +175,6 @@
     case OpenGL:
         return true;
 
-    case ApplicationState:
-        return true;
-
     case ThreadedOpenGL:
         if (qEnvironmentVariableIsEmpty("QTUBUNTU_NO_THREADED_OPENGL")) {
             return true;

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2015-12-07 16:20:58 +0000
+++ src/ubuntumirclient/window.cpp	2015-12-22 20:14:57 +0000
@@ -537,6 +537,7 @@
     // Therefore let's ensure we are up to date with the system clipboard now that we are getting
     // focused again.
     mClipboard->requestDBusClipboardContents();
+    QWindowSystemInterface::handleWindowActivated(window(), Qt::ActiveWindowFocusReason);
 }
 
 void UbuntuWindow::setWindowState(Qt::WindowState state)