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

Print QScreen geometry debug state using the underlying types

Browse Source 
A QRect is unambiguous, and easier to parse than a custom rect format.

Change-Id: If8c197a5e522744b9629d5d89536df5c0da7308c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2022-06-13 12:53:34 +02:00
parent f7a56b32cc
commit 1480588f44
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/kernel/qscreen.cpp
View File

@ -779,13 +779,6 @@ void *QScreen::resolveInterface(const char *name, int revision) const
} }
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM
static inline void formatRect(QDebug &debug, const QRect r)
{
debug << r.width() << 'x' << r.height()
<< Qt::forcesign << r.x() << r.y() << Qt::noforcesign;
}
Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QScreen *screen) Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QScreen *screen)
{ {
const QDebugStateSaver saver(debug); const QDebugStateSaver saver(debug);
@ -796,10 +789,8 @@ Q_GUI_EXPORT QDebug operator<<(QDebug debug, const QScreen *screen)
if (debug.verbosity() > 2) { if (debug.verbosity() > 2) {
if (screen == QGuiApplication::primaryScreen()) if (screen == QGuiApplication::primaryScreen())
debug << ", primary"; debug << ", primary";
debug << ", geometry="; debug << ", geometry=" << screen->geometry();
formatRect(debug, screen->geometry()); debug << ", available=" << screen->availableGeometry();
debug << ", available=";
formatRect(debug, screen->availableGeometry());
debug << ", logical DPI=" << screen->logicalDotsPerInchX() debug << ", logical DPI=" << screen->logicalDotsPerInchX()
<< ',' << screen->logicalDotsPerInchY() << ',' << screen->logicalDotsPerInchY()
<< ", physical DPI=" << screen->physicalDotsPerInchX() << ", physical DPI=" << screen->physicalDotsPerInchX()