Mir

Merge lp:~mir-team/mir/no-window-type-overlay into lp:mir

  1. no-window-type-overlay
  2. Merge into development-branch
Proposed by Cemil Azizoglu on 2017-01-13
Status: Merged
Approved by: Daniel van Vugt on 2017-01-16
Approved revision: 3935
Merged at revision: 3938
Proposed branch: lp:~mir-team/mir/no-window-type-overlay
Merge into: lp:mir
Diff against target: 41 lines (+1/-12)
2 files modified
include/core/mir_toolkit/common.h (+1/-2)
tests/acceptance-tests/test_client_library.cpp (+0/-10)
To merge this branch: bzr merge lp:~mir-team/mir/no-window-type-overlay
Reviewer Review Type Date Requested Status
Daniel van Vugt 2017-01-13 Approve on 2017-01-16
Mir CI Bot continuous-integration Approve on 2017-01-14
Review via email: mp+314749@code.launchpad.net

Commit Message

Do away with 'mir_window_type_overlay'. 'mir_window_type_gloss' should be used instead.

Description of the Change

Do away with 'mir_window_type_overlay'. 'mir_window_type_gloss' should be used instead.

The old enums have :

    mir_surface_type_overlay, /**< \deprecated Use "gloss" instead. */
    mir_surface_type_gloss = mir_surface_type_overlay,

Not sure if there is an easy way to do :

 mir_window_type_popover, /**< \deprecated Choose "menu" or "tip" */

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

PASSED: Continuous integration, rev:3935
https://mir-jenkins.ubuntu.com/job/mir-ci/2695/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/3501
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/3569
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/3559
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/3559
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/3559
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3528
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/3528/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3528
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/3528/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3528
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/3528/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3528
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/3528/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3528
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/3528/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3528
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/3528/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Daniel van Vugt (vanvugt) wrote :

I was concerned this changes the enum ordering which would break any braindead casting from MirSurfaceType to MirWindowType but it appears we already have a test for that...

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/core/mir_toolkit/common.h'
2--- include/core/mir_toolkit/common.h 2017-01-11 18:30:21 +0000
3+++ include/core/mir_toolkit/common.h 2017-01-13 20:52:02 +0000
4@@ -87,8 +87,7 @@
5 mir_window_type_normal, /**< AKA "regular" */
6 mir_window_type_utility, /**< AKA "floating" */
7 mir_window_type_dialog,
8- mir_window_type_overlay, /**< \deprecated Use "gloss" instead. */
9- mir_window_type_gloss = mir_window_type_overlay,
10+ mir_window_type_gloss,
11 mir_window_type_freestyle,
12 mir_window_type_popover, /**< \deprecated Choose "menu" or "tip" */
13 mir_window_type_menu = mir_window_type_popover,
14
15=== modified file 'tests/acceptance-tests/test_client_library.cpp'
16--- tests/acceptance-tests/test_client_library.cpp 2017-01-12 16:45:44 +0000
17+++ tests/acceptance-tests/test_client_library.cpp 2017-01-13 20:52:02 +0000
18@@ -58,10 +58,6 @@
19 static_cast<int32_t>(mir_window_type_dialog),
20 "mir_surface_type_dialog != mir_window_type_dialog");
21 static_assert(
22- static_cast<int32_t>(mir_surface_type_overlay) ==
23- static_cast<int32_t>(mir_window_type_overlay),
24- "mir_surface_type_overlay != mir_window_type_overlay");
25-static_assert(
26 static_cast<int32_t>(mir_surface_type_gloss) ==
27 static_cast<int32_t>(mir_window_type_gloss),
28 "mir_surface_type_gloss != mir_window_type_gloss");
29@@ -89,12 +85,6 @@
30 static_cast<int32_t>(mir_surface_type_tip) ==
31 static_cast<int32_t>(mir_window_type_tip),
32 "mir_surface_type_tip != mir_window_type_tip");
33-static_assert(
34- static_cast<int32_t>(mir_surface_types) ==
35- static_cast<int32_t>(mir_window_types),
36- "mir_surface_types != mir_window_types");
37-static_assert(sizeof(MirSurfaceType) == sizeof(MirWindowType),
38- "sizeof(MirSurfaceType) != sizeof(MirWindowType)");
39
40 // Assert our MirSurfaceState is 1to1 to MirWindowState
41 static_assert(

Subscribers

People subscribed via source and target branches