Merge lp:~alan-griffiths/miral/fix-1661256 into lp:miral

Proposed by Alan Griffiths on 2017-02-03
Status: Merged
Approved by: Gerry Boland on 2017-02-03
Approved revision: 498
Merged at revision: 499
Proposed branch: lp:~alan-griffiths/miral/fix-1661256
Merge into: lp:miral
Diff against target: 20 lines (+10/-0)
1 file modified
include/miral/toolkit/window_spec.h (+10/-0)
To merge this branch: bzr merge lp:~alan-griffiths/miral/fix-1661256
Reviewer Review Type Date Requested Status
Alexandros Frantzis (community) Approve on 2017-02-03
Gerry Boland 2017-02-03 Approve on 2017-02-03
Review via email: mp+316310@code.launchpad.net

Commit message

[toolkit] wrapper for mir_window_spec_set_state()

To post a comment you must log in.
Gerry Boland (gerboland) :
review: Approve
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/miral/toolkit/window_spec.h'
2--- include/miral/toolkit/window_spec.h 2017-01-26 15:11:27 +0000
3+++ include/miral/toolkit/window_spec.h 2017-02-03 09:33:05 +0000
4@@ -236,6 +236,16 @@
5 return *this;
6 }
7
8+ auto set_state(MirWindowState state) -> WindowSpec&
9+ {
10+#if MIR_CLIENT_VERSION <= MIR_VERSION_NUMBER(3, 4, 0)
11+ mir_surface_spec_set_state(*this, state);
12+#else
13+ mir_window_spec_set_state(*this, state);
14+#endif
15+ return *this;
16+ }
17+
18 template<typename Context>
19 void create_surface(void (*callback)(MirWindow*, Context*), Context* context) const
20 {

Subscribers

People subscribed via source and target branches