Mir

Merge lp:~alan-griffiths/mir/mir_surface_state_horizmaximized into lp:mir

  1. mir_surface_state_horizmaximized
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Work in progress
Proposed branch: lp:~alan-griffiths/mir/mir_surface_state_horizmaximized
Merge into: lp:mir
Prerequisite: lp:~vanvugt/mir/hidden
Diff against target: 63 lines (+5/-4)
5 files modified
client-ABI-sha1sums (+1/-1)
common-ABI-sha1sums (+1/-1)
include/common/mir_toolkit/common.h (+1/-0)
platform-ABI-sha1sums (+1/-1)
server-ABI-sha1sums (+1/-1)
To merge this branch: bzr merge lp:~alan-griffiths/mir/mir_surface_state_horizmaximized
Reviewer Review Type Date Requested Status
Alberto Aguirre (community) Approve
Kevin DuBois (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Cemil Azizoglu (community) Approve
Review via email: mp+246311@code.launchpad.net

Commit message

common: add ~alan-griffiths/mir/mir_surface_state_horizmaximized

Description of the change

common: add ~alan-griffiths/mir/mir_surface_state_horizmaximized

There's prior art for this surface state (compiz) and it will simplify some bespoke logic in TilingWindowManager

To post a comment you must log in.
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Ok.

review: Approve
Reply
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2213
http://jenkins.qa.ubuntu.com/job/mir-ci/2633/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/827
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/789
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/630
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/630/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/789
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/789/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3914
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17041

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Kevin DuBois (kdub) wrote :

okay, I guess its a pretty small leap to figure out "horizmaximized" means horizontally maximized.

review: Approve
Reply
Revision history for this message
Alberto Aguirre (albaguirre) wrote :

Sure.

review: Approve
Reply
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

I don't see why not...

It's unfortunate we can't leverage the same bitmask trick used in compiz:
   horizmaximixed | vertmaximized == maximized
So you only need to write code for the first two to get all three.

But it's also an advantage in us only having to work with mutually exclusive states.

P.S. In Compiz and regular Ubuntu you horizmaximize by using the right mouse button on the maximize button.

Reply
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

As the prerequisite has got held up in review I've just incorporated this into lp:~alan-griffiths/mir/make-TilingWindowManager-simpler/+merge/246418

Reply

Unmerged revisions

2213. By Alan Griffiths

Add mir_surface_state_horizmaximized

2212. By Alan Griffiths

merge lp:~vanvugt/mir/hidden

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'client-ABI-sha1sums'
--- client-ABI-sha1sums 2015-01-13 14:48:34 +0000
+++ client-ABI-sha1sums 2015-01-13 14:48:34 +0000
@@ -10,7 +10,7 @@
10b141c4d79802ad626d969249c0004744e5c2a525 include/client/mir_toolkit/mir_wait.h10b141c4d79802ad626d969249c0004744e5c2a525 include/client/mir_toolkit/mir_wait.h
116f7b4ecc22afba923806ed2bd7d8244be90b0cfd include/client/mir_toolkit/version.h116f7b4ecc22afba923806ed2bd7d8244be90b0cfd include/client/mir_toolkit/version.h
123350dac884d6006753de2a955bc7a05663cd9449 include/common/mir_toolkit/client_types.h123350dac884d6006753de2a955bc7a05663cd9449 include/common/mir_toolkit/client_types.h
13f698a1953b2685343809cf18c776b5f449ee8516 include/common/mir_toolkit/common.h139c2c41e96c3bd5a163b56960b068292ca3aa0494 include/common/mir_toolkit/common.h
14fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/common/mir_toolkit/cursors.h14fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/common/mir_toolkit/cursors.h
15f4d39e9893ce6308bddd83a49b90f0051f565323 include/common/mir_toolkit/event.h15f4d39e9893ce6308bddd83a49b90f0051f565323 include/common/mir_toolkit/event.h
162507f2929415aa423f9551d3c595c439fe1c6efd include/common/mir_toolkit/events/event_deprecated.h162507f2929415aa423f9551d3c595c439fe1c6efd include/common/mir_toolkit/events/event_deprecated.h
1717
=== modified file 'common-ABI-sha1sums'
--- common-ABI-sha1sums 2015-01-13 14:48:34 +0000
+++ common-ABI-sha1sums 2015-01-13 14:48:34 +0000
@@ -17,7 +17,7 @@
1731b9c24e2ce7194aeea6694e81c160354033d28a include/common/mir/optional_value.h1731b9c24e2ce7194aeea6694e81c160354033d28a include/common/mir/optional_value.h
189ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h189ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h
193350dac884d6006753de2a955bc7a05663cd9449 include/common/mir_toolkit/client_types.h193350dac884d6006753de2a955bc7a05663cd9449 include/common/mir_toolkit/client_types.h
20f698a1953b2685343809cf18c776b5f449ee8516 include/common/mir_toolkit/common.h209c2c41e96c3bd5a163b56960b068292ca3aa0494 include/common/mir_toolkit/common.h
21fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/common/mir_toolkit/cursors.h21fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/common/mir_toolkit/cursors.h
22f4d39e9893ce6308bddd83a49b90f0051f565323 include/common/mir_toolkit/event.h22f4d39e9893ce6308bddd83a49b90f0051f565323 include/common/mir_toolkit/event.h
232507f2929415aa423f9551d3c595c439fe1c6efd include/common/mir_toolkit/events/event_deprecated.h232507f2929415aa423f9551d3c595c439fe1c6efd include/common/mir_toolkit/events/event_deprecated.h
2424
=== modified file 'include/common/mir_toolkit/common.h'
--- include/common/mir_toolkit/common.h 2015-01-13 14:48:34 +0000
+++ include/common/mir_toolkit/common.h 2015-01-13 14:48:34 +0000
@@ -75,6 +75,7 @@
75 differs only in the X coordinate. */75 differs only in the X coordinate. */
76 mir_surface_state_fullscreen,76 mir_surface_state_fullscreen,
77 mir_surface_state_hidden,77 mir_surface_state_hidden,
78 mir_surface_state_horizmaximized,
78 mir_surface_states79 mir_surface_states
79} MirSurfaceState;80} MirSurfaceState;
8081
8182
=== modified file 'platform-ABI-sha1sums'
--- platform-ABI-sha1sums 2015-01-13 14:48:34 +0000
+++ platform-ABI-sha1sums 2015-01-13 14:48:34 +0000
@@ -17,7 +17,7 @@
1731b9c24e2ce7194aeea6694e81c160354033d28a include/common/mir/optional_value.h1731b9c24e2ce7194aeea6694e81c160354033d28a include/common/mir/optional_value.h
189ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h189ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h
193350dac884d6006753de2a955bc7a05663cd9449 include/common/mir_toolkit/client_types.h193350dac884d6006753de2a955bc7a05663cd9449 include/common/mir_toolkit/client_types.h
20f698a1953b2685343809cf18c776b5f449ee8516 include/common/mir_toolkit/common.h209c2c41e96c3bd5a163b56960b068292ca3aa0494 include/common/mir_toolkit/common.h
21fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/common/mir_toolkit/cursors.h21fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/common/mir_toolkit/cursors.h
22f4d39e9893ce6308bddd83a49b90f0051f565323 include/common/mir_toolkit/event.h22f4d39e9893ce6308bddd83a49b90f0051f565323 include/common/mir_toolkit/event.h
232507f2929415aa423f9551d3c595c439fe1c6efd include/common/mir_toolkit/events/event_deprecated.h232507f2929415aa423f9551d3c595c439fe1c6efd include/common/mir_toolkit/events/event_deprecated.h
2424
=== modified file 'server-ABI-sha1sums'
--- server-ABI-sha1sums 2015-01-13 14:48:34 +0000
+++ server-ABI-sha1sums 2015-01-13 14:48:34 +0000
@@ -17,7 +17,7 @@
1731b9c24e2ce7194aeea6694e81c160354033d28a include/common/mir/optional_value.h1731b9c24e2ce7194aeea6694e81c160354033d28a include/common/mir/optional_value.h
189ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h189ae8473df05dd9e048a73797f01a2f34f7447554 include/common/mir/time/types.h
193350dac884d6006753de2a955bc7a05663cd9449 include/common/mir_toolkit/client_types.h193350dac884d6006753de2a955bc7a05663cd9449 include/common/mir_toolkit/client_types.h
20f698a1953b2685343809cf18c776b5f449ee8516 include/common/mir_toolkit/common.h209c2c41e96c3bd5a163b56960b068292ca3aa0494 include/common/mir_toolkit/common.h
21fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/common/mir_toolkit/cursors.h21fce4c1a9e0d037244f7e9e96ea2d8eaab4fc404c include/common/mir_toolkit/cursors.h
22f4d39e9893ce6308bddd83a49b90f0051f565323 include/common/mir_toolkit/event.h22f4d39e9893ce6308bddd83a49b90f0051f565323 include/common/mir_toolkit/event.h
232507f2929415aa423f9551d3c595c439fe1c6efd include/common/mir_toolkit/events/event_deprecated.h232507f2929415aa423f9551d3c595c439fe1c6efd include/common/mir_toolkit/events/event_deprecated.h

Subscribers

People subscribed via source and target branches