← Back to branch summary

~lukas-kde/unity8/betterSessionManagement

« back to all changes in this revision

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

  • Committer: Lukáš Tinkl
  • Date: 2017-03-24 11:57:27 UTC
  • mfrom: (2800.1.91 unity8)
  • Revision ID: lukas.tinkl@canonical.com-20170324115727-34c7tvv3qnxvxzdj
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mocks/Unity/Application/SurfaceManager.cpp
211
211
 
212
212
void SurfaceManager::onStateRequested(MirSurface *surface, Mir::State state)
213
213
{
214
 
    Q_ASSERT(!m_underModification);
215
 
 
216
214
    DEBUG_MSG("("<<surface<<","<<state<<") started");
217
215
    Q_EMIT modificationsStarted();
218
216
    m_underModification = true;
266
264
    if (m_focusedSurface) {
267
265
        m_focusedSurface->setFocused(false);
268
266
    }
269
 
    if (chosenSurface) {
270
 
        chosenSurface->setFocused(true);
271
 
    }
 
267
 
 
268
    chosenSurface->setFocused(true);
 
269
    doRaise(chosenSurface);
 
270
 
272
271
    m_focusedSurface = chosenSurface;
273
272
}
274
273