← Back to branch summary

~mterry/+junk/u8

« back to all changes in this revision

Viewing changes to src/ShellApplication.cpp

Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ShellApplication.cpp
18
18
 
19
19
// Qt
20
20
#include <QLibrary>
 
21
#include <QProcess>
21
22
#include <QScreen>
22
23
 
23
24
#include <libintl.h>
110
111
        m_secondaryWindow->setVisible(true);
111
112
    }
112
113
 
113
 
    if (isMirServer || parser.hasFullscreen()) {
 
114
    if (parser.mode().compare("greeter") == 0) {
 
115
        QSize primaryScreenSize = this->primaryScreen()->size();
 
116
        m_shellView->setHeight(primaryScreenSize.height());
 
117
        m_shellView->setWidth(primaryScreenSize.width());
 
118
        m_shellView->show();
 
119
        m_shellView->requestActivate();
 
120
        if (!QProcess::startDetached("initctl emit --no-wait unity8-greeter-started")) {
 
121
            qDebug() << "Unable to send unity8-greeter-started event to Upstart";
 
122
        }
 
123
    } else if (isMirServer || parser.hasFullscreen()) {
114
124
        m_shellView->showFullScreen();
115
125
    } else {
116
126
        m_shellView->show();