← Back to branch summary

~mir-team/qtmir/trunk

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/mirserver.cpp

  • Committer: CI Train Bot
  • Author(s): Daniel d'Andrada
  • Date: 2016-02-12 00:06:46 UTC
  • mfrom: (381.4.16 initialSurfaceGeom)
  • Revision ID: ci-train-bot@canonical.com-20160212000646-kcsjdiesdyazpp53
Let shell decide the initial surface size Fixes: #1532974
Approved by: Nick Dedekind

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platforms/mirserver/mirserver.cpp
107
107
    override_the_window_manager_builder([this](mir::shell::FocusController* focus_controller)
108
108
        -> std::shared_ptr<mir::shell::WindowManager>
109
109
        {
110
 
            return {MirWindowManager::create(focus_controller, the_shell_display_layout())};
 
110
            auto windowManager = MirWindowManager::create(focus_controller, the_shell_display_layout());
 
111
            m_windowManager = windowManager;
 
112
            return windowManager;
111
113
        });
112
114
 
113
115
    wrap_display_configuration_policy(
193
195
    std::weak_ptr<MirShell> m_shell = the_shell();
194
196
    return m_shell.lock().get();
195
197
}
 
198
 
 
199
MirWindowManager *MirServer::windowManager()
 
200
{
 
201
    return m_windowManager.lock().get();
 
202
}