← Back to branch summary

~mir-team/miral/release

« back to all changes in this revision

Viewing changes to miral-shell/shell_main.cpp

  • Committer: Bileto Bot
  • Date: 2017-06-21 08:34:34 UTC
  • mfrom: (360.1.1 miral-release)
  • Revision ID: ci-train-bot@canonical.com-20170621083434-e7ftkyg5qr2fzsao
* New upstream release 1.4.0 (https://launchpad.net/miral/+milestone/1.4.0)
  - ABI summary:
    . miral ABI unchanged at 2
  - Enhancements:
    . Support for passing messages to enable Drag & Drop
    . Support for client requested move
    . Port to the undeprecated Mir APIs
    . Added "--cursor-theme" option when configuring a cursor theme
    . Drop support for Mir versions before 0.26
  - Bugs fixed:

Show diffs side-by-side

added added

removed removed

Lines of Context:
miral-shell/shell_main.cpp
17
17
 */
18
18
 
19
19
#include "tiling_window_manager.h"
20
 
#include "titlebar_window_manager.h"
 
20
#include "floating_window_manager.h"
21
21
#include "titlebar_config.h"
22
22
#include "spinner/splash.h"
23
23
 
44
44
    ActiveOutputsMonitor outputs_monitor;
45
45
    WindowManagerOptions window_managers
46
46
        {
47
 
            add_window_manager_policy<TitlebarWindowManagerPolicy>("titlebar", spinner, launcher, shutdown_hook),
 
47
            add_window_manager_policy<FloatingWindowManagerPolicy>("floating", spinner, launcher, shutdown_hook),
48
48
            add_window_manager_policy<TilingWindowManagerPolicy>("tiling", spinner, launcher, outputs_monitor),
49
49
        };
50
50
 
83
83
        {
84
84
            CommandLineOption{[&](std::string const& ) { },
85
85
                              "desktop_file_hint", "Ignored for Unity8 compatibility", "miral-shell.desktop"},
86
 
            CursorTheme{"default"},
 
86
            CursorTheme{"DMZ-White"},
87
87
            window_managers,
88
88
            display_configuration_options,
89
89
            launcher,