← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to src/server/shell/surface_creation_parameters.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-01-08 02:04:38 UTC
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20140108020438-e1npu0pm7qdv5wc4
Tags: upstream-0.1.3+14.04.20140108
Import upstream version 0.1.3+14.04.20140108

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/shell/surface_creation_parameters.cpp
25
25
 
26
26
msh::SurfaceCreationParameters::SurfaceCreationParameters()
27
27
    : name(), size(), top_left(), buffer_usage(mg::BufferUsage::undefined),
28
 
      pixel_format(geom::PixelFormat::invalid),
 
28
      pixel_format(mir_pixel_format_invalid),
29
29
      depth{0}, input_mode(mi::InputReceptionMode::normal)
30
30
{
31
31
}
55
55
msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_position(geometry::Point const& new_top_left)
56
56
{
57
57
    top_left = new_top_left;
58
 
    
 
58
 
59
59
    return *this;
60
60
}
61
61
 
68
68
}
69
69
 
70
70
msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::of_pixel_format(
71
 
    geom::PixelFormat new_pixel_format)
 
71
    MirPixelFormat new_pixel_format)
72
72
{
73
73
    pixel_format = new_pixel_format;
74
74
 
79
79
    scene::DepthId const& new_depth)
80
80
{
81
81
    depth = new_depth;
82
 
    
 
82
 
83
83
    return *this;
84
84
}
85
85
 
86
86
msh::SurfaceCreationParameters& msh::SurfaceCreationParameters::with_input_mode(input::InputReceptionMode const& new_mode)
87
87
{
88
88
    input_mode = new_mode;
89
 
    
 
89
 
90
90
    return *this;
91
91
}
92
92
 
102
102
    const SurfaceCreationParameters& lhs,
103
103
    const msh::SurfaceCreationParameters& rhs)
104
104
{
105
 
    return lhs.name == rhs.name && 
 
105
    return lhs.name == rhs.name &&
106
106
        lhs.size == rhs.size &&
107
107
        lhs.top_left == rhs.top_left &&
108
108
        lhs.buffer_usage == rhs.buffer_usage &&