← Back to branch summary

~mir-team/mir/trunk-0.1.7

« back to all changes in this revision

Viewing changes to include/shared/mir_toolkit/common.h

  • Committer: Daniel van Vugt
  • Date: 2013-04-24 05:22:20 UTC
  • mfrom: (628 trunk)
  • mto: This revision was merged to the branch mainline in revision 629.
  • Revision ID: daniel.van.vugt@canonical.com-20130424052220-qhpyhw2resxzr7bq
Merge latest lp:mir

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/shared/mir_toolkit/common.h
34
34
typedef enum MirSurfaceAttrib
35
35
{
36
36
    mir_surface_attrib_type,
 
37
    mir_surface_attrib_state,
37
38
    mir_surface_attrib_arraysize_
38
39
} MirSurfaceAttrib;
39
40
 
48
49
    mir_surface_type_arraysize_
49
50
} MirSurfaceType;
50
51
 
51
 
/* TODO: Surface states here */
 
52
typedef enum MirSurfaceState
 
53
{
 
54
    mir_surface_state_unknown,
 
55
    mir_surface_state_restored,
 
56
    mir_surface_state_minimized,
 
57
    mir_surface_state_maximized,
 
58
    mir_surface_state_vertmaximized,
 
59
    /* mir_surface_state_semimaximized,
 
60
       Omitted for now, since it's functionally a subset of vertmaximized and
 
61
       differs only in the X coordinate. */
 
62
    mir_surface_state_fullscreen,
 
63
    mir_surface_state_arraysize_
 
64
} MirSurfaceState;
 
65
 
52
66
/**@}*/
53
67
 
54
68
#endif