Merge lp:~andreas-pokorny/mir/fix-1596051 into lp:mir
Proposed by
Andreas Pokorny
Status: | Merged |
---|---|
Approved by: | Cemil Azizoglu |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3563 |
Proposed branch: | lp:~andreas-pokorny/mir/fix-1596051 |
Merge into: | lp:mir |
Diff against target: |
218 lines (+75/-5) 6 files modified
src/platforms/mesa/server/x11/graphics/display.cpp (+19/-1) src/platforms/mesa/server/x11/graphics/display.h (+2/-0) src/platforms/mesa/server/x11/graphics/display_configuration.cpp (+0/-1) tests/include/mir/test/doubles/mock_x11.h (+2/-0) tests/mir_test_doubles/mock_x11.cpp (+13/-0) tests/unit-tests/graphics/mesa/x11/test_display.cpp (+39/-3) |
To merge this branch: | bzr merge lp:~andreas-pokorny/mir/fix-1596051 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Cemil Azizoglu (community) | Approve | ||
Alexandros Frantzis (community) | Approve | ||
Mir CI Bot | continuous-integration | Approve | |
Review via email: mp+298488@code.launchpad.net |
Commit message
fix: use Information inside default x11 screen of display to calculate size of window in mm
instead of using the resolution as screen size in mm
Description of the change
Small fix in x11 platform .. forwards the mm information x11 believes is correct. It is off by four to six cm in my case (the information offered by kms seems to be more accurate), but better than claiming we have 1 pixel per millimeter.
To post a comment you must log in.
PASSED: Continuous integration, rev:3555 /mir-jenkins. ubuntu. com/job/ mir-ci/ 1204/ /mir-jenkins. ubuntu. com/job/ build-mir/ 1378 /mir-jenkins. ubuntu. com/job/ build-0- fetch/1429 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 1420 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 1420 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 1392 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 1392/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 1392 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 1392/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 1392 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 1392/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 1392 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 1392/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 1392 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 1392/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 1204/rebuild
https:/