← Back to branch summary

~lukas-kde/qtmir/betterSessionManagement

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/application_manager.cpp

  • Committer: Lukáš Tinkl
  • Date: 2017-02-07 16:50:11 UTC
  • mfrom: (590.1.5 qtmir)
  • Revision ID: lukas.tinkl@canonical.com-20170207165011-211tttoeh9huj7zx
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/application_manager.cpp
128
128
 
129
129
    connectToSessionAuthorizer(appManager, sessionAuthorizer);
130
130
    connectToTaskController(appManager, taskController.data());
131
 
//    TODO - re-implement this functionality using the new Mir WindowManagement API
132
 
//    connect(windowManager, &MirWindowManager::sessionAboutToCreateSurface,
133
 
//            appManager, &ApplicationManager::onSessionAboutToCreateSurface,
134
 
//            Qt::BlockingQueuedConnection);
135
131
 
136
132
    // Emit signal to notify Upstart that Mir is ready to receive client connections
137
133
    // see http://upstart.ubuntu.com/cookbook/#expect-stop
780
776
    return nullptr;
781
777
}
782
778
 
783
 
void ApplicationManager::onSessionAboutToCreateSurface(
784
 
        const std::shared_ptr<mir::scene::Session> &session, int type, QSize &size)
785
 
{
786
 
    if (type == mir_window_type_normal) {
787
 
        Application* application = findApplicationWithSession(session);
788
 
 
789
 
        if (application) {
790
 
            qCDebug(QTMIR_APPLICATIONS).nospace() << "ApplicationManager::onSessionAboutToCreateSurface appId="
791
 
                << application->appId();
792
 
            size = application->initialSurfaceSize();
793
 
        } else {
794
 
            qCDebug(QTMIR_APPLICATIONS).nospace() << "ApplicationManager::onSessionAboutToCreateSurface unknown app";
795
 
        }
796
 
    } else {
797
 
        qCDebug(QTMIR_APPLICATIONS).nospace() << "ApplicationManager::onSessionAboutToCreateSurface type=" << type
798
 
            << " NOOP";
799
 
    }
800
 
}
801
 
 
802
779
Application *ApplicationManager::findApplication(qtmir::MirSurfaceInterface* surface)
803
780
{
804
781
    Q_FOREACH (Application *app, m_applications) {