← Back to branch summary

~mir-team/mir/trunk

« back to all changes in this revision

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

  • Committer: Tarmac
  • Author(s): Alan Griffiths
  • Date: 2013-04-25 23:50:01 UTC
  • mfrom: (526.2.22 mir1)
  • Revision ID: tarmac-20130425235001-c3b3x2yyb3eldyx1
frontend, shell, tests: surface-states updated to avoid supplying dependencies through public member functions.

Approved by PS Jenkins bot, Chris Halse Rogers, Robert Ancell, Kevin DuBois.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/shell/surface.cpp
20
20
#include "mir/shell/surface_builder.h"
21
21
#include "mir/input/input_channel.h"
22
22
#include "mir_toolkit/event.h"
23
 
#include "mir/event_sink.h"
 
23
#include "mir/events/event_sink.h"
24
24
 
25
25
#include <boost/throw_exception.hpp>
26
26
 
34
34
msh::Surface::Surface(
35
35
    std::shared_ptr<SurfaceBuilder> const& builder,
36
36
    frontend::SurfaceCreationParameters const& params,
 
37
    std::shared_ptr<input::InputChannel> const& input_channel,
 
38
    frontend::SurfaceId id,
 
39
    std::shared_ptr<events::EventSink> const& sink)
 
40
  : builder(builder),
 
41
    input_channel(input_channel),
 
42
    surface(builder->create_surface(params)),
 
43
    id(id),
 
44
    event_sink(sink),
 
45
    type_value(mir_surface_type_normal),
 
46
    state_value(mir_surface_state_restored)
 
47
{
 
48
}
 
49
 
 
50
msh::Surface::Surface(
 
51
    std::shared_ptr<SurfaceBuilder> const& builder,
 
52
    frontend::SurfaceCreationParameters const& params,
37
53
    std::shared_ptr<input::InputChannel> const& input_channel)
38
54
  : builder(builder),
39
55
    input_channel(input_channel),
40
56
    surface(builder->create_surface(params)),
41
 
    id(0),
 
57
    id(),
 
58
    event_sink(),
42
59
    type_value(mir_surface_type_normal),
43
60
    state_value(mir_surface_state_restored)
44
61
{
52
69
    }
53
70
}
54
71
 
55
 
void msh::Surface::set_id(mir::frontend::SurfaceId i)
56
 
{
57
 
    id = i;
58
 
}
59
 
 
60
 
void msh::Surface::set_event_target(std::shared_ptr<EventSink> const& sink)
61
 
{
62
 
    event_sink = sink;
63
 
}
64
 
 
65
72
void msh::Surface::hide()
66
73
{
67
74
    if (auto const& s = surface.lock())