← Back to branch summary

~dandrader/qtubuntu/useApplicationStateAPI

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/input.cpp

  • Committer: Daniel d'Andrada
  • Date: 2015-11-17 16:18:26 UTC
  • mfrom: (283.1.1 qtubuntu-fix-1504776)
  • Revision ID: daniel.dandrada@canonical.com-20151117161826-pzmcf93sj90jdde8
Merge and tweak lp:~sam-sgrs/qtubuntu/qtubuntu-fix-1504776

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntumirclient/input.cpp
240
240
            if (focused) {
241
241
                mPendingFocusGainedEvents--;
242
242
                ubuntuEvent->window->handleSurfaceFocused();
 
243
                QWindowSystemInterface::handleWindowActivated(ubuntuEvent->window->window(), Qt::ActiveWindowFocusReason);
 
244
                if (qGuiApp->applicationState() == Qt::ApplicationInactive) {
 
245
                    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
 
246
                }
243
247
            } else if(!mPendingFocusGainedEvents) {
244
248
                DLOG("[ubuntumirclient QPA] No windows have focus");
245
249
                QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason);
 
250
                if (qGuiApp->applicationState() == Qt::ApplicationActive) {
 
251
                    QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationInactive);
 
252
                }
246
253
            }
247
254
        }
248
255
        break;