~mir-team/mir/development-branch

« back to all changes in this revision

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

merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
124
124
    return *this;
125
125
}
126
126
 
127
 
ms::SurfaceCreationParameters& ms::SurfaceCreationParameters::with_attachment_rect(geometry::Rectangle const& rect)
 
127
ms::SurfaceCreationParameters& ms::SurfaceCreationParameters::with_aux_rect(geometry::Rectangle const& rect)
128
128
{
129
 
    attachment_rect = rect;
 
129
    aux_rect = rect;
130
130
    return *this;
131
131
}
132
132