1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix primary screen selection.

Browse Source 
When selecting the primary screen, the m_primaryScreen value obtained
from the xcb_connect() call should be respected. This ensures that the
proper primary screen is selected when specifying the DISPLAY
environment variable.

Task-number: QTBUG-27220
Change-Id: I60aa207f13d919087d4d2913141c804928684731
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
This commit is contained in:
Alain Boyer 2013-02-09 01:48:44 +02:00 committed by The Qt Project
parent 7df995a9bd
commit 3fdc4ae0ed
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/xcb/qxcbconnection.cpp
View File

@ -184,7 +184,7 @@ void QXcbConnection::updateScreens()
activeScreens << screen; activeScreens << screen;
++screenNumber; ++screenNumber;
if (!primaryScreen && primary) { if (!primaryScreen && primary) {
if (primary->output == XCB_NONE || outputs[i] == primary->output) { if (m_primaryScreen == xcbScreenNumber && (primary->output == XCB_NONE || outputs[i] == primary->output)) {
primaryScreen = screen; primaryScreen = screen;
siblings.prepend(siblings.takeLast()); siblings.prepend(siblings.takeLast());
#ifdef Q_XCB_DEBUG #ifdef Q_XCB_DEBUG