← Back to branch summary

~josharenson/unity8/fix-greeter-password-focus

« back to all changes in this revision

Viewing changes to tests/mocks/Unity/Application/MirSurface.cpp

  • Committer: Josh Arenson
  • Date: 2016-03-25 19:54:02 UTC
  • mfrom: (1979.1.9 session-chooser-gui)
  • Revision ID: joshua.arenson@canonical.com-20160325195402-867v3w2zvmjj0kq3
merge prereq

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mocks/Unity/Application/MirSurface.cpp
38
38
    , m_width(-1)
39
39
    , m_height(-1)
40
40
    , m_slowToResize(false)
 
41
    , m_shellChrome(Mir::NormalChrome)
41
42
{
42
43
//    qDebug() << "MirSurface::MirSurface() " << name;
43
44
    QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
133
134
    Q_EMIT orientationAngleChanged(angle);
134
135
}
135
136
 
136
 
 
 
137
Mir::ShellChrome MirSurface::shellChrome() const
 
138
{
 
139
    return m_shellChrome;
 
140
}
 
141
 
 
142
void MirSurface::setShellChrome(Mir::ShellChrome shellChrome)
 
143
{
 
144
    if (shellChrome == m_shellChrome)
 
145
        return;
 
146
 
 
147
    m_shellChrome = shellChrome;
 
148
    Q_EMIT shellChromeChanged(shellChrome);
 
149
}
 
150
 
 
151
QString MirSurface::keymapLayout() const
 
152
{
 
153
    return m_keyMap.first;
 
154
}
 
155
 
 
156
QString MirSurface::keymapVariant() const
 
157
{
 
158
    return m_keyMap.second;
 
159
}
 
160
 
 
161
void MirSurface::setKeymap(const QString &layout, const QString &variant)
 
162
{
 
163
    if (layout.isEmpty()) {
 
164
        return;
 
165
    }
 
166
    m_keyMap = qMakePair(layout, variant);
 
167
    Q_EMIT keymapChanged(layout, variant);
 
168
}
137
169
 
138
170
void MirSurface::registerView(qintptr viewId)
139
171
{