d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Replace deprecated QDesktopWidget class

Browse Source
This commit is contained in:
Chocobo1 2019-02-27 15:59:44 +08:00
parent c657134344
commit 6dab93f7fd
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/base/utils/misc.cpp
View File

@ -59,8 +59,10 @@
#else #else
#include <QApplication> #include <QApplication>
#include <QDesktopServices> #include <QDesktopServices>
#include <QDesktopWidget> #include <QScreen>
#include <QStyle> #include <QStyle>
#include <QWidget>
#include <QWindow>
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) && defined(QT_DBUS_LIB) #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) && defined(QT_DBUS_LIB)
#include <QDBusInterface> #include <QDBusInterface>
#include <QDBusMessage> #include <QDBusMessage>
@ -252,11 +254,26 @@ QPoint Utils::Misc::screenCenter(const QWidget *w)
{ {
// Returns the QPoint which the widget will be placed center on screen (where parent resides) // Returns the QPoint which the widget will be placed center on screen (where parent resides)
if (!w)
return {};
QRect r = QGuiApplication::primaryScreen()->availableGeometry();
const QPoint primaryScreenCenter {(r.x() + (r.width() - w->frameSize().width()) / 2), (r.y() + (r.height() - w->frameSize().height()) / 2)};
const QWidget *parent = w->parentWidget(); const QWidget *parent = w->parentWidget();
const QDesktopWidget *desktop = QApplication::desktop(); if (!parent)
const int scrn = desktop->screenNumber(parent); // fallback to `primaryScreen` when parent is invalid return primaryScreenCenter;
const QRect r = desktop->availableGeometry(scrn);
return {r.x() + (r.width() - w->frameSize().width()) / 2, r.y() + (r.height() - w->frameSize().height()) / 2}; const QWindow *window = parent->window()->windowHandle();
if (!window)
return primaryScreenCenter;
const QScreen *screen = window->screen();
if (!screen)
return primaryScreenCenter;
r = screen->availableGeometry();
return {(r.x() + (r.width() - w->frameSize().width()) / 2), (r.y() + (r.height() - w->frameSize().height()) / 2)};
} }
#endif #endif