Mir

Merge lp:~alan-griffiths/mir/kiosk-maximize-freestyle into lp:mir

Proposed by Alan Griffiths on 2017-09-20
Status: Merged
Approved by: Gerry Boland on 2017-09-21
Approved revision: 4258
Merged at revision: 4259
Proposed branch: lp:~alan-griffiths/mir/kiosk-maximize-freestyle
Merge into: lp:mir
Diff against target: 22 lines (+3/-2)
1 file modified
examples/miral-kiosk/kiosk_window_manager.cpp (+3/-2)
To merge this branch: bzr merge lp:~alan-griffiths/mir/kiosk-maximize-freestyle
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-09-21
Gerry Boland (community) 2017-09-20 Approve on 2017-09-21
Review via email: mp+331077@code.launchpad.net

Commit message

[miral-kiosk] Parentless freestyle windows should also be maximized

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

FAILED: Continuous integration, rev:4258
https://mir-jenkins.ubuntu.com/job/mir-ci/3672/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5030/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5266
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5254
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5254
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5254
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5073/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5073
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5073/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5073/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5073
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5073/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5073
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5073/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5073
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5073/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5073
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5073/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5073
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5073/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3672/rebuild

review: Needs Fixing (continuous-integration)
Gerry Boland (gerboland) wrote :

ok

review: Approve
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/miral-kiosk/kiosk_window_manager.cpp'
2--- examples/miral-kiosk/kiosk_window_manager.cpp 2017-09-19 14:45:19 +0000
3+++ examples/miral-kiosk/kiosk_window_manager.cpp 2017-09-20 16:03:03 +0000
4@@ -133,7 +133,7 @@
5 {
6 WindowSpecification specification = CanonicalWindowManagerPolicy::place_new_window(app_info, request);
7
8- if (specification.type() == mir_window_type_normal &&
9+ if ((specification.type() == mir_window_type_normal || specification.type() == mir_window_type_freestyle) &&
10 (!specification.parent().is_set() || !specification.parent().value().lock()))
11 {
12 specification.state() = mir_window_state_maximized;
13@@ -150,7 +150,8 @@
14 {
15 WindowSpecification specification = modifications;
16
17- if (window_info.type() == mir_window_type_normal && !window_info.parent())
18+ if ((window_info.type() == mir_window_type_normal || window_info.type() == mir_window_type_freestyle) &&
19+ !window_info.parent())
20 {
21 specification.state() = mir_window_state_maximized;
22 tools.place_and_size_for_state(specification, window_info);

Subscribers

People subscribed via source and target branches