← Back to branch summary

~ubuntu-branches/ubuntu/saucy/mir/saucy-proposed

« back to all changes in this revision

Viewing changes to src/server/surfaces/surface_data.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, kg, Robert Ancell, Kevin Gunn, Robert Carr, Alan Griffiths, Ubuntu daily release
  • Date: 2013-10-09 21:57:59 UTC
  • mfrom: (1.1.46)
  • Revision ID: package-import@ubuntu.com-20131009215759-v0627htpxwqd5wvz
Tags: 0.0.14+13.10.20131009.4-0ubuntu1
https://launchpad.net/bugs/1229212
https://launchpad.net/bugs/1234609
https://launchpad.net/bugs/1235159
[ kg ]
* bump version for ABI break (LP: #1229212)

[ Robert Ancell ]
* Bump version to 0.0.12

[ Kevin Gunn ]
* bump version to 0.0.13

[Kevin Gunn]
* bump version to 0.0.14

[ Robert Carr ]
* Hold ms::Surface alive from msh::Surface, and remove the explicit
  throw calls. This way holding a shared_ptr to msh::Surface becomes
  safe (as long as you drop it eventually!). (LP: #1234609). (LP:
  #1234609)

[ Alan Griffiths ]
* client: use lock_guard as it is simpler than unique_lock. (fix for
  mallit) frontend: Remove the endpoint first when shutting down.
  Fixes bug lp#1235159. (LP: #1235159)

[ Ubuntu daily release ]
* Automatic snapshot from revision 1093

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/surfaces/surface_data.cpp
22
22
namespace geom=mir::geometry;
23
23
namespace ms = mir::surfaces;
24
24
 
25
 
ms::SurfaceData::SurfaceData(std::string const& name, geom::Rectangle rect, std::function<void()> change_cb)
 
25
ms::SurfaceData::SurfaceData(std::string const& name, geom::Rectangle rect, std::function<void()> change_cb, bool nonrectangular)
26
26
    : notify_change(change_cb),
27
27
      surface_name(name),
28
28
      surface_rect(rect),
30
30
      surface_alpha(1.0f),
31
31
      first_frame_posted(false),
32
32
      hidden(false),
 
33
      nonrectangular(nonrectangular),
33
34
      input_rectangles{surface_rect}
34
35
{
35
36
}
91
92
    return rect.overlaps(surface_rect);
92
93
}
93
94
 
 
95
bool ms::SurfaceData::shaped() const
 
96
{
 
97
    return nonrectangular;
 
98
}
 
99
 
94
100
void ms::SurfaceData::apply_alpha(float alpha)
95
101
{
96
102
    {