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

Windows: Replace lcQpaWindows logging with lcQpaScreen in screen code

Browse Source 
Change-Id: I1d2fd586aac1163aa449f813ce3b7244c6ebaee0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit d350373133f169b44fd98faab6fe3f75abab6282)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2022-06-16 13:18:11 +02:00 committed by Qt Cherry-pick Bot
parent 8f0fa4c948
commit d3d3549ff0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/platforms/windows/qwindowsscreen.cpp
View File

@ -333,7 +333,7 @@ QWindow *QWindowsScreen::topLevelAt(const QPoint &point) const
if (QWindow *child = QWindowsScreen::windowAt(point, CWP_SKIPINVISIBLE)) if (QWindow *child = QWindowsScreen::windowAt(point, CWP_SKIPINVISIBLE))
result = QWindowsWindow::topLevelOf(child); result = QWindowsWindow::topLevelOf(child);
if (QWindowsContext::verbose > 1) if (QWindowsContext::verbose > 1)
qCDebug(lcQpaWindows) <<__FUNCTION__ << point << result; qCDebug(lcQpaScreen) <<__FUNCTION__ << point << result;
return result; return result;
} }
@ -344,7 +344,7 @@ QWindow *QWindowsScreen::windowAt(const QPoint &screenPoint, unsigned flags)
findPlatformWindowAt(GetDesktopWindow(), screenPoint, flags)) findPlatformWindowAt(GetDesktopWindow(), screenPoint, flags))
result = bw->window(); result = bw->window();
if (QWindowsContext::verbose > 1) if (QWindowsContext::verbose > 1)
qCDebug(lcQpaWindows) <<__FUNCTION__ << screenPoint << " returns " << result; qCDebug(lcQpaScreen) <<__FUNCTION__ << screenPoint << " returns " << result;
return result; return result;
} }
@ -380,7 +380,7 @@ void QWindowsScreen::handleChanges(const QWindowsScreenData &newData)
m_data.physicalSizeMM = newData.physicalSizeMM; m_data.physicalSizeMM = newData.physicalSizeMM;
if (m_data.hMonitor != newData.hMonitor) { if (m_data.hMonitor != newData.hMonitor) {
qCDebug(lcQpaWindows) << "Monitor" << m_data.name qCDebug(lcQpaScreen) << "Monitor" << m_data.name
<< "has had its hMonitor handle changed from" << "has had its hMonitor handle changed from"
<< m_data.hMonitor << "to" << newData.hMonitor; << m_data.hMonitor << "to" << newData.hMonitor;
m_data.hMonitor = newData.hMonitor; m_data.hMonitor = newData.hMonitor;
@ -595,7 +595,7 @@ static void moveToVirtualScreen(QWindow *w, const QScreen *newScreen)
void QWindowsScreenManager::removeScreen(int index) void QWindowsScreenManager::removeScreen(int index)
{ {
qCDebug(lcQpaWindows) << "Removing Monitor:" << m_screens.at(index)->data(); qCDebug(lcQpaScreen) << "Removing Monitor:" << m_screens.at(index)->data();
QScreen *screen = m_screens.at(index)->screen(); QScreen *screen = m_screens.at(index)->screen();
QScreen *primaryScreen = QGuiApplication::primaryScreen(); QScreen *primaryScreen = QGuiApplication::primaryScreen();
// QTBUG-38650: When a screen is disconnected, Windows will automatically // QTBUG-38650: When a screen is disconnected, Windows will automatically
@ -647,7 +647,7 @@ bool QWindowsScreenManager::handleScreenChanges()
m_screens.push_back(newScreen); m_screens.push_back(newScreen);
QWindowSystemInterface::handleScreenAdded(newScreen, QWindowSystemInterface::handleScreenAdded(newScreen,
newData.flags & QWindowsScreenData::PrimaryScreen); newData.flags & QWindowsScreenData::PrimaryScreen);
qCDebug(lcQpaWindows) << "New Monitor: " << newData; qCDebug(lcQpaScreen) << "New Monitor: " << newData;
} // exists } // exists
} // for new screens. } // for new screens.
// Remove deleted ones but keep main monitors if we get only the // Remove deleted ones but keep main monitors if we get only the