← Back to branch summary

~josharenson/unity8/dashboard-manager

« back to all changes in this revision

Viewing changes to plugins/WindowManager/TopLevelWindowModel.cpp

  • Committer: Josh Arenson
  • Date: 2017-03-14 18:48:38 UTC
  • mfrom: (2839.1.29 unity8)
  • Revision ID: joshua.arenson@canonical.com-20170314184838-10p76x3aqqcfu60n
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/WindowManager/TopLevelWindowModel.cpp
341
341
        });
342
342
    } else {
343
343
        if (surface->type() == Mir::InputMethodType) {
 
344
            connectSurface(surface);
344
345
            setInputMethodWindow(createWindow(surface));
345
346
        } else {
346
347
            auto *application = m_applicationManager->findApplicationWithSurface(surface);