QtMir

Merge lp:~saviq/qtmir/ensure-screen-geometry into lp:qtmir

ensure-screen-geometry
Merge into trunk

Proposed by Michał Sawicz on 2016-02-17

Status:

Merged

Approved by:

Michał Sawicz on 2016-03-10

Approved revision:

441

Merged at revision:

458

Proposed branch:

lp:~saviq/qtmir/ensure-screen-geometry

Merge into:

lp:qtmir

Diff against target:

30 lines (+8/-1)

2 files modified

src/platforms/mirserver/screen.cpp (+7/-0)
src/platforms/mirserver/screenwindow.cpp (+1/-1)

To merge this branch:

bzr merge lp:~saviq/qtmir/ensure-screen-geometry

Critical

In Progress

Link a bug report

Reviewer	Review Type	Date Requested	Status
Gerry Boland (community)		2016-02-17	Approve on 2016-02-17
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-17
Unity8 CI Bot (community)	continuous-integration		Approve on 2016-02-17
Review via email: mp+286401@code.launchpad.net

Commit message

Ensure ScreenWindow geometry correctly set and used after moving Screen

NB: this will conflict with lp:~unity-team/qtmir/set-display-config, from which this is a cherry-pick

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
N
* Did you perform an exploratory manual test run of your code change and any related functionality?
Will in silo
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-17:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/82/rebuild

review: Approve (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-17:

FAILED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/qtmir-ci/701/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/395
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/397
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/397/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-i386-ci/277
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-amd64-ci/432/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-armhf-ci/434/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtmir-wily-i386-ci/277/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2016-02-17:

LGTM

Revision history for this message

Gerry Boland (gerboland) on 2016-02-17:

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Michał Sawicz

Mir development team

1	=== modified file 'src/platforms/mirserver/screen.cpp'
2	--- src/platforms/mirserver/screen.cpp 2015-10-14 22:59:04 +0000
3	+++ src/platforms/mirserver/screen.cpp 2016-02-17 20:10:05 +0000
4	@@ -297,6 +297,13 @@
5	qCDebug(QTMIR_SENSOR_MESSAGES) << "Screen::setWindow - overwriting existing ScreenWindow";
6	}
7	m_screenWindow = window;
8	+
9	+ if (m_screenWindow) {
10	+ if (m_screenWindow->geometry() != geometry()) {
11	+ qCDebug(QTMIR_SCREENS) << "Screen::setWindow - new geometry for shell surface" << window->window() << geometry();
12	+ m_screenWindow->setGeometry(geometry());
13	+ }
14	+ }
15	}
16
17	void Screen::setMirDisplayBuffer(mir::graphics::DisplayBuffer buffer, mir::graphics::DisplaySyncGroup group)
18
19	=== modified file 'src/platforms/mirserver/screenwindow.cpp'
20	--- src/platforms/mirserver/screenwindow.cpp 2015-10-15 07:05:16 +0000
21	+++ src/platforms/mirserver/screenwindow.cpp 2016-02-17 20:10:05 +0000
22	@@ -89,7 +89,7 @@
23	auto renderer = QSGRenderLoop::instance();
24	if (exposed) {
25	renderer->show(quickWindow);
26	- QWindowSystemInterface::handleExposeEvent(window(), QRegion()); // else it won't redraw
27	+ QWindowSystemInterface::handleExposeEvent(window(), geometry()); // else it won't redraw
28	} else {
29	quickWindow->setPersistentOpenGLContext(false);
30	quickWindow->setPersistentSceneGraph(false);