Mir

Merge lp:~mir-team/mir/fix-1577262 into lp:mir

Proposed by Daniel van Vugt on 2016-05-02
Status: Merged
Approved by: Daniel van Vugt on 2016-05-03
Approved revision: 3489
Merged at revision: 3491
Proposed branch: lp:~mir-team/mir/fix-1577262
Merge into: lp:mir
Diff against target: 19 lines (+8/-1)
1 file modified
src/platforms/mesa/server/x11/graphics/display_buffer.cpp (+8/-1)
To merge this branch: bzr merge lp:~mir-team/mir/fix-1577262
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Approve on 2016-05-02
Cemil Azizoglu (community) 2016-05-02 Approve on 2016-05-02
Mir CI Bot continuous-integration Approve on 2016-05-02
Review via email: mp+293492@code.launchpad.net

Commit message

Fix distorted screen rotation in Mir-on-X11 (LP: #1577262)

Description of the change

Just a quick proof of concept. No tests yet.

Using the mouse on a rotated screen remains confusing. That's not a new problem, but is worse on X11 as the host desktop is not rotated.

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

PASSED: Continuous integration, rev:3489
https://mir-jenkins.ubuntu.com/job/mir-ci/928/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/982
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1028
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1019
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1019
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/992
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/992/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/992
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/992/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/992
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/992/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/992
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/992/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/992
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/992/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Cemil Azizoglu (cemil-azizoglu) wrote :

Ok

review: Approve
Kevin DuBois (kdub) wrote :

lgtm, would be good to have a test.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/mesa/server/x11/graphics/display_buffer.cpp'
2--- src/platforms/mesa/server/x11/graphics/display_buffer.cpp 2016-04-19 18:20:17 +0000
3+++ src/platforms/mesa/server/x11/graphics/display_buffer.cpp 2016-05-02 03:41:35 +0000
4@@ -41,7 +41,14 @@
5
6 geom::Rectangle mgx::DisplayBuffer::view_area() const
7 {
8- return {{0,0}, size};
9+ switch (orientation_)
10+ {
11+ case mir_orientation_left:
12+ case mir_orientation_right:
13+ return {{0,0}, {size.height.as_int(), size.width.as_int()}};
14+ default:
15+ return {{0,0}, size};
16+ }
17 }
18
19 void mgx::DisplayBuffer::make_current()

Subscribers

People subscribed via source and target branches