Merge lp:~afrantzis/mir/fix-1466492-map-minimized-to-hidden into lp:mir

[Alexandros Frantzis]

shell: Ensure mir_surface_state_minimized is always mapped to mir_surface_state_hidden by the CanonicalWindowManagerPolicy

shell: Ensure mir_surface_state_minimized is always mapped to mir_surface_state_hidden by the CanonicalWindowManagerPolicy

[Alberto Aguirre (albaguirre)]

I'd rather avoid mapping the state at all - this was a workaround I put it initially - but proposed fix here: https://code.launchpad.net/~albaguirre/mir/no-minimize-to-hidden-mapping/+merge/262465

review: Disapprove

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2688
http://jenkins.qa.ubuntu.com/job/mir-ci/4153/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/2932
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-wily-amd64-build/447
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/2880/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/309
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/309/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2880
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/2880/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/5704/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21325

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/4153/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

2688. By Alexandros Frantzis on 2015-06-19

shell: Ensure mir_surface_state_minimized is always mapped to mir_surface_state_hidden by the CanonicalWindowManagerPolicy

=== modified file 'src/server/shell/canonical_window_manager.cpp'
--- src/server/shell/canonical_window_manager.cpp	2015-06-17 13:12:33 +0000
+++ src/server/shell/canonical_window_manager.cpp	2015-06-19 14:22:21 +0000
@@ -448,6 +448,8 @@
 
     if (info.state == value)
     {
+        if (info.state == mir_surface_state_minimized)
+            return mir_surface_state_hidden;
         return info.state;
     }
 

=== modified file 'tests/acceptance-tests/test_surface_modifications.cpp'
--- tests/acceptance-tests/test_surface_modifications.cpp	2015-06-17 05:20:42 +0000
+++ tests/acceptance-tests/test_surface_modifications.cpp	2015-06-19 14:22:21 +0000
@@ -486,3 +486,20 @@
         EXPECT_THAT(actual, Eq(expected_size));
     };
 }
+
+TEST_F(SurfaceModifications, minimized_state_is_mapped_to_hidden)
+{
+    EXPECT_THAT(mir_surface_get_state(surface), Ne(mir_surface_state_hidden));
+
+    mir_wait_for(mir_surface_set_state(surface, mir_surface_state_minimized));
+    EXPECT_THAT(mir_surface_get_state(surface), Eq(mir_surface_state_hidden));
+}
+
+TEST_F(SurfaceModifications, minimized_state_is_mapped_to_hidden_when_already_minimized)
+{
+    mir_wait_for(mir_surface_set_state(surface, mir_surface_state_minimized));
+    EXPECT_THAT(mir_surface_get_state(surface), Eq(mir_surface_state_hidden));
+
+    mir_wait_for(mir_surface_set_state(surface, mir_surface_state_minimized));
+    EXPECT_THAT(mir_surface_get_state(surface), Eq(mir_surface_state_hidden));
+}